Merge lp:~jibel/synaptic/bug.519613 into lp:~mvo/synaptic/synaptic--main

[Jean-Baptiste Lallement]

[Jean-Baptiste Lallement (jibel)]

I had to do some indentation work so use -w when diffing.

[Michael Vogt (mvo)]

Merging into bzr now, many thanks.

review: Approve

=== modified file 'common/Makefile.am'
--- common/Makefile.am	2008-08-21 14:32:18 +0000
+++ common/Makefile.am	2010-02-17 23:07:19 +0000
@@ -3,7 +3,7 @@
 noinst_LIBRARIES = libsynaptic.a
 
 INCLUDES = -I/usr/include/apt-pkg @RPM_HDRS@ @DEB_HDRS@ @PACKAGE_CFLAGS@ \
-	$(LIBTAGCOLL_CFLAGS) \
+	$(LIBEPT_CFLAGS) \
 	-DSYNAPTICLOCALEDIR=\""$(synapticlocaledir)"\" \
 	-DSYNAPTICSTATEDIR=\""$(localstatedir)"\"
 
 
=== modified file 'common/rpackage.cc'
--- common/rpackage.cc	2010-01-25 10:17:45 +0000
+++ common/rpackage.cc	2010-02-17 23:07:19 +0000
@@ -183,6 +183,7 @@
 const char *RPackage::installedFiles()
 {
    static string filelist;
+   vector<string> sV;
    string s;
 
    filelist.erase(filelist.begin(), filelist.end());
@@ -194,10 +195,12 @@
          return "";
       while (in.eof() == false) {
          getline(in, s);
-         filelist += s + "\n";
+         sV.push_back( s );
       }
+      sort(sV.begin(), sV.end());
+      for (unsigned int i = 1; i < sV.size(); i++)
+         filelist += sV[i] + "\n";
 
-      in >> filelist;
       return filelist.c_str();
    }
    filelist = _("The list of installed files is only available for installed packages");
 
=== modified file 'common/rpackagelister.cc'
--- common/rpackagelister.cc	2007-06-18 13:12:44 +0000
+++ common/rpackagelister.cc	2010-02-17 23:07:19 +0000
@@ -36,6 +36,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <time.h>
+#include <algorithm>
 
 #include "rpackagelister.h"
 #include "rpackagecache.h"
@@ -78,6 +79,9 @@
 
 RPackageLister::RPackageLister()
    : _records(0), _progMeter(new OpProgress)
+#ifdef WITH_EPT
+   , _textsearch(0)
+#endif
 {
    _cache = new RPackageCache();
 
@@ -85,7 +89,7 @@
    _searchData.isRegex = false;
    _viewMode = _config->FindI("Synaptic::ViewMode", 0);
    _updating = true;
-   _sortMode = LIST_SORT_NAME;
+   _sortMode = LIST_SORT_NAME_ASC;
 
    // keep order in sync with rpackageview.h 
    _views.push_back(new RPackageViewSections(_packages));
@@ -94,8 +98,11 @@
    _filterView = new RPackageViewFilter(_packages);
    _views.push_back(_filterView);
    _searchView =  new RPackageViewSearch(_packages);
-   _views.push_back(_searchView);   
+   _views.push_back(_searchView);
    //_views.push_back(new RPackageViewAlphabetic(_packages));
+#ifdef WITH_EPT
+   openXapianIndex();
+#endif
 
    if (_viewMode >= _views.size())
       _viewMode = 0;
@@ -419,7 +426,47 @@
    return true;
 }
 
-
+#ifdef WITH_EPT
+bool RPackageLister::xapianIndexNeedsUpdate()
+{
+   struct stat buf;
+   
+   if(_config->FindB("Debug::Synaptic::Xapian",false))
+      std::cerr << "xapainIndexNeedsUpdate()" << std::endl;
+
+   // check the xapian index
+   if(FileExists("/usr/sbin/update-apt-xapian-index") && 
+      (!_textsearch || !_textsearch->hasData())) {
+      if(_config->FindB("Debug::Synaptic::Xapian",false))
+	 std::cerr << "xapain index not build yet" << std::endl;
+      return true;
+   } 
+
+   // compare timestamps, rebuild everytime, its now cheap(er) 
+   // because we use u-a-x-i --update
+   stat(_config->FindFile("Dir::Cache::pkgcache").c_str(), &buf);
+   if(_textsearch->timestamp() < buf.st_mtime) {
+      if(_config->FindB("Debug::Synaptic::Xapian",false))
+	 std::cerr << "xapian outdated " 
+		   << buf.st_mtime - _textsearch->timestamp()  << std::endl;
+      return true;
+   }
+
+   return false;
+}
+
+bool RPackageLister::openXapianIndex()
+{
+   if(_textsearch)
+      delete _textsearch;
+   try {
+      _textsearch = new ept::textsearch::TextSearch;
+   } catch (Xapian::DatabaseOpeningError) {
+      return false;
+   };
+   return true;
+}
+#endif
 
 void RPackageLister::applyInitialSelection()
 {
@@ -516,34 +563,6 @@
    return true;
 }
 
-static void qsSortByName(vector<RPackage *> &packages, int start, int end)
-{
-   int i, j;
-   RPackage *pivot, *tmp;
-
-   i = start;
-   j = end;
-   pivot = packages[(i + j) / 2];
-   do {
-      while (strcoll(packages[i]->name(), pivot->name()) < 0)
-         i++;
-      while (strcoll(pivot->name(), packages[j]->name()) < 0)
-         j--;
-      if (i <= j) {
-         tmp = packages[i];
-         packages[i] = packages[j];
-         packages[j] = tmp;
-         i++;
-         j--;
-      }
-   } while (i <= j);
-
-   if (start < j)
-      qsSortByName(packages, start, j);
-   if (i < end)
-      qsSortByName(packages, i, end);
-}
-
 void RPackageLister::reapplyFilter()
 {
    // PORTME
@@ -596,7 +615,7 @@
 
 struct sectionSortFunc {
    bool operator() (RPackage *x, RPackage *y) {
-      return x->section() < y->section();
+      return std::strcmp(x->section(), y->section())<0;
 }};
 
 // version string compare
@@ -639,6 +658,11 @@
    }
 };
 
+struct nameSortFunc {
+   bool operator() (RPackage *x, RPackage *y) {
+      return std::strcmp(x->name(), y->name())<0;
+}};
+
 
 
 void RPackageLister::sortPackages(vector<RPackage *> &packages, 
@@ -651,9 +675,18 @@
    if(_config->FindB("Debug::Synaptic::View",false))
       clog << "RPackageLister::sortPackages(): " << packages.size() << endl;
 
+   /* Always sort by name to have packages ordered inside another sort 
+    * criteria */
+   sort(packages.begin(), packages.end(), 
+      sortFunc<nameSortFunc>(true));
+
    switch(mode) {
-   case LIST_SORT_NAME:
-      qsSortByName(packages, 0, packages.size() - 1);
+   case LIST_SORT_NAME_ASC:
+      // Do nothing, already done
+      break;
+   case LIST_SORT_NAME_DES:
+      sort(packages.begin(), packages.end(), 
+		  sortFunc<nameSortFunc>(false));
       break;
    case LIST_SORT_SIZE_ASC:
       stable_sort(packages.begin(), packages.end(), 
@@ -672,42 +705,34 @@
 		  sortFunc<dlSizeSortFunc>(false));
       break;
    case LIST_SORT_COMPONENT_ASC:
-      qsSortByName(packages, 0, packages.size() - 1);
       stable_sort(packages.begin(), packages.end(), 
 		  sortFunc<componentSortFunc>(true));
       break;
    case LIST_SORT_COMPONENT_DES:
-      qsSortByName(packages, 0, packages.size() - 1);
-      stable_sort(packages.begin(), packages.end(), 		  
+      stable_sort(packages.begin(), packages.end(), 
 		  sortFunc<componentSortFunc>(false));
       break;
    case LIST_SORT_SECTION_ASC:
-      qsSortByName(packages, 0, packages.size() - 1);
       stable_sort(packages.begin(), packages.end(), 
 		  sortFunc<sectionSortFunc>(true));
       break;
    case LIST_SORT_SECTION_DES:
-      qsSortByName(packages, 0, packages.size() - 1);
       stable_sort(packages.begin(), packages.end(), 
 		  sortFunc<sectionSortFunc>(false));
       break;
    case LIST_SORT_STATUS_ASC:
-      qsSortByName(packages, 0, packages.size() - 1);
       stable_sort(packages.begin(), packages.end(), 
 		  sortFunc<statusSortFunc>(true));
       break;
    case LIST_SORT_STATUS_DES:
-      qsSortByName(packages, 0, packages.size() - 1);
       stable_sort(packages.begin(), packages.end(), 
 		  sortFunc<statusSortFunc>(false));
       break;
    case LIST_SORT_SUPPORTED_ASC:
-      qsSortByName(packages, 0, packages.size() - 1);
       stable_sort(packages.begin(), packages.end(), 
 		  supportedSortFunc(true, _pkgStatus));
       break;
    case LIST_SORT_SUPPORTED_DES:
-      qsSortByName(packages, 0, packages.size() - 1);
       stable_sort(packages.begin(), packages.end(), 
 		  supportedSortFunc(false, _pkgStatus));
       break;
@@ -1257,6 +1282,7 @@
    // Get the source list
    //pkgSourceList List;
    _cache->list()->ReadMainList();
+
    // Lock the list directory
    FileFd Lock;
    if (_config->FindB("Debug::NoLocking", false) == false) {
@@ -1268,12 +1294,26 @@
 
    _updating = true;
 
+
+#ifndef HAVE_RPM
+// apt-0.7.10 has the new UpdateList code in algorithms, we use it
+   string s;
+   bool res = ListUpdate(*status, *_cache->list(), 5000);
+   if(res == false)
+   {
+      while(!_error->empty())
+      {
+	 bool isError = _error->PopMessage(s);
+	 error += s;
+      }
+   }
+   return res;
+#else
    // Create the download object
    pkgAcquire Fetcher(status);
 
    bool Failed = false;
 
-#if HAVE_RPM
    if (_cache->list()->GetReleases(&Fetcher) == false)
       return false;
    Fetcher.Run();
@@ -1288,21 +1328,13 @@
       _error->Warning(_("Release files for some repositories could not be "
                         "retrieved or authenticated. Such repositories are "
                         "being ignored."));
-#endif /* HAVE_RPM */
 
    if (!_cache->list()->GetIndexes(&Fetcher))
       return false;
 
-// apt-rpm does not support the pulseInterval
-#ifdef HAVE_RPM 
    // Run it
    if (Fetcher.Run() == pkgAcquire::Failed)
       return false;
-#else
-   if (Fetcher.Run(50000) == pkgAcquire::Failed)
-      return false;
-#endif
-
 
    //bool AuthFailed = false;
    Failed = false;
@@ -1335,6 +1367,7 @@
       return false; 
    }
    return true;
+#endif
 }
 
 bool RPackageLister::getDownloadUris(vector<string> &uris)
@@ -1432,7 +1465,7 @@
 
          serverError = getServerErrorMessage(errm);
 
-         _error->Warning(tmp.str().c_str());
+         _error->Warning("%s", tmp.str().c_str());
          Failed = true;
       }
 
@@ -1905,4 +1938,133 @@
 }
 
 
+#ifdef WITH_EPT
+bool RPackageLister::limitBySearch(string searchString)
+{
+   //cerr << "limitBySearch(): " << searchString << endl;
+   if(!_textsearch->hasData())
+      return false;
+
+   return xapianSearch(searchString);
+}
+
+bool RPackageLister::xapianSearch(string unsplitSearchString)
+{
+   //std::cerr << "RPackageLister::xapianSearch()" << std::endl;
+   string s;
+   string originalSearchString = unsplitSearchString;
+   
+   ept::textsearch::TextSearch *ts = _textsearch;
+   if(!ts || !ts->hasData())
+      return false;
+
+   try {
+      Xapian::Enquire enquire(ts->db());
+      Xapian::QueryParser parser;
+      parser.add_prefix("name","XP");
+      parser.add_prefix("section","XS");
+      Xapian::Query query = parser.parse_query(unsplitSearchString);
+      enquire.set_query(query);
+   
+      // Get a set of tags to expand the query
+      vector<string> expand = ts->expand(enquire);
+   
+      // now expand the query by adding the searching string as a package
+      // name so that those searches appear erlier
+      for (int i=0;i<originalSearchString.size();i++) 
+      {
+         if(isblank(originalSearchString[i])) {
+            if(s.size() > 0) {
+               if(_config->FindB("Debug::Synaptic::Xapian",false))
+                  std::cerr << "adding to querry: XP" << s << std::endl;
+               expand.push_back("XP"+s);
+            }
+            s="";
+         } else 
+            s+=originalSearchString[i];
+      }
+      // now add to the last found string
+      if(_config->FindB("Debug::Synaptic::Xapian",false)) 
+         std::cerr << "adding: XP" << s << std::endl;
+      expand.push_back("XP"+s);
+   
+      // the last string is always expanded to get better search as you
+      // type results 
+      if (s.size() > 0) {
+         Xapian::TermIterator I;
+         int j=0;
+   
+         for(I=_textsearch->db().allterms_begin(s); 
+             I != _textsearch->db().allterms_end(s); 
+             I++) 
+         {
+            if(_config->FindB("Debug::Synaptic::Xapian",false)) 
+               std::cerr << "expanded terms: " << *I << std::endl;
+            expand.push_back(*I);
+            expand.push_back("XP"+*I);
+            // do not expand all alt terms, they can be huge > 100
+            // and make the search very slow
+            j++;
+            if (j > maxAltTerms)
+               break;
+         }
+      }
+   
+   
+      // Build the expanded query
+      Xapian::Query expansion(Xapian::Query::OP_OR, expand.begin(), expand.end());
+      enquire.set_query(Xapian::Query(Xapian::Query::OP_OR, query, expansion));
+   
+      // Retrieve the results
+      bool done = false;
+      int top_percent = 0;
+      _viewPackages.clear();
+      for (size_t pos = 0; !done; pos += 20)
+      {
+         Xapian::MSet matches = enquire.get_mset(pos, 20);
+         if (matches.size() < 20)
+            done = true;
+         for (Xapian::MSetIterator i = matches.begin(); i != matches.end(); ++i)
+         {
+            RPackage* pkg = getPackage(i.get_document().get_data());
+            // Filter out results that apt doesn't know
+            if (!pkg || !_selectedView->hasPackage(pkg))
+               continue;
+   
+            // Save the confidence interval of the top value, to use it as
+            // a reference to compute an adaptive quality cutoff
+            if (top_percent == 0)
+               top_percent = i.get_percent();
+   
+            // Stop producing if the quality goes below a cutoff point
+            if (i.get_percent() < qualityCutoff * top_percent / 100)
+            {
+               //cerr << "Discarding: " << i.get_percent() << " over " << qualityCutoff * top_percent / 100 << endl;
+               done = true;
+               break;
+            }
+   
+            //cerr << "found: " << pkg->name() << endl;
+            _viewPackages.push_back(pkg);
+         }
+      }
+      return true;
+   } catch (const Xapian::Error & error) {
+      cerr << "Exception in RPackageLister::xapianSearch():" << error.get_msg() << endl;
+      return false;
+   }
+}
+#else
+bool RPackageLister::limitBySearch(string searchString)
+{
+   return false;
+}
+
+bool RPackageLister::xapianSearch(string searchString) 
+{ 
+   return false; 
+}
+#endif
+
+
 // vim:ts=3:sw=3:et
 
=== modified file 'common/rpackagelister.h'
--- common/rpackagelister.h	2008-08-21 14:32:18 +0000
+++ common/rpackagelister.h	2010-02-17 23:07:19 +0000
@@ -36,6 +36,10 @@
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/acquire.h>
 
+#ifdef WITH_EPT
+#include <ept/textsearch/textsearch.h>
+#endif
+
 #include "rpackagecache.h"
 #include "rpackage.h"
 #include "rpackagestatus.h"
@@ -45,6 +49,14 @@
 
 using namespace std;
 
+#ifdef WITH_EPT
+namespace ept {
+namespace textsearch {
+class TextSearch;
+}
+}
+#endif
+
 class OpProgress;
 class RPackageCache;
 class RPackageFilter;
@@ -102,6 +114,11 @@
    pkgRecords *_records;
    OpProgress *_progMeter;
 
+#ifdef WITH_EPT
+   ept::textsearch::TextSearch *_textsearch;
+#endif
+
+
    // Other members.
    vector<RPackage *> _packages;
    vector<int> _packagesIndex;
@@ -123,13 +140,19 @@
 
    RPackageViewFilter *_filterView; // the package view that does the filtering
    RPackageViewSearch *_searchView; // the package view that does the (simple) search
-   
+
+   // helper for the limitBySearch() code
+   static const int qualityCutoff = 25;
+   static const int maxAltTerms = 15;
+   bool xapianSearch(string searchString);
+
    public:
 
    unsigned int _viewMode;
 
    typedef enum {
-      LIST_SORT_NAME,
+      LIST_SORT_NAME_ASC,
+      LIST_SORT_NAME_DES,
       LIST_SORT_SIZE_ASC,
       LIST_SORT_SIZE_DES,
       LIST_SORT_SUPPORTED_ASC,
@@ -189,6 +212,9 @@
    list<pkgState> redoStack;
 
    public:
+   // limit what the current view displays
+   bool limitBySearch(string searchString);
+
    // clean files older than "Synaptic::delHistory"
    void cleanCommitLog();
 
@@ -321,6 +347,11 @@
    bool writeSelections(ostream &out, bool fullState);
 
    RPackageCache* getCache() { return _cache; };
+#ifdef WITH_EPT
+   ept::textsearch::TextSearch* textsearch() { return _textsearch; }
+   bool xapianIndexNeedsUpdate();
+   bool openXapianIndex();
+#endif
 
    RPackageLister();
    ~RPackageLister();
 
=== modified file 'common/rpackageview.cc'
--- common/rpackageview.cc	2009-12-23 15:31:43 +0000
+++ common/rpackageview.cc	2010-02-17 23:07:20 +0000
@@ -31,6 +31,7 @@
 #include <map>
 #include <vector>
 #include <sstream>
+#include <algorithm>
 
 #include "sections_trans.h"
 
@@ -64,6 +65,11 @@
    _view.clear();
 }
 
+bool RPackageView::hasPackage(RPackage *pkg)
+{
+   return find(_selectedView.begin(), _selectedView.end(), pkg)  != _selectedView.end();
+}
+
 void RPackageView::clearSelection()
 {
    _hasSelection = false;
@@ -311,7 +317,6 @@
    searchProgress.Done();
    return found;
 }
-
 //------------------------------------------------------------------
 
 RPackageViewFilter::RPackageViewFilter(vector<RPackage *> &allPkgs) 
@@ -543,6 +548,19 @@
 
    filter = new RFilter();
    filter->preset = true;
+   filter->pattern.addPattern(RPatternPackageFilter::Component,
+			      "main", true);
+   filter->pattern.addPattern(RPatternPackageFilter::Component,
+			      "restricted", true);
+   filter->pattern.addPattern(RPatternPackageFilter::Origin,
+			      "Ubuntu", false);
+   filter->pattern.setAndMode(true);
+   filter->status.setStatus(RStatusPackageFilter::Installed);
+   filter->setName("Community Maintained (installed)"); _("Community Maintained (installed)");
+   registerFilter(filter);
+
+   filter = new RFilter();
+   filter->preset = true;
    filter->status.setStatus(RStatusPackageFilter::NowPolicyBroken);
    filter->setName("Missing Recommends"); _("Missing Recommends");
    registerFilter(filter);
@@ -578,4 +596,9 @@
    _view[subview].push_back(package);
  };
 
+
+
+
+
+
 // vim:sts=3:sw=3
 
=== modified file 'common/rpackageview.h'
--- common/rpackageview.h	2009-12-23 14:29:40 +0000
+++ common/rpackageview.h	2010-02-17 23:07:20 +0000
@@ -29,6 +29,11 @@
 #include <string>
 #include <map>
 
+#ifdef WITH_EPT
+#include <ept/textsearch/textsearch.h>
+#include <xapian.h>
+#endif
+
 #include "rpackage.h"
 #include "rpackagefilter.h"
 
@@ -66,6 +71,7 @@
 
    bool hasSelection() { return _hasSelection; };
    string getSelected() { return _selectedName; };
+   bool hasPackage(RPackage *pkg);
    virtual bool setSelected(string name);
 
    void showAll() { 
@@ -144,7 +150,6 @@
 };
 
 class RPackageViewSearch : public RPackageView {
-   
    struct searchItem {
       vector<string> searchStrings;
       string searchName;
@@ -155,9 +160,11 @@
    searchItem _currentSearchItem;
    int found; // nr of found pkgs for the last search
 
+   bool xapianSearch();
+
  public:
-   RPackageViewSearch(vector<RPackage *> &allPkgs) 
-      : RPackageView(allPkgs), found(0) {};
+ RPackageViewSearch(vector<RPackage *> &allPkgs) 
+    : RPackageView(allPkgs), found(0) {};
 
    int setSearch(string searchName, int type, string searchString, 
 		 OpProgress &searchProgress);
@@ -224,8 +231,6 @@
    void addPackage(RPackage *package);
 };
 
-
-
 #endif
 
 // vim:sts=3:sw=3
 
=== modified file 'common/sections_trans.cc'
--- common/sections_trans.cc	2009-09-07 11:00:02 +0000
+++ common/sections_trans.cc	2010-02-17 23:07:20 +0000
@@ -7,7 +7,7 @@
 
 #include "sections_trans.h"
 
-char *transtable[][2] = {
+const char *transtable[][2] = {
    // TRANSLATORS: Alias for the Debian package section "admin"
    {"admin", _("System Administration")},
    // TRANSLATORS: Alias for the Debian package section "base"
@@ -118,6 +118,8 @@
    {"alien", _("Converted From RPM by Alien")},
    // TRANSLATORS: Ubuntu translations section
    {"translations", _("Internationalization and localization")},
+   // TRANSLATORS: Ubuntu metapackages section
+   {"metapackages", _("Meta Packages")},
 
    // TRANSLATORS: Alias for the Debian package section "non-US"
    //              Export to the outside of the USA is not allowed
 
=== modified file 'config.h.in'
--- config.h.in	2009-10-21 11:14:25 +0000
+++ config.h.in	2010-02-17 23:07:19 +0000
@@ -118,6 +118,9 @@
 /* build with dpkg progress bar */
 #undef WITH_DPKG_STATUSFD
 
+/* Define if you want to enable the ept functions. */
+#undef WITH_EPT
+
 /* build with launchpad-integration */
 #undef WITH_LAUNCHPAD_INTEGRATION
 
 
=== modified file 'configure.in'
--- configure.in	2010-01-25 16:43:43 +0000
+++ configure.in	2010-02-17 23:07:19 +0000
@@ -129,6 +129,19 @@
 AC_SUBST(LP_CFLAGS)
 AC_SUBST(LP_LIBS)
 
+AC_MSG_CHECKING(for --enable-ept)
+AC_ARG_ENABLE([ept],
+             AC_HELP_STRING(--enable-ept, enable libept functionality),
+             [enable_ept="$enableval"],[enable_ept="yes"])
+if test "$enable_ept" != "no"; then
+  AC_MSG_RESULT(no)
+  AC_DEFINE(WITH_EPT, 1, 
+           [Define if you want to enable the ept functions.]) 
+  LIBEPT_DEFS
+else
+  AC_MSG_RESULT(yes)
+fi
+
 
 dnl Checks for header files.
 AC_HEADER_STDC
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-02-16 10:14:25 +0000
+++ debian/changelog	2010-02-17 23:07:20 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 synaptic (0.63.2) UNRELEASED; urgency=low
 
   * po/uk.po:
@@ -6,16 +7,19 @@
  -- Michael Vogt <[e-mail]>  Tue, 16 Feb 2010 11:13:45 +0100
 
 synaptic (0.63.1) unstable; urgency=low
+=======
+synaptic (0.63ubuntu4) lucid; urgency=low
+>>>>>>> MERGE-SOURCE
 
-  * po/pt_BR.po:
-    - Updated pt_BR.po, thanks to Sergio Cipolla (closes: #561853)
-  * po/sk.po:
-    - Updated sk.po, thanks to helix84 (closes: #559283)
+  * gtk/rgdebinstallprogress.cc:
+    - make the dpkg progress code less cpu intensive
   * po/uk.po
     - add ukrainian translation, thanks to Serhij Dubyk 
-  * common/rpackageview.{cc,h}:
-    - remember search history accross package transactions
-  * make the origin filter more fine grained
+
+ -- Michael Vogt <[e-mail]>  Thu, 11 Feb 2010 15:23:38 +0100
+
+synaptic (0.63ubuntu3) lucid; urgency=low
+
   * gtk/rgsummarywindow.cc:
     - move the gtk_tree_view_set_model() down to speed up the
       operation
@@ -26,10 +30,41 @@
   * gtk/rgaboutpanel.cc:
     - fix FTBFS with gcc-4.5 (closes: #565077)
   * additions to the (internal) API
+<<<<<<< TREE
   * gtk/rgdebinstallprogress.cc:
     - make the dpkg progress code less cpu intensive
 
  -- Michael Vogt <[e-mail]>  Thu, 11 Feb 2010 19:58:40 +0100
+=======
+  * debian/patches/10_ubuntu_maintenance_gui.dpatch:
+    - updated to support LTS and new "Supported" flags 
+
+ -- Michael Vogt <[e-mail]>  Mon, 25 Jan 2010 09:58:35 +0100
+
+synaptic (0.63ubuntu2) lucid; urgency=low
+
+  * po/pt_BR.po:
+    - Updated pt_BR.po, thanks to Sergio Cipolla (closes: #561853)
+  * po/sk.po:
+    - Updated sk.po, thanks to helix84 (closes: #559283)
+  * common/rpackageview.{cc,h}:
+    - remember search history accross package transactions
+  * make the origin filter more fine grained
+
+ -- Michael Vogt <[e-mail]>  Wed, 23 Dec 2009 15:30:54 +0100
+
+synaptic (0.63ubuntu1) lucid; urgency=low
+
+  * merged from debian, remaining changes:
+    - ubuntu icons for supported applications
+    - launchpad-integration
+    - ubuntu changelog download support
+    - support section metapackages
+    - merged ept branch
+    - x-ubuntu-gettext-domain in desktop file
+
+ -- Michael Vogt <[e-mail]>  Wed, 11 Nov 2009 14:10:05 +0100
+>>>>>>> MERGE-SOURCE
 
 synaptic (0.63) unstable; urgency=low
 
@@ -57,40 +92,141 @@
 
   * debian/control:
     - add build-conflict against librpm-dev
+    - recommends gksu|kdebase-bin (kdsu is fine too)
+      closes: #442421
+  * add filter for manual installed packages (LP: #122047)
+  * fix typo (thanks to Florentin Duneau), closes: #542122
+  * po/pt_BR.po:
+    - updated translation, thanks to Sergio Cipolla
+      (closes: #532473)
+
+ -- Michael Vogt <[e-mail]>  Thu, 27 Aug 2009 10:00:10 +0200
+
+synaptic (0.62.7ubuntu7~ppa1) karmic; urgency=low
+
+  * gtk/rgfetchprogress.{cc,h}:
+    - remove the custom progress rendering and replace with
+      stock gtk progress
+  * gtk/rgmainwindow.cc:
+    - use yellowish background in quick search mode
+    - reset quick search when the find dialog is popped up
+
+ -- Michael Vogt <[e-mail]>  Wed, 21 Oct 2009 11:03:54 +0200
+
+synaptic (0.62.7ubuntu6) karmic; urgency=low
+
+  * gtk/glade/window_fetch.glade:
+    - add default_width to avoid fetch window resizing 
+      (LP: #450451)
+
+ -- Michael Vogt <[e-mail]>  Thu, 15 Oct 2009 10:13:17 +0200
+
+synaptic (0.62.7ubuntu5) karmic; urgency=low
+
+  * rebuild against latest libapt
+
+ -- Michael Vogt <[e-mail]>  Fri, 25 Sep 2009 22:35:18 +0200
+
+synaptic (0.62.7ubuntu4) karmic; urgency=low
+
+  * common/sections_trans.cc:
+    - fix typo in gnu-r section description
+  * po/fr.po:
+    - updated, thanks to Stéphane Blondon, closes: #543981
+  * po/sl.po:
+    - updated, thanks to Matej Urbančič
+  * take the "Origin" field from the release file into account
+    when looking for supported packages
+
+ -- Michael Vogt <[e-mail]>  Tue, 22 Sep 2009 17:49:45 +0200
+
+synaptic (0.62.7ubuntu3) karmic; urgency=low
+
+  * common/rpackagelister.cc:
+    - add prefixes for "name" and "section" in the quick search
+      This allows "name:apt" or "section:devel" searches
+  * debian/control:
     - recommends gksu|kdebase-bin (kdsu is fine too) 
       closes: #442421
   * add filter for manual installed packages (LP: #122047)
   * fix typo (thanks to Florentin Duneau), closes: #542122
   * po/pt_BR.po:
-    - updated translation, thanks to Sergio Cipolla 
+    - updated translation, thanks to Sergio Cipolla
       (closes: #532473)
-
- -- Michael Vogt <[e-mail]>  Thu, 27 Aug 2009 10:00:10 +0200
+  * common/rpackage.{cc,h}:
+    - fix potential segfault
+
+ -- Michael Vogt <[e-mail]>  Fri, 04 Sep 2009 11:52:17 +0200
+
+synaptic (0.62.7ubuntu2) karmic; urgency=low
+
+  * common/rpackagelister.cc:
+    - fixes in the xapian search (thanks to seb128)
+    - more debug output with Debug::Synaptic::Xapian=true
+
+ -- Michael Vogt <[e-mail]>  Wed, 15 Jul 2009 16:14:50 +0200
+
+synaptic (0.62.7ubuntu1) karmic; urgency=low
+
+  * merged from debian
+  * debian/control:
+    - add build-conflict against librpm-dev
+
+ -- Michael Vogt <[e-mail]>  Fri, 10 Jul 2009 14:35:17 +0200
 
 synaptic (0.62.7) unstable; urgency=low
 
   * show progress when searching and not not block the UI
     (LP: #24188)
   * gtk/glade/dialog_authentication.glade:
-    - add two missing "translatable" entries, thanks to 
+    - add two missing "translatable" entries, thanks to
       Daniele Forsi)
   * po/sk.po:
-    - updated translation, thanks to helix84, closes: #532790 
+    - updated translation, thanks to helix84, closes: #532790
   * po/it.po:
     - updated translation, thanks to Milo Casagrande, closes: #534351
   * po/es.po:
-    - updated translation, thanks to Francisco Javier Cuadrado, 
+    - updated translation, thanks to Francisco Javier Cuadrado,
       closes: #533322
 
  -- Michael Vogt <[e-mail]>  Thu, 25 Jun 2009 16:17:56 +0200
 
+synaptic (0.62.6ubuntu3) karmic; urgency=low
+
+  * common/rpackagelister.cc:
+    - remove all fuzzy matching in xapianIndexNeedsUpdate()
+  * gtk/rgmainwindow.cc:
+    - run update-apt-xapian-index --udpate under ionice, rebuild
+      the index every time the timestamps do not match
+
+ -- Michael Vogt <[e-mail]>  Fri, 10 Jul 2009 13:00:47 +0200
+
+synaptic (0.62.6ubuntu2) karmic; urgency=low
+
+  * show progress when searching and not not block the UI
+    (LP: #24188)
+
+ -- Michael Vogt <[e-mail]>  Mon, 15 Jun 2009 17:17:28 +0200
+
+synaptic (0.62.6ubuntu1) karmic; urgency=low
+
+  * merge from Debian/unstable, remaining changes:
+    - ubuntu icons for supported applications
+    - launchpad-integration
+    - ubuntu changelog download support
+    - support section metapackages
+    - merged ept branch
+    - x-ubuntu-gettext-domain in desktop file
+
+ -- Michael Vogt <[e-mail]>  Mon, 08 Jun 2009 10:47:19 +0200
+
 synaptic (0.62.6) unstable; urgency=low
 
   * po/th.po:
     - updated Thai translation,
       thanks to Theppiak Karoonboonyanan, closes: #512605, #441571
   * po/br.po:
-    - updated breton translation, 
+    - updated breton translation,
       thanks to Denis ARNAUD
   * po/sk.po:
     - updated Slovak translation,
@@ -118,7 +254,7 @@
       thanks to Daniel Nylander, closes: #384107
   * gtk/rgdebinstallprogress.cc:
     - if forkpty() show a propper error message
-      (thanks to Evan) 
+      (thanks to Evan)
   * gtk/rgfetchprogress.cc:
     - if the ETA is huge report it as unknown (LP: #322871)
   * debian/control:
@@ -128,6 +264,35 @@
 
  -- Michael Vogt <[e-mail]>  Fri, 05 Jun 2009 16:22:48 +0200
 
+synaptic (0.62.5ubuntu3) jaunty-proposed; urgency=low
+
+  * improve the logic when the xapian index needs
+    rebuilding by checking the xapian document count
+    against the available packages (LP: #365151)
+
+ -- Michael Vogt <[e-mail]>  Fri, 17 Apr 2009 16:14:30 +0200
+
+synaptic (0.62.5ubuntu2) jaunty; urgency=low
+
+  * No-change upload to strip translations from .desktop files. (LP: #348225)
+
+ -- Martin Pitt <[e-mail]>  Mon, 30 Mar 2009 12:57:47 +0200
+
+synaptic (0.62.5ubuntu1) jaunty; urgency=low
+
+  * po/th.po:
+    - updated Thai translation (closes: #512605)
+  * gtk/rgdebinstallprogress.cc:
+    - if forkpty() show a propper error message
+      (thanks to Evan) 
+  * gtk/rgfetchprogress.cc:
+    - if the ETA is huge report it as unknown (LP: #322871)
+  * debian/control:
+    - add depends to hicolor-icon-theme
+    - rebuild against latest libapt/libept
+
+ -- Michael Vogt <[e-mail]>  Mon, 09 Feb 2009 16:03:03 +0100
+
 synaptic (0.62.5) unstable; urgency=low
 
   * gtk/rgsummarywindow.cc:
@@ -181,12 +346,33 @@
 
  -- Michael Vogt <[e-mail]>  Tue, 18 Nov 2008 20:35:18 +0100
 
+synaptic (0.62.2ubuntu2) jaunty; urgency=low
+
+  * gtk/rgpkgdetails.{cc,h}:
+    - download/show big image when clicking on the
+      thumbnail 
+  * debian/rules, .bzr-builddeb/default.conf
+    - bybye arch-build, hello "bzr-buildpackage"
+
+ -- Michael Vogt <[e-mail]>  Tue, 18 Nov 2008 19:21:16 +0100
+
+synaptic (0.62.2ubuntu1) jaunty; urgency=low
+
+  * Merge from debian, remaining changes:
+    - ubuntu icons for supported applications
+    - launchpad-integration
+    - support section metapackages
+    - x-ubuntu-gettext-domain in desktop file
+    - support end time calculation
+
+ -- Michael Vogt <[e-mail]>  Fri, 14 Nov 2008 12:42:42 +0100
+
 synaptic (0.62.2) unstable; urgency=low
 
   * po/es.po:
-    - updated spanish translation (thanks to 
+    - updated spanish translation (thanks to
       Francisco Javier Cuadrado)
-  * po/cz.po: 
+  * po/cz.po:
     - updated Czech translation (thanks to Kamil Páral)
   * gtk/glade/dialog_upgrade.glade:
     - provide a mnemonics in the upgrade dialog,
@@ -213,7 +399,132 @@
 
  -- Michael Vogt <[e-mail]>  Fri, 14 Nov 2008 11:44:43 +0100
 
-synaptic (0.62.1) unstable; urgency=low
+synaptic (0.62.1ubuntu10) intrepid; urgency=low
+
+  * common/rpackagelister.cc:
+    - add special handling for "-" char in the xapian
+      search (thanks to kiko)
+    - fix hang in quick search for huge result lists 
+     (like "li") LP: #282188
+
+ -- Michael Vogt <[e-mail]>  Tue, 21 Oct 2008 15:19:02 +0200
+
+synaptic (0.62.1ubuntu9) intrepid; urgency=low
+
+  * gtk/rgmainwindow.cc:
+    - only xapian search when more than one char is used
+      in the search querry (LP: #260739)
+  * common/rpackagelister.{cc,h}:
+    - expand partial strings in search as you type so that
+      "ged" finds "gedit" (LP: #261423)
+  * 10_ubuntu_maintenance_gui.dpatch:
+    - make sure to look only for immutable release files
+      when calculating the support time
+
+ -- Michael Vogt <[e-mail]>  Mon, 22 Sep 2008 15:57:58 +0200
+
+synaptic (0.62.1ubuntu8) intrepid; urgency=low
+
+  * common/rpackageview.cc:
+    - add new "Missing Recommends" default filter
+  * common/rpackage.cc:
+    - fix code to get candidate origin
+    - support getting the candidate release file name
+  * common/rpackagestatus.cc:
+    - support maintenanceEndTime() (if the distro supports that)
+  * 10_ubuntu_maintenance_gui.dpatch:
+    - add support for displaying when the maintaince ends
+
+ -- Michael Vogt <[e-mail]>  Fri, 22 Aug 2008 12:40:10 +0200
+
+synaptic (0.62.1ubuntu7) intrepid; urgency=low
+
+  * debian/control:
+    - add apt-xapian-index to the recommends again, we have some
+      space on the CDs again (thanks to Steve Langasek)
+
+ -- Michael Vogt <[e-mail]>  Thu, 19 Jun 2008 14:45:42 +0200
+
+synaptic (0.62.1ubuntu6) intrepid; urgency=low
+
+  * gtk/rgdebinstallprogress.cc:
+    - make sure that SIGCHLD is not blocked to work around
+      kdesudo (LP: #156041)
+  * common/rpackageview.cc:
+    - add new "Missing Recommends" default filter
+    - fix incorrect display of the "Community Maintained" filter
+
+ -- Michael Vogt <[e-mail]>  Thu, 14 Aug 2008 12:01:56 +0200
+
+synaptic (0.62.1ubuntu5) intrepid; urgency=low
+
+  * debian/control: 
+    - make deborphan and apt-xapian-index suggests instead of recommends
+      to save space on the CD - this means we loose the quick search
+      feature in the default install
+  * po/es.po:
+    - updated spanish translation (thanks to 
+      Francisco Javier Cuadrado)
+  * gtk/glade/dialog_upgrade.glade:
+    - provide a mnemonics in the upgrade dialog,
+      closes: #491179 (thanks to Matt Kraai)
+  * gtk/glade/window_fetch.glade:
+    - dialog fix (thanks to Oded Arbel) (LP: #228127)
+  * gtk/rgdebinstallprogress.cc:
+    - intercept ctrl-c in the terminal window and ask
+      if that is really the desired action
+  * gtk/rgmainwindow.cc:
+    - fix "Gtk-CRITICAL **: gtk_tree_view_unref_tree_helper"
+      assertion failure error (LP: #38397, closes: #341645)
+
+ -- Michael Vogt <[e-mail]>  Fri, 01 Aug 2008 13:50:48 +0200
+
+synaptic (0.62.1ubuntu4) intrepid; urgency=low
+
+  * improve the search as you type to weight packagename in the
+    search heigher
+
+ -- Michael Vogt <[e-mail]>  Wed, 16 Jul 2008 16:00:26 +0100
+
+synaptic (0.62.1ubuntu3) intrepid; urgency=low
+
+  * do not run the index update when called in backend 
+    (non-interactive) mode
+
+ -- Michael Vogt <[e-mail]>  Thu, 03 Jul 2008 21:58:28 +0200
+
+synaptic (0.62.1ubuntu2) intrepid; urgency=low
+
+  * added support for quick search using xapian (thanks to
+    Enrico Zini for his help)
+
+ -- Michael Vogt <[e-mail]>  Tue, 17 Jun 2008 14:37:19 +0200
+
+synaptic (0.62.1ubuntu1) intrepid; urgency=low
+
+  * merge from debian, remaining changes:
+    - ubuntu icons for supported applications
+    - launchpad-integration
+    - build against latest apt in ubuntu
+    - support section metapackages
+    - x-ubuntu-gettext-domain in desktop file
+
+  * po/es.po:
+    - updated Spanish translation (thanks to
+       Francisco Javier Cuadrado)
+  * debian/control:
+    - added "menu" to the recommends (closes: #478250)
+  * gtk/glade/window_main.glade:
+    - make the main vpane shinkable
+  * gtk/rgmainwindow.cc:
+    - do not loose the keyboard focus after a package 
+      action in the listview
+  * debian/control:
+    - switch bzr branch to bzr.debian.org
+
+ -- Michael Vogt <[e-mail]>  Thu, 12 Jun 2008 15:57:44 +0200
+
+synaptic (0.62.1ubuntu1) intrepid; urgency=low
 
   * po/es.po:
     - updated Spanish translation (thanks to
@@ -230,6 +541,7 @@
 
  -- Michael Vogt <[e-mail]>  Tue, 18 Jun 2008 10:17:31 +0200
 
+
 synaptic (0.62) unstable; urgency=low
 
   [ Michael Vogt]
@@ -271,6 +583,82 @@
 
  -- James Vega <[e-mail]>  Sat, 05 Apr 2008 18:58:52 -0400
 
+synaptic (0.61ubuntu9) hardy; urgency=low
+
+  * po/cs.po:
+    - translation update (thanks to Kamil Páral)
+  * rebuild for liblaunchpad-integration change
+
+ -- Michael Vogt <[e-mail]>  Thu, 10 Apr 2008 16:25:00 +0200
+
+synaptic (0.61ubuntu8) hardy; urgency=low
+
+  * pixmaps/hicolor/16x16/package-purge.png:
+    - make the icon different from the "remove" icon
+  * gtk/rgsummarywindow.cc:
+    - code cleanup and fix potential endless loop (thanks to
+      Sebastien Bacher)
+
+ -- Michael Vogt <[e-mail]>  Tue, 01 Apr 2008 14:39:18 +0200
+
+synaptic (0.61ubuntu7) hardy; urgency=low
+
+  * do not auto-close on package install errors when run with
+    closeZvt=true (LP: #183209)
+
+ -- Michael Vogt <[e-mail]>  Mon, 03 Mar 2008 15:05:55 +0100
+
+synaptic (0.61ubuntu6) hardy; urgency=low
+
+  * recommend software-properties-gtk
+
+ -- Michael Vogt <[e-mail]>  Thu, 21 Feb 2008 11:33:11 +0100
+
+synaptic (0.61ubuntu5) hardy; urgency=low
+
+  [ Brian Murray ]
+  * typo fixes (LP: #64482, LP: #157850, LP: #179914, LP: #179912, LP: #179909)
+
+  [ Michael Vogt ]
+  * add new RFilePackageFilter 
+  * added default custom filter that shows installed community software
+  
+ -- Michael Vogt <[e-mail]>  Tue, 12 Feb 2008 22:54:39 +0100
+
+synaptic (0.61ubuntu4) hardy; urgency=low
+
+  * fix incorect transient settings when run with --no-main-window
+    (thanks to Robert Colins for reporting)
+
+ -- Michael Vogt <[e-mail]>  Thu, 31 Jan 2008 10:51:31 +0100
+
+synaptic (0.61ubuntu3) hardy; urgency=low
+
+  * use new ListUpdate() code from apt
+
+ -- Michael Vogt <[e-mail]>  Mon, 07 Jan 2008 21:20:49 +0100
+
+synaptic (0.61ubuntu2) hardy; urgency=low
+
+  [ Michael Vogt]
+  * debian/rules, debian/control:
+    - use dh_icons and add appropriate b-d on debhelper
+  * g++ 4.3 fixes (closes: #456044)
+
+ -- Michael Vogt <[e-mail]>  Thu, 13 Dec 2007 20:48:57 +0100
+
+synaptic (0.61ubuntu1) hardy; urgency=low
+
+  * merged from debian/unstable, remaining changes:
+    - ubuntu icons for supported applications
+    - maintained filed changed
+    - launchpad-integration
+    - build against latest apt in ubuntu
+    - support section metapackages
+    - x-ubuntu-gettext-domain in desktop file
+
+ -- Michael Vogt <[e-mail]>  Thu, 13 Dec 2007 15:49:12 +0100
+
 synaptic (0.61) unstable; urgency=low
 
   [ Michael Vogt ]
@@ -308,6 +696,76 @@
 
  -- Michael Vogt <[e-mail]>  Thu, 06 Dec 2007 16:00:51 +0100
 
+synaptic (0.60ubuntu5.1) gutsy-proposed; urgency=low
+
+  * gtk/rgfetchprogress.{cc,h}:
+    - fix crash in download progress on theme changes (LP: #67995)
+
+ -- Michael Vogt <[e-mail]>  Wed, 17 Oct 2007 11:14:03 +0200
+
+synaptic (0.60ubuntu5) gutsy; urgency=low
+  
+  [ Loic Minier ]
+  * Set has_focus on the close button of the welcome dialog; LP: #148695.
+  
+  [ Michael Vogt ]
+  * gtk/rgmainwindow.cc:
+    - fix crash in cbInstallFromVersion() (LP: #145685)
+
+ -- Loic Minier <[e-mail]>  Wed, 03 Oct 2007 22:33:28 +0200
+
+synaptic (0.61) unstable; urgency=low
+
+  [ Michael Vogt ]
+  * fix missing Basque translation (closes: #429460)
+  * updatd Basque translation (thanks to mikel paskual)
+  * update galician translation (thanks to Ignacio Casal)
+  * updated Czech translation (thanks to Vit Pelcak)
+  * updated Finish translation (thanks to Timo Jyrinki)
+  * po/POTFILES.in, po/POTFILES.skip:
+    - updated so that intltool-update -m is happy again (thanks
+      to Nacho)
+  * gtk/rgmainwindow.cc:
+    - add missing space in the wget script (thanks to Avi Rozen)
+  * make it build with g++ 4.3
+  * gtk/rgmainwindow.cc:
+    - fix crash in cbInstallFromVersion()
+  * gtk/rgfetchprogress.{cc,h}:
+    - fix crash in download progress on theme changes
+
+  [ Loic Minier ]
+  * Set has_focus on the close button of the welcome dialog; closes: #148695.
+
+ -- Loic Minier <[e-mail]>  Wed, 03 Oct 2007 22:25:09 +0200
+
+synaptic (0.60ubuntu3) gutsy; urgency=low
+
+  * build against latest apt
+
+ -- Michael Vogt <[e-mail]>  Fri, 03 Aug 2007 21:15:40 +0200
+
+synaptic (0.60ubuntu2) gutsy; urgency=low
+
+  * debian/control:
+    - added XS-Vcs-Bzr field
+
+ -- Michael Vogt <[e-mail]>  Mon, 30 Jul 2007 15:04:48 +0200
+
+synaptic (0.60ubuntu1) gutsy; urgency=low
+
+  * merged from debian/unstable, remaining changes:
+    - 01_ubuntu_changelog: 
+      + default to changelogs.ubuntu.com
+    - 03_hide_browse_documentation:
+      + don't show the dwww documentation button
+    - 04_ubuntu_lpi:
+      + launchpad integration added
+    - 06_ubuntu_su_to_root:
+      + use gksu instead of su-to-root
+    - ubuntu branding icon
+
+ -- Michael Vogt <[e-mail]>  Mon, 18 Jun 2007 15:08:09 +0200
+
 synaptic (0.60) unstable; urgency=low
 
   * moved most icons use the icontheme
@@ -324,23 +782,17 @@
   * added support for GUI configuraton of http proxy
   * translation updates:
     - cs.po: thanks to Vít Pelcak
-  * debian/rules: 
-    - fix automatic version number generation
   * make description buffer dynamic (thanks to Benjamin Jacobs)
   * added component filter
   * added emblem in the description to show support status
-  * move the desktop file out of settings because it does no longer
-    fit there with the new control center in gnome 2.17
-  * build with gcc 4.3 (closes: #413419)
-  * do not return a NULL pointer in name() 
-  * when generating the wget script, use wget -c
-  * po/cs.po:
-    - updated (thanks to Vit Pelcak)
-  * gtk/rguserdialog.cc, gtk/rggladewindow.cc:
-    - do not crash for invalid parent-window-ids
+
+ -- Michael Vogt <[e-mail]>  Thu, 11 Jan 2007 16:32:32 +0100
+
+synaptic (0.57.11.1ubuntu15) gutsy; urgency=low
+
   * gtk/rgpreferenceswindow.cc:
     - overwrite the http_proxy environ when the user set the proxy
-      explicitely (thanks to Berend De Schouwer)
+      explicitely (thanks to Berend De Schouwer, LP#105515)
   * common/rpackagelister.cc:
     - added "Volatile::SetSelectionDoReInstall" to support 
       reinstalling from --set-selections too
@@ -348,13 +800,218 @@
     - only show a package as supported if it is authenticated
   * po/eu.po:
     - updated (thanks to dooteo, closes: #368951)
-  * merged gcc 4.3 compiler fix, closes: #413419
-    (thanks to Martin Michlmayr)
-  * merged support for translated package description
-  * merged support for automatic removal of unused dependencies
-  * merged support for native apts install-recommends feature
-
- -- Michael Vogt <[e-mail]>  Tue,  6 Mar 2007 17:22:30 +0100
+  * gtk/rguserdialog.cc, gtk/rggladewindow.cc:
+    - do not crash for invalid parent-window-ids
+
+ -- Michael Vogt <[e-mail]>  Wed, 11 Apr 2007 11:16:31 +0200
+
+synaptic (0.57.11.1ubuntu14) feisty; urgency=low
+
+  * gtk/rgchangeswindow.cc:
+    - fix crash in confirm changes (LP#80922) 
+      Thanks to John Millikin for the instructions how to reproduce the
+      bug
+
+ -- Michael Vogt <[e-mail]>  Wed,  4 Apr 2007 13:01:23 +0200
+
+synaptic (0.57.11.1ubuntu13) feisty; urgency=low
+
+  * when generating the wget script, use wget -c (LP#76462)
+  * po/cs.po:
+    - updated (thanks to Vit Pelcak)
+  * gtk/rgpkgdetails.cc:
+    - fix chinese descriptions display, thanks to Liu Qishuai 
+      (LP#102228)
+  * fix drop down boxes in preferences (LP#100072)
+  * fix terminal window (LP#99877)
+  * show error and exit if opening the cache fails (LP#90016)
+
+ -- Michael Vogt <[e-mail]>  Tue,  3 Apr 2007 22:23:48 +0200
+
+synaptic (0.57.11.1ubuntu12) feisty; urgency=low
+
+  * data/synaptic.desktop.in:
+    - fix in the Category to make it show up in g-a-i (LP#88877)
+  * common/rpackageview.cc:
+    - fix in the getSections() code (LP##91888)
+
+ -- Michael Vogt <[e-mail]>  Tue, 13 Mar 2007 20:18:09 +0100
+
+synaptic (0.57.11.1ubuntu11) feisty; urgency=low
+
+  * build with gcc 4.3 (closes: #413419)
+  * do not return a NULL pointer in name() 
+  * remove unneeded pkgActionGroup that seems to cause havoc
+
+ -- Michael Vogt <[e-mail]>  Tue,  6 Mar 2007 19:02:44 +0100
+
+synaptic (0.57.11.1ubuntu10) feisty; urgency=low
+
+  * debian/control:
+    - changed ubuntu maintainer 
+    - added XS-Vcs-Bzr
+  * gtk/rgpreferenceswindow.cc:
+    - fix proxy authentication (thanks to Jan de Mooij) 
+      (LP#86769)
+
+ -- Michael Vogt <[e-mail]>  Tue, 27 Feb 2007 12:34:12 +0100
+
+synaptic (0.57.11.1ubuntu9) feisty; urgency=low
+
+  * remove file descriptor resource leak 
+  * depend on latest apt (needs rebuild to fix resource leak)
+  * fix crash in "Add downloaded packages" (LP#85934)
+
+ -- Michael Vogt <[e-mail]>  Mon, 26 Feb 2007 14:31:31 +0100
+
+synaptic (0.57.11.1ubuntu8) feisty; urgency=low
+
+  * move the desktop file back into new control center as it confused
+    too many people and we want to get rid of Applications/System Tools
+    (LP: #84984)
+  * fixed memory corruption problem on reopening the cache
+    (LP#81624)
+
+ -- Michael Vogt <[e-mail]>  Mon, 19 Feb 2007 10:33:32 +0100
+
+synaptic (0.57.11.1ubuntu7) feisty; urgency=low
+
+  * really use software-properties-gtk if available (LP#84248)
+  * move the desktop file out of settings because it does no longer
+    fit there with the new control center in gnome 2.17
+    (LP: #83658)
+  * fix version number generation for the about dialog (lp: #84626)
+
+ -- Michael Vogt <[e-mail]>  Mon, 12 Feb 2007 19:05:35 +0100
+
+synaptic (0.57.11.1ubuntu6) feisty; urgency=low
+
+  * use software-properties-gtk if available
+  * rebuild against latest apt version
+
+ -- Michael Vogt <[e-mail]>  Tue,  6 Feb 2007 16:37:48 +0100
+
+synaptic (0.57.11.1ubuntu5) feisty; urgency=low
+
+  * fix corner-case bug in --set-selections, --non-interactive (lp: #81428)
+
+ -- Michael Vogt <[e-mail]>  Fri, 26 Jan 2007 10:41:48 +0100
+
+synaptic (0.57.11.1ubuntu4) feisty; urgency=low
+
+  * debian/rules: 
+    - fix automatic version number generation
+
+ -- Michael Vogt <[e-mail]>  Mon, 22 Jan 2007 15:27:59 +0100
+
+synaptic (0.57.11.1ubuntu2) feisty; urgency=low
+
+  * added "Origins" view (AlwaysEnableUniverseMultiverse spec)
+
+ -- Michael Vogt <[e-mail]>  Wed, 20 Dec 2006 19:05:08 +0100
+
+synaptic (0.57.11.1ubuntu1) feisty; urgency=low
+
+  * merged with debian
+
+ -- Michael Vogt <[e-mail]>  Wed, 20 Dec 2006 17:30:46 +0100
+
+synaptic (0.57.11.1) unstable; urgency=high
+
+  * gtk/rgmainwindow.cc:
+    - fix crash in "Lock package"
+  * gtk/rgpreferenceswindow.cc:
+    - add default font to fix crash
+
+ -- Michael Vogt <[e-mail]>  Mon, 18 Dec 2006 10:52:08 +0100
+
+synaptic (0.57.11ubuntu13) edgy; urgency=low
+
+  * gtk/rgmainwindow.cc:
+    - fix crash in "Lock package" (lp: 64005)
+  * gtk/rgpreferenceswindow.cc:
+    - add default font to fix crash (lp: 65553)
+
+ -- Michael Vogt <[e-mail]>  Mon, 23 Oct 2006 16:12:55 +0200
+
+synaptic (0.57.11ubuntu12) edgy; urgency=low
+
+  * gtk/gsyncaptic.cc:
+    - fix in the checking for already runing synaptic (lp: 62754)
+
+ -- Michael Vogt <[e-mail]>  Wed, 11 Oct 2006 18:09:16 +0200
+
+synaptic (0.57.11ubuntu11) edgy; urgency=low
+
+  * common/rpackagelister.cc:
+    - use pkgActionGroup to fix performance regression in setSelection()
+  * performance regression fixes (lp: #63171)
+
+ -- Michael Vogt <[e-mail]>  Tue, 10 Oct 2006 13:57:42 +0200
+
+synaptic (0.57.11ubuntu10) edgy; urgency=low
+
+  * common/rpackagelister.cc:
+    - run refresh() after re-adjusting the size of the packages (lp: #62298)
+
+ -- Michael Vogt <[e-mail]>  Tue, 26 Sep 2006 17:33:28 +0200
+
+synaptic (0.57.11ubuntu9) edgy; urgency=low
+
+  * fix problem with pkgs disappering from the current view when
+    certain auto-removable packages are marked for removal
+
+ -- Michael Vogt <[e-mail]>  Thu, 21 Sep 2006 13:39:35 +0200
+
+synaptic (0.57.11ubuntu8) edgy; urgency=low
+
+  * redo the auto flag on "restoreState()" too
+
+ -- Michael Vogt <[e-mail]>  Thu, 21 Sep 2006 00:55:16 +0200
+
+synaptic (0.57.11ubuntu7) edgy; urgency=low
+
+  * auto install/garbage filter added
+
+ -- Michael Vogt <[e-mail]>  Wed, 20 Sep 2006 15:04:36 +0200
+
+synaptic (0.57.11ubuntu6) edgy; urgency=low
+
+  * fix mark/unmark auto 
+
+ -- Michael Vogt <[e-mail]>  Wed, 20 Sep 2006 14:18:43 +0200
+
+synaptic (0.57.11ubuntu5) edgy; urgency=low
+
+  * fix performance regression when canceling a operation
+
+ -- Michael Vogt <[e-mail]>  Mon, 11 Sep 2006 11:52:30 +0200
+
+synaptic (0.57.11ubuntu4) edgy; urgency=low
+
+  * when switching views, don't autoselect "All"
+  * support the "metapackages" section
+
+ -- Michael Vogt <[e-mail]>  Wed,  6 Sep 2006 20:30:45 +0200
+
+synaptic (0.57.11ubuntu3) edgy; urgency=low
+
+  * make "Fix Missing" and "Set Selections" faster (thanks to seb128
+    for discovering this problem)
+
+ -- Michael Vogt <[e-mail]>  Mon,  4 Sep 2006 15:59:20 +0200
+
+synaptic (0.57.11ubuntu2) edgy; urgency=low
+
+  * merged the ddtp support
+
+ -- Michael Vogt <[e-mail]>  Mon, 14 Aug 2006 16:26:28 +0200
+
+synaptic (0.57.11ubuntu1) edgy; urgency=low
+
+  * merged with debian
+
+ -- Michael Vogt <[e-mail]>  Thu, 27 Jul 2006 15:17:03 +0200
 
 synaptic (0.57.11.1) unstable; urgency=high
 
@@ -378,6 +1035,32 @@
   
  -- Michael Vogt <[e-mail]>  Thu, 27 Jul 2006 15:12:31 +0200
 
+synaptic (0.57.10ubuntu3) edgy; urgency=low
+
+  * show broken packages in the status view as well
+  * don't show a download window if nothing is going to be downloaded
+  * cleanups
+
+ -- Michael Vogt <[e-mail]>  Fri, 21 Jul 2006 11:47:31 +0200
+
+synaptic (0.57.10ubuntu2) edgy; urgency=low
+
+  * fixed FTBFS
+  * build-dep on latest vte
+
+ -- Michael Vogt <[e-mail]>  Tue,  4 Jul 2006 16:17:25 +0200
+
+synaptic (0.57.10ubuntu1) edgy; urgency=low
+
+  * po/ja.po: updated japanese translation (thanks to Daisuke SUZUKI)
+  * po/sv.po: updated translation (thanks to Daniel Nylander)
+  * UI and string fixes (thanks to Sebastian Heinlein)
+  * merged with debian
+  * merged simple support for the apt auto-mark of automatic dependencies
+    feature (new "Installed (auto removable)" status)
+
+ -- Michael Vogt <[e-mail]>  Mon,  3 Jul 2006 21:38:16 +0200
+
 synaptic (0.57.10) unstable; urgency=low
 
   * fix a bug in the skip-taskbar handling (thanks to seb128)
@@ -403,6 +1086,99 @@
 
  -- Michael Vogt <[e-mail]>  Tue, 28 Feb 2006 09:44:42 +0100
 
+synaptic (0.57.8ubuntu11) dapper; urgency=low
+
+  * fix bug that the window is not visisble in the tasklist when run 
+    in "install all upgrades" mode from update-notifier (thanks to
+    seb128 for reporting)
+  * hide the "auto-close" checkbutton when runing non-interactively,
+    because synaptic won't save options then (Ubuntu: #28250)
+  * better deal with invalid utf8 in the package descriptions 
+    (Ubuntu: #37050, #38399)
+  * increase the size of the diff dialog textview (ubuntu: #44012)
+  * search in summary too (ubuntu: #32337)
+  * fix focus problem (ubuntu: #39971)
+
+ -- Michael Vogt <[e-mail]>  Thu, 18 May 2006 11:41:18 +0200
+
+synaptic (0.57.8ubuntu10) dapper; urgency=low
+
+  * g++-4.1 fixes (thanks to Martin Michlmayr) (closes: 357863)
+  * fix the invocation of the external software-properties
+
+ -- Michael Vogt <[e-mail]>  Fri, 21 Apr 2006 10:02:28 +0200
+
+synaptic (0.57.8ubuntu9) dapper; urgency=low
+
+  * fix a bug in the skip-taskbar handling (thanks to seb128)
+  * fix the column sorting (closes: #361070)
+  * use the urgency hint for the conffile prompt (ubuntu: #21898)
+  * better handling of the automatic terminal expanding (ubuntu: #38935)
+
+ -- Michael Vogt <[e-mail]>  Wed, 12 Apr 2006 20:43:23 +0200
+
+synaptic (0.57.8ubuntu8) dapper; urgency=low
+
+  * fix memory corruption problem (ubuntu #37817, #37987)
+
+ -- Michael Vogt <[e-mail]>  Tue,  4 Apr 2006 19:59:35 +0200
+
+synaptic (0.57.8ubuntu7) dapper; urgency=low
+
+  * gtk/window_changes.glade:
+    - make the dialog icon "info" instead of "warning" (ubuntu: #17085)
+  * remove http:// when it was entered as part of the proxy uri 
+    (ubuntu: #18038)
+  * if a dpkg error happens during install run "dpkg --configure -a" 
+    to recover as much as possible (ubuntu: #19021)
+  * if no terminal activity is detected and the terminal is expanded
+    set the urgency hint as well (ubuntu: #31436)
+  * remove http:// when it was entered as part of the proxy uri
+  * include reinstall markings in the "changes" filter
+
+ -- Michael Vogt <[e-mail]>  Sun,  2 Apr 2006 11:40:45 +0200
+
+synaptic (0.57.8ubuntu6) dapper; urgency=low
+
+  * wording fix (ubuntu #36488)
+  * if no terminal activity is detected and the terminal is expanded
+    set the urgency hint as well (ubuntu: #31436)
+
+ -- Michael Vogt <[e-mail]>  Wed, 29 Mar 2006 14:33:19 +0200
+
+synaptic (0.57.8ubuntu5) dapper; urgency=low
+
+  * fix problem with fetch window not centered on parent (thanks to
+    seb128 and glatzor)
+  * fix a missing set_transient() problem (ubuntu #36030)
+
+ -- Michael Vogt <[e-mail]>  Thu, 23 Mar 2006 00:10:25 +0100
+
+synaptic (0.57.8ubuntu4) dapper; urgency=low
+
+  * fix another set_transient() problem with run with --parent-window-id
+    (ubuntu #33406)
+
+ -- Michael Vogt <[e-mail]>  Thu,  2 Mar 2006 15:38:08 +0100
+
+synaptic (0.57.8ubuntu3) dapper; urgency=low
+
+  * data/synaptic.desktop.in: set X-Ubuntu-Gettext-Domain
+  * make "mark" the default response in the "Mark change dialog" (ubuntu #31189)
+  * don't fail if run as non-root, just explain what's wrong
+
+ -- Michael Vogt <[e-mail]>  Fri, 24 Feb 2006 10:35:43 +0100
+
+synaptic (0.57.8ubuntu2) dapper; urgency=low
+
+  * po/th.po: updated Thai Translation (thanks to Isriya Paireepairit)
+  * po/el.po: updated Greek translation (thanks to Kostas Papadimas)
+  * only clean the list dir if a update was successful
+  * fix problem that some windows have a skip taskbar hint but no
+    transient parent (thanks to Seb128 for reporting the problem)
+
+ -- Michael Vogt <[e-mail]>  Tue, 21 Feb 2006 18:59:52 +0100
+
 synaptic (0.57.8) unstable; urgency=low
 
   * po/pl.po: updated Polish translation (thanks to Emilian Nowak)
@@ -415,17 +1191,13 @@
   * po/gl.po: added Galician translation (thanks to Nacho Resa)
   * po/es.po: updated Spanish translation 
     (thanks to Francisco Javier F. Serrador)
-  * po/th.po: updated Thai Translation (thanks to Isriya Paireepairit)
   * po/fi.po: updated Finnish translation (thanks to Ilkka Tuohela)
-  * po/el.po: updated Greek translation (thanks to Kostas Papadimas)
   * fix version number in about dialog (and make sure this is done
     automatically in the future) (closes: #348839)
   * applied patch from Robert Chéramy to fix un-lock problem
     (closes: #334168)
   * added --parent-window-id to make embedding easier
   * wording fixes (malone #22090)
-  * only clean the list dir if a update was successful
-  * make "mark" the default response in the "Mark change dialog"
   
  -- Michael Vogt <[e-mail]>  Tue, 28 Feb 2006 09:44:42 +0100
 
 
=== modified file 'debian/control'
--- debian/control	2009-07-21 08:16:20 +0000
+++ debian/control	2010-02-17 23:07:20 +0000
@@ -1,11 +1,13 @@
 Source: synaptic
 Section: admin
 Priority: optional
-Maintainer: Michael Vogt <[e-mail]>
-Build-Depends: debhelper (>= 5.0.51), libapt-pkg-dev (>= 0.7.0), gettext, libgtk2.0-dev, libvte-dev (>= 0.11.11), libglade2-dev, libxft2-dev, scrollkeeper, intltool, xmlto, libsm-dev , sharutils, dpatch, lsb-release, dpkg (>= 1.13.9)
+Maintainer: Ubuntu Core Developers <[e-mail]>
+XSBC-Original-Maintainer: Michael Vogt <[e-mail]>
+Build-Depends: debhelper (>= 5.0.51), libapt-pkg-dev (>= 0.7.23), gettext, libgtk2.0-dev, libvte-dev (>= 0.11.11), libglade2-dev, libxft2-dev, scrollkeeper, intltool, xmlto, libsm-dev , sharutils, dpatch, lsb-release, dpkg (>= 1.13.9), liblaunchpad-integration-dev, libept-dev (>= 0.5.26ubuntu2)
 Build-Conflicts: librpm-dev
 Standards-Version: 3.7.2.2
-Vcs-Bzr: http://bzr.debian.org/synaptic/synaptic/debian-sid
+Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/synaptic/ubuntu/
+XS-Original-Vcs-Bzr: http://bzr.debian.org/synaptic/synaptic/debian-sid
 
 Package: synaptic
 Architecture: any
@@ -13,8 +15,8 @@
 Provides: gsynaptic
 Replaces: gsynaptic
 Conflicts: gsynaptic, menu (<< 2.1.11)
-Recommends: gksu|kdebase-bin, deborphan, libgnome2-perl, menu
-Suggests: dwww
+Recommends: gksu|kdebase-bin, libgnome2-perl, software-properties-gtk, apt-xapian-index
+Suggests: dwww, menu, deborphan
 Description: Graphical package manager 
  Synaptic is a graphical package management tool based on GTK+ and APT.
  Synaptic enables you to install, upgrade and remove software packages in
 
=== modified file 'debian/patches/00list.Ubuntu'
--- debian/patches/00list.Ubuntu	2007-10-04 08:45:12 +0000
+++ debian/patches/00list.Ubuntu	2010-02-17 23:07:20 +0000
@@ -3,3 +3,4 @@
 03_hide_browse_documentation
 04_ubuntu_lpi
 06_ubuntu_su_to_root
+10_ubuntu_maintenance_gui
 
=== modified file 'debian/patches/01_ubuntu_changelog.dpatch'
--- debian/patches/01_ubuntu_changelog.dpatch	2009-06-04 16:12:33 +0000
+++ debian/patches/01_ubuntu_changelog.dpatch	2010-02-17 23:07:20 +0000
@@ -5,10 +5,10 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad synaptic-0.56/common/rpackage.cc /tmp/dpep.Ri9fRS/synaptic-0.56/common/rpackage.cc
---- synaptic-0.56/common/rpackage.cc	2005-02-18 13:28:43.000000000 +0100
-+++ /tmp/dpep.Ri9fRS/synaptic-0.56/common/rpackage.cc	2005-02-18 14:39:17.005309176 +0100
-@@ -810,7 +810,7 @@
+diff -urNad ubuntu~/common/rpackage.cc ubuntu/common/rpackage.cc
+--- ubuntu~/common/rpackage.cc	2009-09-18 23:37:47.000000000 +0200
++++ ubuntu/common/rpackage.cc	2009-09-18 23:40:55.071662698 +0200
+@@ -875,7 +875,7 @@
     if(verstr.find(':')!=verstr.npos)
        verstr=string(verstr, verstr.find(':')+1);
     char uri[512];
@@ -17,7 +17,10 @@
                                 src_section.c_str(),
                                 prefix.c_str(),
                                 srcpkg.c_str(),
-@@ -1293,7 +1293,7 @@
+diff -urNad ubuntu~/common/rpackagestatus.cc ubuntu/common/rpackagestatus.cc
+--- ubuntu~/common/rpackagestatus.cc	2009-09-18 23:37:47.000000000 +0200
++++ ubuntu/common/rpackagestatus.cc	2009-09-18 23:41:36.086660327 +0200
+@@ -69,7 +69,7 @@
        markUnsupported = true;
  
        // read supported labels
@@ -26,12 +29,21 @@
        stringstream sst1(labels);
        while(!sst1.eof()) {
  	 sst1 >> s;
-@@ -1301,7 +1301,7 @@
+@@ -77,7 +77,7 @@
+       }
+ 
+       // read supported origins
+-      origin = _config->Find("Synaptic::supported-origins", "Debian");
++      origin = _config->Find("Synaptic::supported-origins", "Ubuntu");
+       stringstream sst2(origin);
+       while(!sst2.eof()) {
+ 	 sst2 >> s;
+@@ -85,7 +85,7 @@
        }
        
        // read supported components
 -      components = _config->Find("Synaptic::supported-components", "main updates/main");
 +      components = _config->Find("Synaptic::supported-components", "main updates/main restricted");
-       stringstream sst2(components);
-       while(!sst2.eof()) {
- 	 sst2 >> s;
+       stringstream sst3(components);
+       while(!sst3.eof()) {
+ 	 sst3 >> s;
 
=== modified file 'debian/patches/03_hide_browse_documentation.dpatch' (properties changed: -x to +x)
=== modified file 'debian/patches/04_ubuntu_lpi.dpatch' (properties changed: -x to +x)
=== modified file 'debian/patches/06_ubuntu_su_to_root.dpatch' (properties changed: -x to +x)
=== added file 'debian/patches/10_ubuntu_maintenance_gui.dpatch'
--- debian/patches/10_ubuntu_maintenance_gui.dpatch	1970-01-01 00:00:00 +0000
+++ debian/patches/10_ubuntu_maintenance_gui.dpatch	2010-02-17 23:07:20 +0000
@@ -0,0 +1,187 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_foo.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad ubuntu~/common/rpackagestatus.cc ubuntu/common/rpackagestatus.cc
+--- ubuntu~/common/rpackagestatus.cc	2010-01-25 12:01:12.070416517 +0100
++++ ubuntu/common/rpackagestatus.cc	2010-01-25 12:02:01.380407389 +0100
+@@ -185,7 +185,8 @@
+    pkgTagSection sec;
+    time_t release_date = -1;
+ 
+-   string distro = _config->Find("Synaptic::supported-label");
++   // FIXME: make this use the "labels" vector in the future
++   string distro = _config->Find("Synaptic::supported-label","Ubuntu");
+    string releaseFile = pkg->getReleaseFileForOrigin(distro, release);
+    if(!FileExists(releaseFile)) {
+       // happens e.g. when there is no release file and is harmless
+@@ -209,10 +210,26 @@
+    // now calculate the time until there is support
+    gmtime_r(&release_date, res);
+    
+-   const int support_time =_config->FindI("Synaptic::supported-month", 0);
++   int support_time =_config->FindI("Synaptic::supported-month", 18);
+    if (support_time <= 0)
+       return false;
+ 
++   // check if the package overwrites the support time, this has the
++   // format "5y", "18m" etc
++   string support_time_str = pkg->findTagFromPkgRecord("Supported");
++   size_t len = support_time_str.length();
++   if(len > 1) {
++      int factor = 1;
++      if (support_time_str[len-1] == 'y')
++	 factor = 12;
++      else if (support_time_str[len-1] == 'm')
++	 factor = 1;
++      else 
++	 cerr << "Unknown support tag: " << support_time_str  << endl;
++      // and covert to an integer (skipping the last char 'y')
++      support_time = factor * atoi(support_time_str.substr(0, len-1).c_str());
++   }
++
+    res->tm_year += (support_time / 12) + ((res->tm_mon + support_time % 12) / 12);
+    res->tm_mon = (res->tm_mon + support_time) % 12;
+ 
+diff -urNad ubuntu~/gtk/glade/window_main.glade ubuntu/gtk/glade/window_main.glade
+--- ubuntu~/gtk/glade/window_main.glade	2010-01-25 12:01:12.100413355 +0100
++++ ubuntu/gtk/glade/window_main.glade	2010-01-25 12:02:01.561112535 +0100
+@@ -1351,8 +1351,8 @@
+ 			      <property name="pixels_above_lines">3</property>
+ 			      <property name="pixels_below_lines">3</property>
+ 			      <property name="pixels_inside_wrap">0</property>
+-			      <property name="left_margin">3</property>
+-			      <property name="right_margin">3</property>
++			      <property name="left_margin">12</property>
++			      <property name="right_margin">12</property>
+ 			      <property name="indent">0</property>
+ 			      <property name="text" translatable="yes"></property>
+ 			    </widget>
+diff -urNad ubuntu~/gtk/rgpkgdetails.cc ubuntu/gtk/rgpkgdetails.cc
+--- ubuntu~/gtk/rgpkgdetails.cc	2010-01-25 11:59:47.000000000 +0100
++++ ubuntu/gtk/rgpkgdetails.cc	2010-01-25 12:02:01.561112535 +0100
+@@ -24,6 +24,8 @@
+ #include "config.h"
+ 
+ #include <cassert>
++#include <langinfo.h>
++
+ #include "rgwindow.h"
+ #include "rgmainwindow.h"
+ #include "rgpkgdetails.h"
+@@ -191,33 +193,17 @@
+ 				 "scale", 1.1, 
+ 				 NULL);
+    }
++   if(gtk_text_tag_table_lookup(tag_table, "gray") == NULL) {
++      gtk_text_buffer_create_tag(buf, "gray", 
++				 "foreground", "darkgray", 
++				 NULL);
++   }
+    // set summary
+    s = utf8(pkg->summary());
+    gtk_text_buffer_get_start_iter(buf, &it);
+    gtk_text_buffer_insert(buf, &it, s, -1);
+    gtk_text_buffer_get_start_iter(buf, &start);
+    gtk_text_buffer_apply_tag_by_name(buf, "bold", &start, &it);
+-   // set emblems 
+-   GdkPixbuf *pixbuf = RGPackageStatus::pkgStatus.getSupportedPix(pkg);
+-   if(pixbuf != NULL) {
+-      // insert space
+-      gtk_text_buffer_insert(buf, &it, " ", 1);
+-      // make image
+-      emblem = gtk_image_new_from_pixbuf(pixbuf);
+-      gtk_image_set_pixel_size(GTK_IMAGE(emblem), 16);
+-      // set eventbox and tooltip
+-      GtkWidget *event = gtk_event_box_new();
+-      GtkStyle *style = gtk_widget_get_style(textview);
+-      gtk_widget_modify_bg(event, GTK_STATE_NORMAL, 
+-			   &style->base[GTK_STATE_NORMAL]);
+-      gtk_container_add(GTK_CONTAINER(event), emblem);
+-      gtk_tooltips_set_tip(tips, event, _("This application is supported by the distribution"), "");
+-      // create anchor
+-      GtkTextChildAnchor *anchor = gtk_text_buffer_create_child_anchor(buf, &it);
+-      gtk_text_view_add_child_at_anchor(GTK_TEXT_VIEW(textview), event, anchor);
+-      gtk_widget_show_all(event);
+-   }
+-
+    // add button to get screenshot
+    gtk_text_buffer_insert(buf, &it, "\n", 1);
+    GtkTextChildAnchor *anchor = gtk_text_buffer_create_child_anchor(buf, &it);
+@@ -237,6 +223,51 @@
+    s = utf8(pkg->description());
+    gtk_text_buffer_insert(buf, &it, s, -1);
+    
++   // now check if we have a support time
++   gchar *maint_str = NULL;
++   struct tm end_time;
++   if(pkg->label() == "Ubuntu" && pkg->origin() == "Ubuntu") {
++      if(RGPackageStatus::pkgStatus.maintenanceEndTime(pkg, &end_time)) {
++ 	 if (pkg->component() == "main")
++ 	    maint_str = g_strdup_printf(_("\n\n"
++ 	    "Canonical provides critical updates for %s "
++ 	    "until %s %i."), 
++ 	    pkg->name(), 
++ 	    nl_langinfo(MON_1+end_time.tm_mon), 
++ 	    end_time.tm_year + 1900);
++ 	 else if (pkg->component() == "restricted")
++ 	    maint_str = g_strdup_printf(_("\n\n"
++ 	    "Canonical provides critical updates "
++ 	    "supplied by the developers of %s "
++ 	    "until %s %i."),
++ 	    pkg->name(), 
++ 	    nl_langinfo(MON_1+end_time.tm_mon), 
++ 	    end_time.tm_year + 1900);
++      } else {
++ 	 if (pkg->component() == "main")
++ 	    maint_str = g_strdup_printf(_("\n\n"
++ 	    "Canonical provides critical updates for %s."),
++ 	    pkg->name());
++ 	 else if (pkg->component() == "restricted")
++ 	    maint_str = g_strdup_printf(_("\n\n"
++ 	    "Canonical provides critical updates "
++ 	    "supplied by the developers of %s."),
++ 	    pkg->name());
++ 	 else if (pkg->component() == "universe" ||
++ 	 pkg->component() == "multiverse") 
++ 	    maint_str = g_strdup_printf(_("\n\n"
++ 	    "Canonical does not provide "
++ 	    "updates for %s. "
++ 	    "Some updates may be provided "
++ 	    "by the Ubuntu community."),
++ 	    pkg->name());
++      }
++   }
++   if(maint_str)
++      gtk_text_buffer_insert_with_tags_by_name(buf, 
++      &it, maint_str, -1, 
++      "gray", NULL);
++   g_free(maint_str);
+ 
+    // build dependency lists
+    vector<DepInformation> deps;
+diff -urNad ubuntu~/tests/test_rpackage.cc ubuntu/tests/test_rpackage.cc
+--- ubuntu~/tests/test_rpackage.cc	2010-01-25 11:59:47.000000000 +0100
++++ ubuntu/tests/test_rpackage.cc	2010-01-25 12:02:01.561112535 +0100
+@@ -17,6 +17,7 @@
+    RPackage *pkg = lister->getPackage("eog");
+    cerr << "pkg: " << pkg->name() << endl;
+    cerr << "Bugs: " << pkg->findTagFromPkgRecord("Bugs") << endl;
++   cerr << "Supported: " << pkg->findTagFromPkgRecord("Supported") << endl;
+ 
+    vector<DepInformation> deps = pkg->enumDeps();
+    for(unsigned int i=0;i<deps.size();i++) {
+@@ -37,4 +38,10 @@
+       s = all[i]->getRawRecord();
+    }
+    cerr << "iterating each record: " << float(clock()-now)/CLOCKS_PER_SEC << endl;
++   // read supported info
++   cerr << "Checking for supported info:" << endl;
++   for(int i=0;i<all.size();i++) {
++      if(all[i]->findTagFromPkgRecord("Supported").empty() == false)
++	 cerr << "pkg: " << all[i]->name() << " has support info" << endl;
++   }
+ }
 
=== modified file 'debian/rules'
--- debian/rules	2008-11-18 18:19:57 +0000
+++ debian/rules	2010-02-17 23:07:20 +0000
@@ -29,6 +29,7 @@
 	      --localstatedir=/var/lib/synaptic \
 	      --sysconfdir=/etc --with-vte --with-pkg-hold \
 	      --with-apt-authentication \
+              --enable-ept \
 	      --with-nice-dpkg-status
 
 CREATE_SUPPORTED_PIXMAP="true"
@@ -37,7 +38,7 @@
 # special case for ubuntu
 ifeq "$(DIST)" "Ubuntu"
 	CONFIGURE_FLAGS = $(COMMON_FLAGS) --with-launchpad-integration
-	CREATE_SUPPORTED_PIXMAP=uudecode debian/package-supported.png.uu -o $(CURDIR)/debian/synaptic/usr/share/synaptic/pixmaps/package-supported.png
+	CREATE_SUPPORTED_PIXMAP=uudecode debian/package-supported.png.uu -o $(CURDIR)/debian/synaptic/usr/share/icons/hicolor/16x16/actions/package-supported.png
 endif
 
 
 
=== modified file 'debian/synaptic.dirs'
--- debian/synaptic.dirs	2008-04-26 08:32:09 +0000
+++ debian/synaptic.dirs	2010-02-17 23:07:20 +0000
@@ -1,1 +1,2 @@
 var/lib/synaptic
+usr/share/icons/hicolor/16x16/actions/
 
=== modified file 'gtk/Makefile.am'
--- gtk/Makefile.am	2008-08-21 14:32:18 +0000
+++ gtk/Makefile.am	2010-02-17 23:07:20 +0000
@@ -7,7 +7,7 @@
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	-DSYNAPTIC_GLADEDIR=\""$(datadir)/synaptic/glade/"\" \
 	-DSYNAPTIC_PIXMAPDIR=\""$(datadir)/synaptic/pixmaps/"\" \
-	@PACKAGE_CFLAGS@ @VTE_CFLAGS@ @LP_CFLAGS@ $(LIBTAGCOLL_CFLAGS)
+	@PACKAGE_CFLAGS@ @VTE_CFLAGS@ @LP_CFLAGS@ $(LIBEPT_CFLAGS)
 
 sbin_PROGRAMS = synaptic 
 
@@ -17,7 +17,7 @@
 	${top_builddir}/common/libsynaptic.a\
 	-lapt-pkg @RPM_LIBS@ @DEB_LIBS@ \
 	@PACKAGE_LIBS@ @VTE_LIBS@ @LP_LIBS@\
-	-lpthread $(LIBTAGCOLL_LIBS)  
+	-lpthread $(LIBEPT_LIBS)  
 
 synaptic_SOURCES= \
 	gsynaptic.cc\
 
=== modified file 'gtk/glade/window_fetch.glade'
--- gtk/glade/window_fetch.glade	2008-05-08 23:25:25 +0000
+++ gtk/glade/window_fetch.glade	2010-02-17 23:07:21 +0000
@@ -5,6 +5,7 @@
 
 <widget class="GtkWindow" id="window_fetch">
   <property name="border_width">6</property>
+  <property name="default_width">450</property>
   <property name="title" translatable="yes"></property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
 
=== modified file 'gtk/glade/window_main.glade'
--- gtk/glade/window_main.glade	2008-05-21 16:09:02 +0000
+++ gtk/glade/window_main.glade	2010-02-17 23:07:21 +0000
@@ -968,6 +968,85 @@
 		  </child>
 
 		  <child>
+		    <widget class="GtkToolItem" id="toolitem2">
+		      <property name="visible">True</property>
+		      <property name="visible_horizontal">True</property>
+		      <property name="visible_vertical">True</property>
+		      <property name="is_important">False</property>
+
+		      <child>
+			<widget class="GtkVBox" id="vbox_fast_search">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkLabel" id="label_fast_search">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Quick search</property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkEntry" id="entry_fast_search">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="editable">True</property>
+			      <property name="visibility">True</property>
+			      <property name="max_length">0</property>
+			      <property name="text" translatable="yes"></property>
+			      <property name="has_frame">True</property>
+			      <property name="invisible_char">●</property>
+			      <property name="activates_default">False</property>
+			      <signal name="changed" handler="on_entry_fast_search_changed" last_modification_time="Wed, 28 May 2008 15:06:32 GMT"/>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+			</widget>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="expand">False</property>
+		      <property name="homogeneous">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkSeparatorToolItem" id="separatortoolitem3">
+		      <property name="visible">True</property>
+		      <property name="draw">True</property>
+		      <property name="visible_horizontal">True</property>
+		      <property name="visible_vertical">True</property>
+		    </widget>
+		    <packing>
+		      <property name="expand">False</property>
+		      <property name="homogeneous">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
 		    <widget class="GtkToolButton" id="button1">
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Search</property>
@@ -983,6 +1062,10 @@
 		      <property name="homogeneous">True</property>
 		    </packing>
 		  </child>
+
+		  <child>
+		    <placeholder/>
+		  </child>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
 
=== modified file 'gtk/gtkpkglist.cc'
--- gtk/gtkpkglist.cc	2008-08-21 14:32:18 +0000
+++ gtk/gtkpkglist.cc	2010-02-17 23:07:20 +0000
@@ -657,31 +657,34 @@
 	 pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_SUPPORTED_DES);
       break;
    case NAME_COLUMN:
-      pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_NAME);
+      if(pkg_list->order)
+     pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_NAME_DES);
+      else
+     pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_NAME_ASC);
       break;
    case PKG_SIZE_COLUMN:
       if(pkg_list->order)
+	 pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_SIZE_DES);
+      else
 	 pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_SIZE_ASC);
-      else
-	 pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_SIZE_DES);
       break;
    case COMPONENT_COLUMN:
       if(pkg_list->order)
+	 pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_COMPONENT_DES);
+      else
 	 pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_COMPONENT_ASC);
-      else
-	 pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_COMPONENT_DES);
       break;
    case SECTION_COLUMN:
       if(pkg_list->order)
+	 pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_SECTION_DES);
+      else
 	 pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_SECTION_ASC);
-      else
-	 pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_SECTION_DES);
       break;
    case PKG_DOWNLOAD_SIZE_COLUMN:
       if(pkg_list->order)
+	 pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_DLSIZE_DES);
+      else
 	 pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_DLSIZE_ASC);
-      else
-	 pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_DLSIZE_DES);
       break;
    case AVAILABLE_VERSION_COLUMN:
       if(pkg_list->order)
@@ -697,7 +700,7 @@
       break;
    default:
       //cerr << "unknown sort column: " << pkg_list->sort_column_id << endl;
-      pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_NAME);
+      pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_NAME_ASC);
    }
 }
 
 
=== modified file 'gtk/rgdebinstallprogress.cc'
--- gtk/rgdebinstallprogress.cc	2010-02-11 14:17:40 +0000
+++ gtk/rgdebinstallprogress.cc	2010-02-17 23:07:20 +0000
@@ -713,16 +713,26 @@
    }
    gtk_widget_show(img);
    
-
-   // wait for the user to click on "close"
-   while(!_updateFinished && !autoClose) {
+   // wait for user action
+   while(true) {
+      // events
+      while (gtk_events_pending())
+	 gtk_main_iteration();
+
+      // user clicked "close" button
+      if(_updateFinished) 
+	 break;
+
+      // user has autoClose set *and* there was no error
       autoClose= gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(_autoClose));
-      while (gtk_events_pending())
-	 gtk_main_iteration();
-      usleep(5000);
+      if(autoClose && res != 1)
+	 break;
+      
+      // wait a bit
+      g_usleep(100000);
    }
-
-   // get the value again, it may have changed
+      
+   // set the value again, it may have changed
    _config->Set("Synaptic::closeZvt", autoClose	? "true" : "false");
 
    // hide and finish
 
=== modified file 'gtk/rgmainwindow.cc'
--- gtk/rgmainwindow.cc	2009-06-10 07:45:48 +0000
+++ gtk/rgmainwindow.cc	2010-02-17 23:07:20 +0000
@@ -296,7 +296,14 @@
       ioprintf(clog, "RGMainWindow::refreshTable(): pkg: '%s' adjust '%i'\n", 
 	       selectedPkg != NULL ? selectedPkg->name() : "(no pkg)", 
 	       setAdjustment);
-   
+
+   const gchar *str = gtk_entry_get_text(GTK_ENTRY(_entry_fast_search));
+   if(str != NULL && strlen(str) > 1) {
+      if(_config->FindB("Debug::Synaptic::View",false))
+	 cerr << "RGMainWindow::refreshTable: rerun limitBySearch" << endl;
+      _lister->limitBySearch(str);
+   }
+
    _pkgList = GTK_TREE_MODEL(gtk_pkg_list_new(_lister));
    gtk_tree_view_set_model(GTK_TREE_VIEW(_treeView),
                            GTK_TREE_MODEL(_pkgList));
@@ -757,7 +764,8 @@
 RGMainWindow::RGMainWindow(RPackageLister *packLister, string name)
    : RGGladeWindow(NULL, name), _lister(packLister), _pkgList(0), 
      _treeView(0), _tasksWin(0), _iconLegendPanel(0), _pkgDetails(0),
-     _logView(0), _installProgress(0), _fetchProgress(0)
+     _logView(0), _installProgress(0), _fetchProgress(0), 
+     _fastSearchEventID(-1)
 {
    assert(_win);
 
@@ -807,11 +815,80 @@
    }
    g_value_unset(&value);
 
+   xapianDoIndexUpdate(this);
+
    // apply the proxy settings
    RGPreferencesWindow::applyProxySettings();
 }
 
-
+#ifdef WITH_EPT
+gboolean RGMainWindow::xapianDoIndexUpdate(void *data)
+{
+   RGMainWindow *me = (RGMainWindow *) data;
+   if(_config->FindB("Debug::Synaptic::Xapian",false))
+      std::cerr << "xapianDoIndexUpdate()" << std::endl;
+
+   // no need to update if we run non-interactive
+   if(_config->FindB("Volatile::Non-Interactive", false) == true)
+      return false;
+
+   // check if we need a update
+   if(!me->_lister->xapianIndexNeedsUpdate()) {
+      // if the cache is not open, check back when it is
+      if (me->_lister->packagesSize() == 0)
+	 g_timeout_add_seconds(30, xapianDoIndexUpdate, me);
+      return false;
+   }
+
+   // do not run if we don't have it
+   if(!FileExists("/usr/sbin/update-apt-xapian-index"))
+      return false;
+   // no permission
+   if (getuid() != 0)
+      return false;
+
+   // if we make it to this point, we need a xapian update
+   if(_config->FindB("Debug::Synaptic::Xapian",false))
+      std::cerr << "running update-apt-xapian-index" << std::endl;
+   GPid pid;
+   char *argp[] = {"/usr/bin/nice",
+		   "/usr/bin/ionice","-c3",
+		   "/usr/sbin/update-apt-xapian-index", 
+		   "--update", "-q",
+		   NULL};
+   if(g_spawn_async(NULL, argp, NULL, 
+		    (GSpawnFlags)(G_SPAWN_DO_NOT_REAP_CHILD),
+		    NULL, NULL, &pid, NULL)) {
+      g_child_watch_add(pid,  (GChildWatchFunc)xapianIndexUpdateFinished, me);
+      gtk_label_set_text(GTK_LABEL(glade_xml_get_widget(me->_gladeXML, 
+							"label_fast_search")),
+			 _("Rebuilding search index"));
+   }
+   return false;
+}
+#else
+gboolean RGMainWindow::xapianDoIndexUpdate(void *data)
+{
+   return false;
+}
+#endif
+
+void RGMainWindow::xapianIndexUpdateFinished(GPid pid, gint status, void* data)
+{
+   RGMainWindow *me = (RGMainWindow *) data;
+   if(_config->FindB("Debug::Synaptic::Xapian",false))
+      std::cerr << "xapianIndexUpdateFinished: "  
+		<< WEXITSTATUS(status) << std::endl;
+#ifdef WITH_EPT
+   me->_lister->openXapianIndex();
+#endif
+   gtk_label_set_text(GTK_LABEL(glade_xml_get_widget(me->_gladeXML, 
+						     "label_fast_search")),
+		      _("Quick search"));
+   gtk_widget_set_sensitive(glade_xml_get_widget(me->_gladeXML, 
+						 "entry_fast_search"), TRUE);
+   g_spawn_close_pid(pid);
+}
 
 // needed for the buildTreeView function
 struct mysort {
@@ -1123,6 +1200,9 @@
    glade_xml_signal_connect_data(_gladeXML,
                                  "on_button_details_clicked",
                                  G_CALLBACK(cbDetailsWindow), this);
+   glade_xml_signal_connect_data(_gladeXML,
+                                 "on_entry_fast_search_changed",
+                                 G_CALLBACK(cbSearchEntryChanged), this);
 
    _propertiesB = glade_xml_get_widget(_gladeXML, "button_details");
    assert(_propertiesB);
@@ -1638,7 +1718,18 @@
    gtk_binding_entry_add_signal(binding_set, GDK_s, GDK_CONTROL_MASK,
 				"start_interactive_search", 0);
 
+   _entry_fast_search = glade_xml_get_widget(_gladeXML, "entry_fast_search");
 
+   // only enable fast search if its usable
+#ifdef WITH_EPT
+   if(!_lister->textsearch() || 
+      !_lister->textsearch()->hasData() || 
+      !FileExists("/usr/sbin/update-apt-xapian-index")) {
+      gtk_widget_set_sensitive(glade_xml_get_widget(_gladeXML, "entry_fast_search"), FALSE);
+   }
+#else
+   gtk_widget_hide(glade_xml_get_widget(_gladeXML, "vbox_fast_search"));
+#endif
    // stuff for the non-root mode
    if(getuid() != 0) {
       GtkWidget *menu;
@@ -2330,10 +2421,15 @@
    if (me->_findWin == NULL) {
       me->_findWin = new RGFindWindow(me);
    }
-
+   
    me->_findWin->selectText();
    int res = gtk_dialog_run(GTK_DIALOG(me->_findWin->window()));
    if (res == GTK_RESPONSE_OK) {
+
+      // clear the quick search, otherwise both apply and that is
+      // confusing
+      gtk_entry_set_text(GTK_ENTRY(me->_entry_fast_search), "");
+
       string str = me->_findWin->getFindString();
       me->setBusyCursor(true);
 
@@ -2820,6 +2916,47 @@
                 gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cb)));
 }
 
+gboolean RGMainWindow::xapianDoSearch(void *data)
+{
+   RGMainWindow *me = (RGMainWindow *) data;
+   const gchar *str = gtk_entry_get_text(GTK_ENTRY(me->_entry_fast_search));
+
+   me->_fastSearchEventID = -1;
+   me->setBusyCursor(true);
+   RGFlushInterface();
+   if(str == NULL || strlen(str) < 1) {
+      // reset the color
+      gtk_widget_modify_base(me->_entry_fast_search, GTK_STATE_NORMAL, NULL);
+      // if the user has cleared the search, refresh the view
+      me->_lister->reapplyFilter();
+      me->refreshTable();
+      me->setBusyCursor(false);
+   } else if(strlen(str) > 1) {
+      // only search when there is more than one char entered, single
+      // char searches tend to be very slow
+      me->setBusyCursor(true);
+      RGFlushInterface();
+      me->refreshTable();
+      // set color to a light yellow to make it more obvious that a search
+      // is performed
+      GdkColor yellowish = {0, 63479,63479,48830};
+      gtk_widget_modify_base(me->_entry_fast_search, GTK_STATE_NORMAL, &yellowish);
+   }
+   me->setBusyCursor(false);
+
+   return FALSE;
+}
+
+void RGMainWindow::cbSearchEntryChanged(GtkWidget *edit, void *data)
+{
+   //cerr << "RGMainWindow::cbSearchEntryChanged()" << endl;
+   RGMainWindow *me = (RGMainWindow *) data;
+   if(me->_fastSearchEventID > 0) {
+      g_source_remove(me->_fastSearchEventID);
+      me->_fastSearchEventID = -1;
+   }
+   me->_fastSearchEventID = g_timeout_add(500, xapianDoSearch, me);
+}
 
 void RGMainWindow::cbUpdateClicked(GtkWidget *self, void *data)
 {
@@ -2886,6 +3023,9 @@
    unlink(file);
    g_free((void *)file);
 
+   // check if the index needs to be rebuild
+   me->xapianDoIndexUpdate(me);
+
    me->setTreeLocked(FALSE);
    me->refreshTable();
    me->refreshSubViewList();
 
=== modified file 'gtk/rgmainwindow.h'
--- gtk/rgmainwindow.h	2007-06-18 13:12:44 +0000
+++ gtk/rgmainwindow.h	2010-02-17 23:07:20 +0000
@@ -132,6 +132,10 @@
    RGFetchProgress *_fetchProgress;
    RGWindow *_installProgress;
 
+   // fast search stuff
+   int _fastSearchEventID;
+   GtkWidget *_entry_fast_search;
+
    // the buttons for the various views
    GtkWidget *_viewButtons[N_PACKAGE_VIEWS];
 
@@ -172,6 +176,12 @@
    // install a non-standard version (data is a char* of the version)
    static void cbInstallFromVersion(GtkWidget *self, void *data);
 
+   // helpers for search-as-you-type 
+   static void cbSearchEntryChanged(GtkWidget *editable, void *data);
+   static void xapianIndexUpdateFinished(GPid pid, gint status, void* data);
+   static gboolean xapianDoSearch(void *data);
+   static gboolean xapianDoIndexUpdate(void *data);
+
    // RPackageObserver
    virtual void notifyChange(RPackage *pkg);
    virtual void notifyPreFilteredChange() {
 
=== modified file 'gtk/rgpkgdetails.cc'
--- gtk/rgpkgdetails.cc	2008-11-18 20:21:49 +0000
+++ gtk/rgpkgdetails.cc	2010-02-17 23:07:20 +0000
@@ -109,7 +109,8 @@
    GtkWidget *win = gtk_dialog_new();
    gtk_dialog_add_button(GTK_DIALOG(win), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
    gtk_widget_show(img);
-   gtk_container_add(GTK_CONTAINER(GTK_DIALOG(win)->vbox), img);
+   GtkWidget *content_area = gtk_dialog_get_content_area (GTK_DIALOG (win));
+   gtk_container_add(GTK_CONTAINER(content_area), img);
    gtk_dialog_run(GTK_DIALOG(win));
    gtk_widget_destroy(win);
 }
 
=== modified file 'gtk/rguserdialog.cc'
--- gtk/rguserdialog.cc	2010-02-11 18:27:56 +0000
+++ gtk/rguserdialog.cc	2010-02-17 23:07:21 +0000
@@ -238,7 +238,7 @@
 
    // honor foreign parent windows (to make embedding easy)
    int id = _config->FindI("Volatile::ParentWindowId", -1);
-   if (id > 0 && _parentWindow == NULL) {
+   if (id > 0 && !GTK_WIDGET_VISIBLE(_parentWindow)) {
       GdkWindow *win = gdk_window_foreign_new(id);
       if(win) {
 	 gtk_widget_realize(_dialog);
 
=== modified file 'pixmaps/hicolor/16x16/package-purge.png'
 Binary files pixmaps/hicolor/16x16/package-purge.png	2006-08-08 10:55:03 +0000 and pixmaps/hicolor/16x16/package-purge.png	2010-02-17 23:07:21 +0000 differ
=== modified file 'po/Makefile.in.in'
--- po/Makefile.in.in	2008-08-21 14:32:18 +0000
+++ po/Makefile.in.in	2010-02-17 23:07:21 +0000
@@ -21,7 +21,7 @@
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -54,16 +54,16 @@
 
 ALL_LINGUAS = @ALL_LINGUAS@
 
-PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
-
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi)
-
-USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-
-POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
-
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
-EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
+
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
+
+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
+
+POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+
+DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
+EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
 
 POTFILES = \
 # This comment gets stripped out
@@ -101,7 +101,6 @@
 install-data: install-data-@USE_NLS@
 install-data-no: all
 install-data-yes: all
-	$(mkdir_p) $(DESTDIR)$(itlocaledir)
 	linguas="$(USE_LINGUAS)"; \
 	for lang in $$linguas; do \
 	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
 
=== removed file 'po/synaptic.pot'
--- po/synaptic.pot	2010-01-25 16:50:07 +0000
+++ po/synaptic.pot	1970-01-01 00:00:00 +0000
@@ -1,3379 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-25 17:47+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <[e-mail]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-
-#. TRANSLATORS: Alias for the Debian package section "admin"
-#: ../common/sections_trans.cc:12
-msgid "System Administration"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "base"
-#: ../common/sections_trans.cc:14
-msgid "Base System"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "cli-mono"
-#: ../common/sections_trans.cc:16
-msgid "Mono/CLI Infrastructure"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "comm"
-#: ../common/sections_trans.cc:18
-msgid "Communication"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "database"
-#: ../common/sections_trans.cc:20
-msgid "Databases"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "devel"
-#: ../common/sections_trans.cc:22
-msgid "Development"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "doc"
-#: ../common/sections_trans.cc:24
-msgid "Documentation"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "debug"
-#: ../common/sections_trans.cc:26
-msgid "Debug"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "editors"
-#: ../common/sections_trans.cc:28
-msgid "Editors"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "electronics"
-#: ../common/sections_trans.cc:30
-msgid "Electronics"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "embedded"
-#: ../common/sections_trans.cc:32
-msgid "Embedded Devices"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "fonts"
-#: ../common/sections_trans.cc:34
-msgid "Fonts"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "games"
-#: ../common/sections_trans.cc:36
-msgid "Games and Amusement"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "gnome"
-#: ../common/sections_trans.cc:38
-msgid "GNOME Desktop Environment"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "graphics"
-#: ../common/sections_trans.cc:40
-msgid "Graphics"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "gnu-r"
-#: ../common/sections_trans.cc:42
-msgid "GNU R statistical system"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "gnustep"
-#: ../common/sections_trans.cc:44
-msgid "Gnustep Desktop Environment"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "hamradio"
-#: ../common/sections_trans.cc:46
-msgid "Amateur Radio"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "haskell"
-#: ../common/sections_trans.cc:48
-msgid "Haskell Programming Language"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "httpd"
-#: ../common/sections_trans.cc:50
-msgid "Web servers"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "interpreters"
-#: ../common/sections_trans.cc:52
-msgid "Interpreted Computer Languages"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "java"
-#: ../common/sections_trans.cc:54
-msgid "Java Programming Language"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "KDE"
-#: ../common/sections_trans.cc:56
-msgid "KDE Desktop Environment"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "kernel"
-#: ../common/sections_trans.cc:58
-msgid "Kernel and modules"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "libdevel"
-#: ../common/sections_trans.cc:60
-msgid "Libraries - Development"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "libs"
-#: ../common/sections_trans.cc:62
-msgid "Libraries"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "lisp"
-#: ../common/sections_trans.cc:64
-msgid "Lisp Programming Language"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "localization"
-#: ../common/sections_trans.cc:66
-msgid "Localization"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "mail"
-#: ../common/sections_trans.cc:68
-msgid "Email"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "math"
-#: ../common/sections_trans.cc:70
-msgid "Mathematics"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "misc"
-#: ../common/sections_trans.cc:72
-msgid "Miscellaneous - Text Based"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "net"
-#: ../common/sections_trans.cc:74
-msgid "Networking"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "news"
-#: ../common/sections_trans.cc:76
-msgid "Newsgroup"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "ocaml"
-#: ../common/sections_trans.cc:78
-msgid "OCaml Programming Language"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "oldlibs"
-#: ../common/sections_trans.cc:80
-msgid "Libraries - Old"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "otherosfs"
-#: ../common/sections_trans.cc:82
-msgid "Cross Platform"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "perl"
-#: ../common/sections_trans.cc:84
-msgid "Perl Programming Language"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "php"
-#: ../common/sections_trans.cc:86
-msgid "PHP Programming Language"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "python"
-#: ../common/sections_trans.cc:88
-msgid "Python Programming Language"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "ruby"
-#: ../common/sections_trans.cc:90
-msgid "Ruby Programming Language"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "science"
-#: ../common/sections_trans.cc:92
-msgid "Science"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "shells"
-#: ../common/sections_trans.cc:94
-msgid "Shells"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "sound"
-#: ../common/sections_trans.cc:96
-msgid "Multimedia"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "tex"
-#: ../common/sections_trans.cc:98
-msgid "TeX Authoring"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "text"
-#: ../common/sections_trans.cc:100
-msgid "Word Processing"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "utils"
-#: ../common/sections_trans.cc:102
-msgid "Utilities"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "vcs"
-#: ../common/sections_trans.cc:104
-msgid "Version Control Systems"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "video"
-#: ../common/sections_trans.cc:106
-msgid "Video software"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "web"
-#: ../common/sections_trans.cc:108
-msgid "World Wide Web"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "x11"
-#: ../common/sections_trans.cc:110
-msgid "Miscellaneous  - Graphical"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "xfce"
-#: ../common/sections_trans.cc:112
-msgid "Xfce Desktop Environment"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "zope"
-#: ../common/sections_trans.cc:114
-msgid "Zope/Plone Environment"
-msgstr ""
-
-#. TRANSLATORS: The section of the package is not known
-#: ../common/sections_trans.cc:116 ../common/rpackage.cc:110
-#: ../common/rpackageview.cc:573
-msgid "Unknown"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "alien"
-#: ../common/sections_trans.cc:118
-msgid "Converted From RPM by Alien"
-msgstr ""
-
-#. TRANSLATORS: Ubuntu translations section
-#: ../common/sections_trans.cc:120
-msgid "Internationalization and localization"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "non-US"
-#. Export to the outside of the USA is not allowed
-#. or restricted
-#: ../common/sections_trans.cc:125 ../common/sections_trans.cc:143
-#: ../common/sections_trans.cc:147
-msgid "Restricted On Export"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "non free"
-#: ../common/sections_trans.cc:127 ../common/sections_trans.cc:144
-msgid "non free"
-msgstr ""
-
-#. TRANSLATORS: Alias for the Debian package section "contrib"
-#. Free software that depends on non-free software
-#: ../common/sections_trans.cc:130 ../common/sections_trans.cc:148
-msgid "contrib"
-msgstr ""
-
-#: ../common/indexcopy.cc:51 ../common/rpmindexcopy.cc:75
-#, c-format
-msgid "Stat failed for %s"
-msgstr ""
-
-#: ../common/indexcopy.cc:78 ../common/rpmindexcopy.cc:107
-msgid "Unable to create a tmp file"
-msgstr ""
-
-#: ../common/indexcopy.cc:107
-msgid "gzip failed, perhaps the disk is full."
-msgstr ""
-
-#: ../common/indexcopy.cc:128
-msgid "Failed to reopen fd"
-msgstr ""
-
-#: ../common/indexcopy.cc:218 ../common/indexcopy.cc:242
-#: ../common/rpmindexcopy.cc:169 ../common/rpmindexcopy.cc:205
-msgid "Failed to rename"
-msgstr ""
-
-#: ../common/indexcopy.cc:266
-msgid "No valid records were found."
-msgstr ""
-
-#: ../common/indexcopy.cc:441
-msgid "Cannot find filename or size tag"
-msgstr ""
-
-#: ../common/indexcopy.cc:485
-msgid "Error parsing file record"
-msgstr ""
-
-#: ../common/rcdscanner.cc:112 ../common/rcdscanner.cc:162
-#, c-format
-msgid "Failed to open %s.new"
-msgstr ""
-
-#: ../common/rcdscanner.cc:137 ../common/rcdscanner.cc:247
-#, c-format
-msgid "Failed to rename %s.new to %s"
-msgstr ""
-
-#: ../common/rcdscanner.cc:202 ../common/rcdscanner.cc:235
-msgid "Internal error"
-msgstr ""
-
-#: ../common/rcdscanner.cc:260
-msgid "Preparing..."
-msgstr ""
-
-#: ../common/rcdscanner.cc:273
-#, c-format
-msgid "Unable to read the cdrom database %s"
-msgstr ""
-
-#: ../common/rcdscanner.cc:280 ../common/rcdscanner.cc:322
-#: ../common/rcdscanner.cc:421
-msgid "Unmounting CD-ROM..."
-msgstr ""
-
-#: ../common/rcdscanner.cc:283
-msgid "Waiting for disc..."
-msgstr ""
-
-#: ../common/rcdscanner.cc:284
-msgid "Insert a disc in the drive."
-msgstr ""
-
-#. Mount the new CDROM
-#: ../common/rcdscanner.cc:288
-msgid "Mounting CD-ROM..."
-msgstr ""
-
-#: ../common/rcdscanner.cc:291
-msgid "Failed to mount the cdrom."
-msgstr ""
-
-#: ../common/rcdscanner.cc:295
-msgid "Identifying disc..."
-msgstr ""
-
-#: ../common/rcdscanner.cc:298
-msgid "Couldn't identify disc."
-msgstr ""
-
-#: ../common/rcdscanner.cc:301
-msgid "Scanning disc..."
-msgstr ""
-
-#: ../common/rcdscanner.cc:316
-msgid "Cleaning package lists..."
-msgstr ""
-
-#: ../common/rcdscanner.cc:329
-msgid ""
-"Unable to locate any package files. Perhaps this is not an APT enabled disc."
-msgstr ""
-
-#: ../common/rcdscanner.cc:380
-msgid "Disc not successfully scanned."
-msgstr ""
-
-#: ../common/rcdscanner.cc:384
-msgid "Empty disc name."
-msgstr ""
-
-#: ../common/rcdscanner.cc:387
-msgid "Registering disc..."
-msgstr ""
-
-#: ../common/rcdscanner.cc:401
-msgid "Copying package lists..."
-msgstr ""
-
-#: ../common/rcdscanner.cc:410
-msgid "Writing sources list..."
-msgstr ""
-
-#: ../common/rcdscanner.cc:425
-msgid "Done!"
-msgstr ""
-
-#: ../common/rcdscanner.cc:523
-#, c-format
-msgid "Failed to stat %s%s"
-msgstr ""
-
-#: ../common/rcdscanner.cc:625 ../common/rcdscanner.cc:721
-#, c-format
-msgid "Unable to change to %s"
-msgstr ""
-
-#: ../common/rcdscanner.cc:663 ../common/rsources.cc:177
-#, c-format
-msgid "Unable to read %s"
-msgstr ""
-
-#: ../common/rconfiguration.cc:88 ../common/rconfiguration.cc:241
-#, c-format
-msgid "ERROR: couldn't open %s for writing"
-msgstr ""
-
-#: ../common/rconfiguration.cc:114
-msgid "ERROR: Could not get password entry for superuser"
-msgstr ""
-
-#: ../common/rconfiguration.cc:123
-#, c-format
-msgid "ERROR: could not create configuration directory %s"
-msgstr ""
-
-#: ../common/rconfiguration.cc:147
-#, c-format
-msgid "ERROR: could not create state directory %s"
-msgstr ""
-
-#: ../common/rconfiguration.cc:164
-#, c-format
-msgid "ERROR: could not create tmp directory %s"
-msgstr ""
-
-#: ../common/rconfiguration.cc:182
-#, c-format
-msgid "ERROR: could not create log directory %s"
-msgstr ""
-
-#: ../common/rconfiguration.cc:266
-#, c-format
-msgid "couldn't open %s for writing"
-msgstr ""
-
-#: ../common/rinstallprogress.cc:41
-msgid ""
-"\n"
-"Successfully applied all changes. You can close the window now."
-msgstr ""
-
-#: ../common/rinstallprogress.cc:42
-msgid ""
-"\n"
-"Not all changes and updates succeeded. For further details of the failure, "
-"please expand the 'Details' panel below."
-msgstr ""
-
-#: ../common/rinstallprogress.cc:44
-msgid ""
-"\n"
-"Successfully installed all packages of the current medium. To continue the "
-"installation with the next medium close this window."
-msgstr ""
-
-#: ../common/rpackage.cc:203
-msgid "The list of installed files is only available for installed packages"
-msgstr ""
-
-#: ../common/rpackage.cc:463
-msgid "or dependency"
-msgstr ""
-
-#: ../common/rpackage.cc:580
-#, c-format
-msgid ""
-"\n"
-"Package %s has no available version, but exists in the database.\n"
-"This typically means that the package was mentioned in a dependency and "
-"never uploaded, has been obsoleted or is not available with the contents of "
-"sources.list\n"
-msgstr ""
-
-#. TRANSLATORS: dependency error message, example:
-#. "apt 0.5.4 but 0.5.3 is to be installed"
-#: ../common/rpackage.cc:617
-#, c-format
-msgid "\t%s %s but %s is to be installed"
-msgstr ""
-
-#. TRANSLATORS: dependency error message, example:
-#. "Depends: apt 0.5.4 but 0.5.3 is to be installed"
-#: ../common/rpackage.cc:623
-#, c-format
-msgid " %s: %s %s but %s is to be installed"
-msgstr ""
-
-#. TRANSLATORS: dependency error message, example:
-#. "apt 0.5.4 but it is not installable"
-#: ../common/rpackage.cc:633
-#, c-format
-msgid "\t%s %s but it is not installable"
-msgstr ""
-
-#. TRANSLATORS: dependency error message, example:
-#. "apt but it is a virtual package"
-#: ../common/rpackage.cc:645
-#, c-format
-msgid "\t%s but it is a virtual package"
-msgstr ""
-
-#. TRANSLATORS: dependency error message, example:
-#. "Depends: apt but it is a virtual package"
-#: ../common/rpackage.cc:650
-#, c-format
-msgid "%s: %s but it is a virtual package"
-msgstr ""
-
-#. TRANSLATORS: dependency error message, example:
-#. "apt but it is not going to be installed"
-#: ../common/rpackage.cc:655
-#, c-format
-msgid "\t%s but it is not going to be installed"
-msgstr ""
-
-#. TRANSLATORS: dependency error message, example:
-#. "Depends: apt but it is not going to be installed"
-#: ../common/rpackage.cc:660
-#, c-format
-msgid "%s: %s but it is not going to be installed"
-msgstr ""
-
-#: ../common/rpackage.cc:679
-msgid " or"
-msgstr ""
-
-#: ../common/rpackage.cc:1017
-msgid "Invalid record in the preferences file, no Package header"
-msgstr ""
-
-#: ../common/rpackage.h:53 ../common/rpackagefilter.cc:48
-msgid "Depends"
-msgstr ""
-
-#: ../common/rpackage.h:54
-msgid "PreDepends"
-msgstr ""
-
-#: ../common/rpackage.h:55 ../common/rpackagefilter.cc:53
-msgid "Suggests"
-msgstr ""
-
-#: ../common/rpackage.h:56 ../common/rpackagefilter.cc:52
-msgid "Recommends"
-msgstr ""
-
-#: ../common/rpackage.h:57 ../common/rpackagefilter.cc:50
-msgid "Conflicts"
-msgstr ""
-
-#: ../common/rpackage.h:58 ../common/rpackagefilter.cc:51
-msgid "Replaces"
-msgstr ""
-
-#: ../common/rpackage.h:59
-msgid "Obsoletes"
-msgstr ""
-
-#: ../common/rpackage.h:60
-msgid "Breaks"
-msgstr ""
-
-#: ../common/rpackage.h:61
-msgid "Enhances"
-msgstr ""
-
-#. make sure this is always the last member
-#: ../common/rpackage.h:69
-msgid "Dependency of"
-msgstr ""
-
-#: ../common/rpackagestatus.cc:49
-msgid "Marked for installation"
-msgstr ""
-
-#: ../common/rpackagestatus.cc:50
-msgid "Marked for re-installation"
-msgstr ""
-
-#: ../common/rpackagestatus.cc:51
-msgid "Marked for upgrade"
-msgstr ""
-
-#: ../common/rpackagestatus.cc:52
-msgid "Marked for downgrade"
-msgstr ""
-
-#: ../common/rpackagestatus.cc:53
-msgid "Marked for removal"
-msgstr ""
-
-#: ../common/rpackagestatus.cc:54
-msgid "Marked for complete removal"
-msgstr ""
-
-#: ../common/rpackagestatus.cc:55 ../common/rpackageview.cc:136
-#: ../gtk/glade/window_filters.glade.h:41
-msgid "Not installed"
-msgstr ""
-
-#: ../common/rpackagestatus.cc:56
-msgid "Not installed (locked)"
-msgstr ""
-
-#: ../common/rpackagestatus.cc:57 ../common/rpackageview.cc:131
-#: ../gtk/gsynaptic.cc:565 ../gtk/glade/window_filters.glade.h:30
-msgid "Installed"
-msgstr ""
-
-#: ../common/rpackagestatus.cc:58 ../common/rpackageview.cc:167
-#: ../gtk/gsynaptic.cc:554
-msgid "Installed (upgradable)"
-msgstr ""
-
-#: ../common/rpackagestatus.cc:59
-msgid "Installed (locked to the current version)"
-msgstr ""
-
-#: ../common/rpackagestatus.cc:60 ../common/rpackageview.cc:514
-#: ../gtk/glade/window_filters.glade.h:14
-msgid "Broken"
-msgstr ""
-
-#: ../common/rpackagestatus.cc:61
-msgid "Not installed (new in repository)"
-msgstr ""
-
-#: ../common/rpackagecache.cc:62
-msgid ""
-"The list of sources could not be read.\n"
-"Go to the repository dialog to correct the problem."
-msgstr ""
-
-#: ../common/rpackagecache.cc:73
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-
-#: ../common/rpackagecache.cc:108
-msgid "Internal Error, non-zero counts"
-msgstr ""
-
-#: ../common/rpackagefilter.cc:44 ../gtk/rgpreferenceswindow.cc:1046
-#: ../gtk/glade/window_find.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: ../common/rpackagefilter.cc:45 ../gtk/rgpreferenceswindow.cc:51
-#: ../gtk/rgmainwindow.cc:1044 ../gtk/rgvendorswindow.cc:62
-#: ../gtk/rgvendorswindow.cc:94 ../gtk/glade/window_main.glade.h:21
-#: ../gtk/glade/window_filters.glade.h:20
-#: ../gtk/glade/window_details.glade.h:16 ../gtk/rgfiltermanager.h:70
-msgid "Description"
-msgstr ""
-
-#: ../common/rpackagefilter.cc:46 ../gtk/glade/window_find.glade.h:4
-#: ../gtk/glade/window_filters.glade.h:37 ../gtk/rgfiltermanager.h:71
-msgid "Maintainer"
-msgstr ""
-
-#: ../common/rpackagefilter.cc:47 ../gtk/glade/window_find.glade.h:8
-msgid "Version"
-msgstr ""
-
-#: ../common/rpackagefilter.cc:49
-msgid "Provides"
-msgstr ""
-
-#: ../common/rpackagefilter.cc:54
-msgid "ReverseDepends"
-msgstr ""
-
-#. Reverse Depends
-#: ../common/rpackagefilter.cc:55 ../common/rpackageview.h:124
-#: ../gtk/glade/window_main.glade.h:36 ../gtk/glade/window_filters.glade.h:45
-#: ../gtk/rgfiltermanager.h:80
-msgid "Origin"
-msgstr ""
-
-#. Origin (e.g. security.debian.org)
-#: ../common/rpackagefilter.cc:56 ../gtk/rgpreferenceswindow.cc:50
-#: ../gtk/rgmainwindow.cc:937 ../gtk/glade/window_filters.glade.h:15
-#: ../gtk/rgfiltermanager.h:81
-msgid "Component"
-msgstr ""
-
-#: ../common/rpackagefilter.cc:61 ../common/rpackageview.h:140
-#: ../gtk/rgpreferenceswindow.cc:49 ../gtk/rgfetchprogress.cc:91
-#: ../gtk/glade/window_filters.glade.h:64
-msgid "Status"
-msgstr ""
-
-#. g_object_set(G_OBJECT(renderer), "editable", TRUE, NULL);
-#: ../common/rpackagefilter.cc:62 ../gtk/rgfiltermanager.cc:180
-msgid "Pattern"
-msgstr ""
-
-#: ../common/rpackagefilter.cc:63 ../gtk/rgpreferenceswindow.cc:49
-#: ../gtk/rgmainwindow.cc:916 ../gtk/glade/window_filters.glade.h:63
-msgid "Section"
-msgstr ""
-
-#: ../common/rpackagefilter.cc:64
-msgid "Priority"
-msgstr ""
-
-#: ../common/rpackagefilter.cc:65
-msgid "ReducedView"
-msgstr ""
-
-#: ../common/rpackagefilter.cc:66
-msgid "File"
-msgstr ""
-
-#: ../common/rpackagefilter.cc:759
-#, c-format
-msgid "Bad regular expression '%s' in ReducedView file."
-msgstr ""
-
-#: ../common/rpackagelister.cc:317 ../common/rpackagelister.cc:323
-#: ../common/rpackagelister.cc:333
-#, c-format
-msgid "Internal error opening cache (%d). Please report."
-msgstr ""
-
-#: ../common/rpackagelister.cc:472
-msgid "Unable to correct dependencies"
-msgstr ""
-
-#: ../common/rpackagelister.cc:474
-msgid ""
-"Unable to mark upgrades\n"
-"Check your system for errors."
-msgstr ""
-
-#: ../common/rpackagelister.cc:486
-msgid "Internal Error, AllUpgrade broke stuff. Please report."
-msgstr ""
-
-#: ../common/rpackagelister.cc:504
-msgid "dist upgrade Failed"
-msgstr ""
-
-#: ../common/rpackagelister.cc:1266
-msgid "Unable to lock the list directory"
-msgstr ""
-
-#: ../common/rpackagelister.cc:1288
-msgid ""
-"Release files for some repositories could not be retrieved or authenticated. "
-"Such repositories are being ignored."
-msgstr ""
-
-#: ../common/rpackagelister.cc:1379 ../gtk/rgrepositorywin.cc:356
-msgid "Ignoring invalid record(s) in sources.list file!"
-msgstr ""
-
-#. TRANSLATORS: Error message after a failed download.
-#. The first %s is the URL and the second
-#. one is a detailed error message that
-#. is provided by apt
-#: ../common/rpackagelister.cc:1430
-#, c-format
-msgid ""
-"Failed to fetch %s\n"
-"  %s\n"
-"\n"
-msgstr ""
-
-#: ../common/rpackagelister.cc:1454
-msgid "Some of the packages could not be retrieved from the server(s).\n"
-msgstr ""
-
-#: ../common/rpackagelister.cc:1457
-msgid "Do you want to continue, ignoring these packages?"
-msgstr ""
-
-#: ../common/rpackagelister.cc:1464
-msgid "Unable to correct missing packages"
-msgstr ""
-
-#. _logEntry += _("\n<b>Removed the following ESSENTIAL packages:</b>\n");
-#: ../common/rpackagelister.cc:1602
-msgid ""
-"\n"
-"Removed the following ESSENTIAL packages:\n"
-msgstr ""
-
-#. _logEntry += _("\n<b>Downgraded the following packages:</b>\n");
-#: ../common/rpackagelister.cc:1611
-msgid ""
-"\n"
-"Downgraded the following packages:\n"
-msgstr ""
-
-#. _logEntry += _("\n<b>Completely removed the following packages:</b>\n");
-#: ../common/rpackagelister.cc:1620
-msgid ""
-"\n"
-"Completely removed the following packages:\n"
-msgstr ""
-
-#. _logEntry += _("\n<b>Removed the following packages:</b>\n");
-#: ../common/rpackagelister.cc:1629
-msgid ""
-"\n"
-"Removed the following packages:\n"
-msgstr ""
-
-#. _logEntry += _("\n<b>Upgraded the following packages:</b>\n");
-#: ../common/rpackagelister.cc:1638
-msgid ""
-"\n"
-"Upgraded the following packages:\n"
-msgstr ""
-
-#. _logEntry += _("\n<b>Installed the following packages:</b>\n");
-#: ../common/rpackagelister.cc:1649
-msgid ""
-"\n"
-"Installed the following packages:\n"
-msgstr ""
-
-#. _logEntry += _("\n<b>Reinstalled the following packages:</b>\n");
-#: ../common/rpackagelister.cc:1659
-msgid ""
-"\n"
-"Reinstalled the following packages:\n"
-msgstr ""
-
-#: ../common/rpackagelister.cc:1676
-msgid "Unable to lock the download directory"
-msgstr ""
-
-#: ../common/rpackagelister.cc:1760
-#, c-format
-msgid "Line %u too long in markings file."
-msgstr ""
-
-#: ../common/rpackagelister.cc:1774 ../common/rpackagelister.cc:1778
-#, c-format
-msgid "Malformed line %u in markings file"
-msgstr ""
-
-#: ../common/rpackagelister.cc:1790
-msgid "Setting markings..."
-msgstr ""
-
-#: ../common/rpmindexcopy.cc:135
-msgid "bzip2 failed, perhaps the disk is full."
-msgstr ""
-
-#: ../common/rpackageview.h:100
-msgid "Sections"
-msgstr ""
-
-#: ../common/rpackageview.h:110
-msgid "Alphabetic"
-msgstr ""
-
-#: ../common/rpackageview.h:166
-msgid "Search History"
-msgstr ""
-
-#: ../common/rpackageview.h:221
-msgid "Custom"
-msgstr ""
-
-#: ../common/rpackageview.cc:129
-msgid "Installed (unsupported)"
-msgstr ""
-
-#: ../common/rpackageview.cc:134
-msgid "Not installed (unsupported)"
-msgstr ""
-
-#: ../common/rpackageview.cc:143
-msgid "Installed (auto removable)"
-msgstr ""
-
-#: ../common/rpackageview.cc:150
-msgid "Installed (manual)"
-msgstr ""
-
-#: ../common/rpackageview.cc:156
-msgid "Broken dependencies"
-msgstr ""
-
-#: ../common/rpackageview.cc:158 ../gtk/glade/window_filters.glade.h:39
-msgid "New in repository"
-msgstr ""
-
-#: ../common/rpackageview.cc:160 ../gtk/glade/window_filters.glade.h:55
-msgid "Pinned"
-msgstr ""
-
-#: ../common/rpackageview.cc:164
-msgid "Installed (local or obsolete)"
-msgstr ""
-
-#: ../common/rpackageview.cc:170
-msgid "Not installed (residual config)"
-msgstr ""
-
-#. setup search progress (0 done, _all.size() in total, 1 subtask)
-#: ../common/rpackageview.cc:304
-msgid "Searching"
-msgstr ""
-
-#: ../common/rpackageview.cc:492
-msgid "Search Filter"
-msgstr ""
-
-#: ../common/rpackageview.cc:500
-msgid "Tasks"
-msgstr ""
-
-#: ../common/rpackageview.cc:506
-msgid "Reduced View"
-msgstr ""
-
-#: ../common/rpackageview.cc:523 ../gtk/gsynaptic.cc:579
-#: ../gtk/rgsummarywindow.cc:356
-msgid "Marked Changes"
-msgstr ""
-
-#. TRANSLATORS: This is a filter that will give you all packages
-#. with debconf support (that can be reconfigured with debconf)
-#: ../common/rpackageview.cc:534
-msgid "Package with Debconf"
-msgstr ""
-
-#: ../common/rpackageview.cc:541 ../gtk/glade/window_filters.glade.h:68
-msgid "Upgradable (upstream)"
-msgstr ""
-
-#: ../common/rpackageview.cc:547
-msgid "Missing Recommends"
-msgstr ""
-
-#: ../common/rpackageview.cc:561
-msgid "Local"
-msgstr ""
-
-#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2114
-#: ../gtk/rgmainwindow.cc:2795 ../gtk/rgmainwindow.cc:2881
-#: ../gtk/rgmainwindow.cc:3054
-#, c-format
-msgid "Can't read %s"
-msgstr ""
-
-#: ../common/rsources.cc:131
-#, c-format
-msgid "Syntax error in line %s"
-msgstr ""
-
-#: ../common/rsources.cc:469
-#, c-format
-msgid "Vendor block %s is invalid"
-msgstr ""
-
-#: ../gtk/gsynaptic.cc:73
-msgid "Usage: synaptic [options]\n"
-msgstr ""
-
-#: ../gtk/gsynaptic.cc:74
-msgid "-h   This help text\n"
-msgstr ""
-
-#: ../gtk/gsynaptic.cc:75
-msgid "-r   Open in the repository screen\n"
-msgstr ""
-
-#: ../gtk/gsynaptic.cc:76
-msgid "-f=? Give an alternative filter file\n"
-msgstr ""
-
-#: ../gtk/gsynaptic.cc:77
-msgid ""
-"-t   Give an alternative main window title (e.g. hostname with `uname -n`)\n"
-msgstr ""
-
-#: ../gtk/gsynaptic.cc:78
-msgid "-i=? Start with the initial Filter with given name\n"
-msgstr ""
-
-#: ../gtk/gsynaptic.cc:79
-msgid "-o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-
-#: ../gtk/gsynaptic.cc:80
-msgid "--upgrade-mode  Call Upgrade and display changes\n"
-msgstr ""
-
-#: ../gtk/gsynaptic.cc:81
-msgid "--dist-upgrade-mode  Call DistUpgrade and display changes\n"
-msgstr ""
-
-#: ../gtk/gsynaptic.cc:82
-msgid "--update-at-startup  Call \"Reload\" on startup\n"
-msgstr ""
-
-#: ../gtk/gsynaptic.cc:83
-msgid "--non-interactive Never prompt for user input\n"
-msgstr ""
-
-#: ../gtk/gsynaptic.cc:84
-msgid "--task-window Open with task window\n"
-msgstr ""
-
-#: ../gtk/gsynaptic.cc:85
-msgid "--add-cdrom Add a cdrom at startup (needs path for cdrom)\n"
-msgstr ""
-
-#: ../gtk/gsynaptic.cc:86
-msgid "--ask-cdrom Ask for adding a cdrom and exit\n"
-msgstr ""
-
-#: ../gtk/gsynaptic.cc:87
-msgid "--test-me-harder  Run test in a loop\n"
-msgstr ""
-
-#: ../gtk/gsynaptic.cc:336 ../gtk/gsynaptic.cc:342
-msgid "Another synaptic is running"
-msgstr ""
-
-#: ../gtk/gsynaptic.cc:337
-msgid ""
-"There is another synaptic running in interactive mode. Please close it "
-"first. "
-msgstr ""
-
-#: ../gtk/gsynaptic.cc:343
-msgid ""
-"There is another synaptic running in non-interactive mode. Please wait for "
-"it to finish first."
-msgstr ""
-
-#: ../gtk/gsynaptic.cc:368
-msgid "Unable to get exclusive lock"
-msgstr ""
-
-#: ../gtk/gsynaptic.cc:369
-msgid ""
-"This usually means that another package management application (like apt-get "
-"or aptitude) is already running. Please close that application first."
-msgstr ""
-
-#: ../gtk/gsynaptic.cc:412
-msgid "Starting without administrative privileges"
-msgstr ""
-
-#: ../gtk/gsynaptic.cc:414
-msgid ""
-"You will not be able to apply any changes. But you can still export the "
-"marked changes or create a download script for them."
-msgstr ""
-
-#: ../gtk/gsynaptic.cc:480
-msgid "Synaptic Package Manager "
-msgstr ""
-
-#: ../gtk/rgcdscanner.cc:63 ../gtk/rgpkgcdrom.cc:86
-msgid "Scanning CD-ROM"
-msgstr ""
-
-#: ../gtk/rgcdscanner.cc:109
-msgid "Invalid disc name!"
-msgstr ""
-
-#: ../gtk/rgcdscanner.cc:121 ../gtk/rgpkgcdrom.cc:122
-msgid "Disc Label"
-msgstr ""
-
-#: ../gtk/rgaboutpanel.cc:64 ../gtk/glade/window_about.glade.h:5
-msgid "Credits"
-msgstr ""
-
-#. skipTaskbar(true);
-#: ../gtk/rgaboutpanel.cc:82 ../gtk/glade/window_about.glade.h:4
-msgid "About Synaptic"
-msgstr ""
-
-#: ../gtk/rgchangeswindow.cc:53
-msgid "Package changes"
-msgstr ""
-
-#: ../gtk/rgchangeswindow.cc:94 ../gtk/rgsummarywindow.cc:79
-msgid "Warning"
-msgstr ""
-
-#: ../gtk/rgchangeswindow.cc:95 ../gtk/rgsummarywindow.cc:80
-msgid ""
-"You are about to install software that <b>can't be authenticated</b>! Doing "
-"this could allow a malicious individual to damage or take control of your "
-"system."
-msgstr ""
-
-#: ../gtk/rgchangeswindow.cc:106 ../gtk/rgsummarywindow.cc:92
-msgid "NOT AUTHENTICATED"
-msgstr ""
-
-#. removed
-#: ../gtk/rgchangeswindow.cc:117
-msgid "To be removed"
-msgstr ""
-
-#: ../gtk/rgchangeswindow.cc:134
-msgid "To be downgraded"
-msgstr ""
-
-#: ../gtk/rgchangeswindow.cc:146 ../gtk/rgsummarywindow.cc:173
-msgid "To be installed"
-msgstr ""
-
-#: ../gtk/rgchangeswindow.cc:158 ../gtk/rgsummarywindow.cc:161
-msgid "To be upgraded"
-msgstr ""
-
-#: ../gtk/rgchangeswindow.cc:170 ../gtk/rgsummarywindow.cc:185
-msgid "To be re-installed"
-msgstr ""
-
-#: ../gtk/rgchangeswindow.cc:181
-msgid "To be kept"
-msgstr ""
-
-#: ../gtk/rgdebinstallprogress.cc:215
-#, c-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
-
-#: ../gtk/rgdebinstallprogress.cc:216
-#, c-format
-msgid ""
-"The configuration file %s was modified (by you or by a script). An updated "
-"version is shipped in this package. If you want to keep your current version "
-"say 'Keep'. Do you want to replace the current file and install the new "
-"package maintainers version? "
-msgstr ""
-
-#: ../gtk/rgdebinstallprogress.cc:369 ../gtk/rginstallprogress.cc:286
-#: ../gtk/rgterminstallprogress.cc:62
-msgid "Applying Changes"
-msgstr ""
-
-#: ../gtk/rgdebinstallprogress.cc:456
-msgid "Ctrl-c pressed"
-msgstr ""
-
-#: ../gtk/rgdebinstallprogress.cc:457
-msgid ""
-"This will abort the operation and may leave the system in a broken state. "
-"Are you sure you want to do that?"
-msgstr ""
-
-#. error from dpkg, needs to be parsed different
-#: ../gtk/rgdebinstallprogress.cc:511
-#, c-format
-msgid "Error in package %s"
-msgstr ""
-
-#. running dpkg --configure -a
-#: ../gtk/rgdebinstallprogress.cc:518
-msgid "Trying to recover from package failure"
-msgstr ""
-
-#: ../gtk/rgdebinstallprogress.cc:609
-msgid "Error failed to fork pty"
-msgstr ""
-
-#: ../gtk/rgdebinstallprogress.cc:626
-msgid "A package failed to install.  Trying to recover:"
-msgstr ""
-
-#: ../gtk/rgdebinstallprogress.cc:685 ../gtk/rgdebinstallprogress.cc:688
-msgid "Changes applied"
-msgstr ""
-
-#: ../gtk/rgdebinstallprogress.cc:744
-msgid ""
-"The marked changes are now being applied. This can take some time. Please "
-"wait."
-msgstr ""
-
-#: ../gtk/rgdebinstallprogress.cc:749
-msgid "Installing and removing software"
-msgstr ""
-
-#: ../gtk/rgdebinstallprogress.cc:751
-msgid "Removing software"
-msgstr ""
-
-#: ../gtk/rgdebinstallprogress.cc:753
-msgid "Installing software"
-msgstr ""
-
-#: ../gtk/rgpreferenceswindow.cc:49
-msgid "Supported"
-msgstr ""
-
-#: ../gtk/rgpreferenceswindow.cc:49 ../gtk/glade/window_filters.glade.h:47
-msgid "Package Name"
-msgstr ""
-
-#: ../gtk/rgpreferenceswindow.cc:50 ../gtk/rgmainwindow.cc:959
-msgid "Installed Version"
-msgstr ""
-
-#: ../gtk/rgpreferenceswindow.cc:50
-msgid "Available Version"
-msgstr ""
-
-#: ../gtk/rgpreferenceswindow.cc:51
-msgid "Installed Size"
-msgstr ""
-
-#: ../gtk/rgpreferenceswindow.cc:51
-msgid "Download Size"
-msgstr ""
-
-#: ../gtk/rgpreferenceswindow.cc:407 ../gtk/rgmainwindow.cc:1779
-#: ../gtk/rgterminstallprogress.cc:151
-msgid "An error occurred while saving configurations."
-msgstr ""
-
-#: ../gtk/rgpreferenceswindow.cc:457
-msgid "Choose font"
-msgstr ""
-
-#: ../gtk/rgpreferenceswindow.cc:886
-msgid "Color selection"
-msgstr ""
-
-#: ../gtk/rgpreferenceswindow.cc:987
-msgid ""
-"Prefer package versions from the selected distribution when upgrading "
-"packages. If you manually force a version from a different distribution, the "
-"package version will follow that distribution until it enters the default "
-"distribution."
-msgstr ""
-
-#: ../gtk/rgpreferenceswindow.cc:995
-msgid ""
-"Never upgrade to a new version automatically. Be _very_ careful with this "
-"option as you will not get security updates automatically! If you manually "
-"force a version the package version will follow the chosen distribution."
-msgstr ""
-
-#: ../gtk/rgpreferenceswindow.cc:1003
-msgid "Let synaptic pick the best version for you. If unsure use this option. "
-msgstr ""
-
-#: ../gtk/rgpreferenceswindow.cc:1040
-msgid "Visible"
-msgstr ""
-
-#: ../gtk/rgpreferenceswindow.cc:1118
-#: ../gtk/glade/window_preferences.glade.h:66
-msgid "Preferences"
-msgstr ""
-
-#: ../gtk/rgfetchprogress.cc:103 ../gtk/rgmainwindow.cc:1001
-msgid "Size"
-msgstr ""
-
-#: ../gtk/rgfetchprogress.cc:110 ../gtk/rgmainwindow.cc:894
-msgid "Package"
-msgstr ""
-
-#: ../gtk/rgfetchprogress.cc:117 ../gtk/rgrepositorywin.cc:181
-msgid "URI"
-msgstr ""
-
-#: ../gtk/rgfetchprogress.cc:201
-#, c-format
-msgid ""
-"Please insert the disk labeled:\n"
-"%s\n"
-"in drive %s"
-msgstr ""
-
-#: ../gtk/rgfetchprogress.cc:329
-#, c-format
-msgid "Download rate: %s/s - %s remaining"
-msgstr ""
-
-#: ../gtk/rgfetchprogress.cc:335
-msgid "Download rate: unknown"
-msgstr ""
-
-#: ../gtk/rgfetchprogress.cc:337
-#, c-format
-msgid "Downloading file %li of %li"
-msgstr ""
-
-#: ../gtk/rgfetchprogress.cc:390
-msgid "Queued"
-msgstr ""
-
-#: ../gtk/rgfetchprogress.cc:393
-msgid "Done"
-msgstr ""
-
-#: ../gtk/rgfetchprogress.cc:396
-msgid "Hit"
-msgstr ""
-
-#: ../gtk/rgfetchprogress.cc:399
-msgid "Failed"
-msgstr ""
-
-#: ../gtk/rgfiltermanager.cc:40 ../gtk/glade/window_filters.glade.h:24
-msgid "Filters"
-msgstr ""
-
-#: ../gtk/rgfiltermanager.cc:165
-msgid "Field"
-msgstr ""
-
-#: ../gtk/rgfiltermanager.cc:172
-msgid "Operator"
-msgstr ""
-
-#: ../gtk/rgfiltermanager.cc:750
-#, c-format
-msgid "New Filter %i"
-msgstr ""
-
-#: ../gtk/rginstallprogress.cc:44
-#: ../gtk/glade/window_rginstall_progress_msgs.glade.h:2
-msgid "Package Manager output"
-msgstr ""
-
-#: ../gtk/rginstallprogress.cc:85
-#, c-format
-msgid ""
-"\n"
-"While installing package %s:\n"
-"\n"
-msgstr ""
-
-#: ../gtk/rginstallprogress.cc:89
-#, c-format
-msgid ""
-"\n"
-"While preparing for installation:\n"
-"\n"
-msgstr ""
-
-#: ../gtk/rginstallprogress.cc:131
-#, c-format
-msgid ""
-"APT system reports:\n"
-"%s"
-msgstr ""
-
-#: ../gtk/rglogview.cc:282
-msgid "Not found"
-msgstr ""
-
-#: ../gtk/rglogview.cc:284
-msgid ""
-"Expression was found, please see the list on the left for matching entries."
-msgstr ""
-
-#: ../gtk/rgpkgdetails.cc:148
-#, c-format
-msgid "%s Properties"
-msgstr ""
-
-#: ../gtk/rgpkgdetails.cc:213
-msgid "This application is supported by the distribution"
-msgstr ""
-
-#: ../gtk/rgpkgdetails.cc:223
-msgid "Get Screenshot"
-msgstr ""
-
-#. TRANSLATORS: this the format of the available versions in
-#. the "Properties/Available versions" window
-#. e.g. "0.56 (unstable)"
-#. "0.53.4 (testing)"
-#: ../gtk/rgpkgdetails.cc:273
-#, c-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:170
-msgid "All"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:366 ../gtk/glade/window_main.glade.h:34
-#: ../gtk/glade/window_details.glade.h:19
-msgid "No package is selected.\n"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:526
-#, c-format
-msgid "Select the version of %s that should be forced for installation"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:528
-msgid ""
-"The package manager always selects the most applicable version available. If "
-"you force a different version from the default one, errors in the dependency "
-"handling can occur."
-msgstr ""
-
-#. TRANSLATORS: Column header for the column "Status" in the package list
-#: ../gtk/rgmainwindow.cc:859
-msgid "S"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:980
-msgid "Latest Version"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:1022
-msgid "Download"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:1297
-msgid ""
-"Reload the package information to become informed about new, removed or "
-"upgraded software packages."
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:1303
-msgid "Mark all possible upgrades"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:1307 ../gtk/glade/window_summary.glade.h:5
-msgid "Apply all marked changes"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:1488
-msgid "Unmark"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:1496
-msgid "Mark for Installation"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:1504
-msgid "Mark for Reinstallation"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:1513
-msgid "Mark for Upgrade"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:1521
-msgid "Mark for Removal"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:1530
-msgid "Mark for Complete Removal"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:1542
-msgid "Remove Including Orphaned Dependencies"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:1554
-msgid "Hold Current Version"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:1563 ../gtk/glade/window_main.glade.h:37
-#: ../gtk/glade/window_filters.glade.h:57
-msgid "Properties"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:1575
-msgid "Mark Recommended for Installation"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:1579
-msgid "Mark Suggested for Installation"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:1683
-msgid ""
-"Removing this package may render the system unusable.\n"
-"Are you sure you want to do that?"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:1723
-#, c-format
-msgid ""
-"%i packages listed, %i installed, %i broken. %i to install/upgrade, %i to "
-"remove; %s will be freed"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:1729
-#, c-format
-msgid ""
-"%i packages listed, %i installed, %i broken. %i to install/upgrade, %i to "
-"remove; %s will be used"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:1735
-#, c-format
-msgid ""
-"%i packages listed, %i installed, %i broken. %i to install/upgrade, %i to "
-"remove"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:1796
-#, c-format
-msgid ""
-"You have %d broken package on your system!\n"
-"\n"
-"Use the \"Broken\" filter to locate it."
-msgid_plural ""
-"You have %i broken packages on your system!\n"
-"\n"
-"Use the \"Broken\" filter to locate them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../gtk/rgmainwindow.cc:1959
-msgid "Downloading Changelog"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:1960
-msgid ""
-"The changelog contains information about the changes and closed bugs in each "
-"version of the package."
-msgstr ""
-
-#. TRANSLATORS: Title of the changelog dialog - %s is the name of the package
-#: ../gtk/rgmainwindow.cc:1973
-#, c-format
-msgid "%s Changelog"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:2064
-msgid "Do you want to add another CD-ROM?"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:2101
-msgid "Open changes"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:2138 ../gtk/rgmainwindow.cc:2713
-#: ../gtk/rgmainwindow.cc:2849 ../gtk/rgmainwindow.cc:3027
-#, c-format
-msgid "Can't write %s"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:2157
-msgid "Save changes"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:2164
-msgid "Save full state, not only changes"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:2281
-msgid "Repositories changed"
-msgstr ""
-
-#. TRANSLATORS: this message appears when the user added/removed
-#. a repository (sources.list entry) a reload (apt-get update) is
-#. needed then
-#: ../gtk/rgmainwindow.cc:2285
-msgid ""
-"The repository information has changed. You have to click on the \"Reload\" "
-"button for your changes to take effect"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:2296
-msgid "Never show this message again"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:2355
-#, c-format
-msgid "Found %i packages"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:2396
-msgid "Starting help viewer..."
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:2416
-msgid ""
-"No help viewer is installed!\n"
-"\n"
-"You need either the GNOME help viewer 'yelp', the 'konqueror' browser or the "
-"'mozilla' browser to view the synaptic manual.\n"
-"\n"
-"Alternatively you can open the man page with 'man synaptic' from the command "
-"line or view the html version located in the 'synaptic/html' folder."
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:2568
-msgid ""
-"Cannot start configuration tool!\n"
-"You have to install the required package 'libgnome2-perl'."
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:2574
-msgid "Starting package configuration tool..."
-msgstr ""
-
-#. cout << "RGMainWindow::pkgHelpClicked()" << endl;
-#: ../gtk/rgmainwindow.cc:2589
-msgid "Starting package documentation viewer..."
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:2601
-msgid ""
-"You have to install the package \"dwww\" to browse the documentation of a "
-"package"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:2677
-msgid ""
-"Could not apply changes!\n"
-"Fix broken packages first."
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:2698
-msgid "Applying marked changes. This may take a while..."
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:2702
-msgid "Downloading Package Files"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:2778
-msgid "Do you want to quit Synaptic?"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:2834
-msgid "Downloading Package Information"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:2835
-msgid ""
-"The repositories will be checked for new, removed or upgraded software "
-"packages."
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:2838
-msgid "Reloading package information..."
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:2906
-msgid "Failed to resolve dependency problems!"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:2908
-msgid "Successfully fixed dependency problems"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:2924
-msgid ""
-"Could not upgrade the system!\n"
-"Fix broken packages first."
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:2973
-msgid "Marking all available upgrades..."
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:2992
-msgid "Successfully marked available upgrades"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:2994
-msgid "Failed to mark all available upgrades!"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:3373
-msgid "Save script"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:3400
-msgid "Select directory"
-msgstr ""
-
-#: ../gtk/rgmainwindow.cc:3412
-msgid "Please select a directory"
-msgstr ""
-
-#: ../gtk/rgrepositorywin.cc:92
-msgid ""
-"You are adding the \"universe\" component.\n"
-"\n"
-" Packages in this component are not supported. Are you sure?"
-msgstr ""
-
-#: ../gtk/rgrepositorywin.cc:124 ../gtk/glade/window_repositories.glade.h:3
-msgid "Repositories"
-msgstr ""
-
-#: ../gtk/rgrepositorywin.cc:148
-msgid "Enabled"
-msgstr ""
-
-#: ../gtk/rgrepositorywin.cc:158
-msgid "Type"
-msgstr ""
-
-#: ../gtk/rgrepositorywin.cc:168 ../gtk/rgvendorswindow.cc:62
-#: ../gtk/rgvendorswindow.cc:80
-msgid "Vendor"
-msgstr ""
-
-#: ../gtk/rgrepositorywin.cc:191 ../gtk/glade/window_preferences.glade.h:36
-msgid "Distribution"
-msgstr ""
-
-#: ../gtk/rgrepositorywin.cc:202
-msgid "Section(s)"
-msgstr ""
-
-#: ../gtk/rgrepositorywin.cc:253
-msgid "Binary (deb)"
-msgstr ""
-
-#: ../gtk/rgrepositorywin.cc:258
-msgid "Source (deb-src)"
-msgstr ""
-
-#: ../gtk/rgrepositorywin.cc:267 ../gtk/rgrepositorywin.cc:409
-#: ../gtk/glade/window_repositories.glade.h:1
-msgid "(no vendor)"
-msgstr ""
-
-#: ../gtk/rgrepositorywin.cc:363
-msgid "Cannot read vendors.list file"
-msgstr ""
-
-#: ../gtk/rgrepositorywin.cc:536
-msgid "Unknown source type"
-msgstr ""
-
-#: ../gtk/rgsummarywindow.cc:108
-msgid "<b>(ESSENTIAL) to be removed</b>"
-msgstr ""
-
-#: ../gtk/rgsummarywindow.cc:122
-msgid "<b>To be DOWNGRADED</b>"
-msgstr ""
-
-#: ../gtk/rgsummarywindow.cc:135
-msgid "<b>To be removed</b>"
-msgstr ""
-
-#: ../gtk/rgsummarywindow.cc:148
-msgid "<b>To be completely removed (including configuration files)</b>"
-msgstr ""
-
-#: ../gtk/rgsummarywindow.cc:200
-msgid "Unchanged"
-msgstr ""
-
-#: ../gtk/rgsummarywindow.cc:245
-#, c-format
-msgid "<b>%s</b> (<b>essential</b>) will be removed\n"
-msgstr ""
-
-#: ../gtk/rgsummarywindow.cc:254
-#, c-format
-msgid "<b>%s</b> will be <b>downgraded</b>\n"
-msgstr ""
-
-#: ../gtk/rgsummarywindow.cc:262
-#, c-format
-msgid "<b>%s</b> will be removed with configuration\n"
-msgstr ""
-
-#: ../gtk/rgsummarywindow.cc:270
-#, c-format
-msgid "<b>%s</b> will be removed\n"
-msgstr ""
-
-#: ../gtk/rgsummarywindow.cc:279
-#, c-format
-msgid "<b>%s</b> (version <i>%s</i>) will be upgraded to version <i>%s</i>\n"
-msgstr ""
-
-#: ../gtk/rgsummarywindow.cc:290
-#, c-format
-msgid "<b>%s</b> (version <i>%s</i>) will be installed\n"
-msgstr ""
-
-#: ../gtk/rgsummarywindow.cc:298
-#, c-format
-msgid "<b>%s</b> (version <i>%s</i>) will be re-installed\n"
-msgstr ""
-
-#: ../gtk/rgsummarywindow.cc:318
-msgid "_Hide Details"
-msgstr ""
-
-#: ../gtk/rgsummarywindow.cc:322 ../gtk/glade/window_summary.glade.h:11
-msgid "_Show Details"
-msgstr ""
-
-#: ../gtk/rgsummarywindow.cc:335
-msgid "Summary"
-msgstr ""
-
-#: ../gtk/rgsummarywindow.cc:393
-#, c-format
-msgid "%d package is locked\n"
-msgid_plural "%d packages are locked\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../gtk/rgsummarywindow.cc:400
-#, c-format
-msgid "%d package will be held back and not upgraded\n"
-msgid_plural "%d packages will be held back and not upgraded\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../gtk/rgsummarywindow.cc:407
-#, c-format
-msgid "%d new package will be installed\n"
-msgid_plural "%d new packages will be installed\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../gtk/rgsummarywindow.cc:414
-#, c-format
-msgid "%d new package will be re-installed\n"
-msgid_plural "%d new packages will be re-installed\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../gtk/rgsummarywindow.cc:421
-#, c-format
-msgid "%d package will be upgraded\n"
-msgid_plural "%d packages will be upgraded\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../gtk/rgsummarywindow.cc:428
-#, c-format
-msgid "%d package will be removed\n"
-msgid_plural "%d packages will be removed\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../gtk/rgsummarywindow.cc:435
-#, c-format
-msgid "%d package will be <b>downgraded</b>\n"
-msgid_plural "%d packages will be <b>downgraded</b>\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../gtk/rgsummarywindow.cc:443
-#, c-format
-msgid "<b>Warning:</b> %d essential package will be removed\n"
-msgid_plural "<b>Warning:</b> %d essential packages will be removed\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../gtk/rgsummarywindow.cc:455
-#, c-format
-msgid "%s of extra space will be used"
-msgstr ""
-
-#: ../gtk/rgsummarywindow.cc:458
-#, c-format
-msgid "%s of extra space will be freed"
-msgstr ""
-
-#: ../gtk/rgsummarywindow.cc:463
-#, c-format
-msgid ""
-"\n"
-"%s have to be downloaded"
-msgstr ""
-
-#: ../gtk/rgsummarywindow.cc:488
-msgid ""
-"Essential packages will be removed.\n"
-"This may render your system unusable!\n"
-msgstr ""
-
-#: ../gtk/rguserdialog.cc:75
-msgid "An error occurred"
-msgstr ""
-
-#: ../gtk/rguserdialog.cc:76
-msgid "The following details are provided:"
-msgstr ""
-
-#: ../gtk/rgvendorswindow.cc:39
-msgid "Setup Vendors"
-msgstr ""
-
-#: ../gtk/rgvendorswindow.cc:62 ../gtk/rgvendorswindow.cc:107
-msgid "FingerPrint"
-msgstr ""
-
-#: ../gtk/rgvendorswindow.cc:128
-msgid "OK"
-msgstr ""
-
-#: ../gtk/rgvendorswindow.cc:132
-msgid "Add"
-msgstr ""
-
-#: ../gtk/rgvendorswindow.cc:136
-msgid "Remove"
-msgstr ""
-
-#: ../gtk/rgvendorswindow.cc:140
-msgid "Cancel"
-msgstr ""
-
-#. TRANSLATORS: this is a abbreviation for "not applicable" (on forms)
-#. happens when e.g. a package has no installed version (or no
-#. downloadable version)
-#: ../gtk/rggladewindow.cc:110 ../gtk/rggladewindow.cc:128
-#: ../gtk/rggladewindow.cc:191
-msgid "N/A"
-msgstr ""
-
-#: ../gtk/rgfindwindow.cc:130
-msgid "Find"
-msgstr ""
-
-#. TRANSLATORS: Title of the task window - %s is the task (e.g. "desktop" or "mail server")
-#: ../gtk/rgtaskswin.cc:141
-#, c-format
-msgid "Description %s"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:1
-#: ../gtk/glade/window_preferences.glade.h:2
-#: ../gtk/glade/window_summary.glade.h:2 ../gtk/glade/window_filters.glade.h:2
-#: ../gtk/glade/window_details.glade.h:1
-msgid "    "
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:2 ../gtk/glade/window_details.glade.h:2
-msgid "<b>Installed Version</b>"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:3 ../gtk/glade/window_details.glade.h:3
-msgid "<b>Latest Available Version</b>"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:4 ../gtk/glade/window_details.glade.h:4
-msgid "<b>Maintainer:</b>"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:5 ../gtk/glade/window_details.glade.h:5
-msgid ""
-"<b>Note:</b> To install a version that is different from the default one, "
-"choose <b>Package -> Force Version...</b> from the menu."
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:6 ../gtk/glade/window_details.glade.h:6
-msgid "<b>Package:</b>"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:7 ../gtk/glade/window_details.glade.h:7
-msgid "<b>Priority:</b>"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:8 ../gtk/glade/window_details.glade.h:8
-msgid "<b>Section:</b>"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:9 ../gtk/glade/window_details.glade.h:9
-msgid "<b>Status:</b>"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:10 ../gtk/glade/window_details.glade.h:10
-msgid "<b>Tags:</b>"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:11
-msgid "A_pply Marked Changes"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:12
-msgid "Add downloaded packages"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:13
-msgid ""
-"Add packages downloaded with the \"Generate package download script\" "
-"feature to the system"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:14
-msgid "Apply"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:15
-msgid "Automatically installed"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:16 ../gtk/glade/window_details.glade.h:11
-msgid "Available versions:"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:17 ../gtk/glade/window_details.glade.h:12
-msgid "Common"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:18
-msgid "Dependants"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:19 ../gtk/glade/window_find.glade.h:1
-#: ../gtk/glade/window_filters.glade.h:18
-#: ../gtk/glade/window_details.glade.h:13 ../gtk/rgfiltermanager.h:73
-msgid "Dependencies"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:20 ../gtk/glade/window_details.glade.h:14
-msgid "Dependencies of the Latest Version"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:22 ../gtk/glade/window_details.glade.h:17
-msgid "Download:"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:23
-msgid ""
-"Generate a shell script so that you can download the selected packages on a "
-"different computer"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:24
-msgid "Generate package download script"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:25
-msgid "Icon _Legend"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:26 ../gtk/glade/window_details.glade.h:18
-msgid "Installed Files"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:27
-msgid "Mark All Upgrades"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:28
-msgid "Mark Packages by _Task..."
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:29
-msgid "Mark for Co_mplete Removal"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:30
-msgid "Mark for R_einstallation"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:31
-msgid "Mark for _Installation"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:32
-msgid "Mark for _Removal"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:33
-msgid "Mark for _Upgrade"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:38 ../gtk/glade/window_find.glade.h:6
-#: ../gtk/glade/window_filters.glade.h:58
-#: ../gtk/glade/window_details.glade.h:21
-msgid "Provided Packages"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:39
-msgid "Reload"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:40
-msgid "S_earch Results"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:41
-msgid "S_tatus"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:42
-msgid "Save Markings _As..."
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:43
-msgid "Search"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:44 ../gtk/glade/window_details.glade.h:22
-msgid "Size:"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:45
-msgid "Synaptic"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:46
-msgid "Text Be_side Icons"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:47
-msgid "Text _Below Icons"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:48
-msgid "U_nmark"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:49
-msgid "U_nmark All"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:50 ../gtk/glade/window_details.glade.h:23
-msgid "Version:"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:51 ../gtk/glade/window_details.glade.h:24
-msgid "Versions"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:52
-msgid "_About"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:53
-msgid "_Add CD-ROM..."
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:54
-msgid "_Browse Documentation"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:55
-msgid "_Configure..."
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:56
-msgid "_Contents"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:57
-msgid "_Custom Filters"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:58
-msgid "_Download Changelog"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:59
-msgid "_Edit"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:60
-msgid "_File"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:61
-msgid "_Filters"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:62
-msgid "_Fix Broken Packages"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:63
-msgid "_Force Version..."
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:64
-msgid "_Help"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:65
-msgid "_Hide"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:66
-msgid "_History"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:67
-msgid "_Icons Only"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:68
-msgid "_Lock Version"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:69
-msgid "_Mark All Upgrades..."
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:70
-msgid "_Package"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:71
-msgid "_Properties"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:72
-msgid "_Quick Introduction"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:73
-msgid "_Quit"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:74
-msgid "_Read Markings..."
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:75
-msgid "_Redo"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:76
-msgid "_Reload Package Information"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:77
-msgid "_Repositories"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:78
-msgid "_Save Markings"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:79
-msgid "_Search..."
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:80
-msgid "_Sections"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:81
-msgid "_Set Internal Option..."
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:82
-msgid "_Settings"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:83
-msgid "_Text Only"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:84
-msgid "_Toolbar"
-msgstr ""
-
-#: ../gtk/glade/window_main.glade.h:85
-msgid "_Undo"
-msgstr ""
-
-#: ../gtk/glade/window_about.glade.h:1
-msgid ""
-"<span size=\"small\">Copyright (c) 2001-2004 Connectiva S/A \n"
-"Copyright (c) 2002-2004 Michael Vogt</span>"
-msgstr ""
-
-#: ../gtk/glade/window_about.glade.h:3
-msgid "<span size=\"xx-large\" weight=\"bold\">Synaptic version</span>"
-msgstr ""
-
-#: ../gtk/glade/window_about.glade.h:6
-msgid "Debtag support is enabled."
-msgstr ""
-
-#: ../gtk/glade/window_about.glade.h:7
-msgid "Documented by"
-msgstr ""
-
-#: ../gtk/glade/window_about.glade.h:8
-msgid ""
-"Man page:\n"
-"Wybo Dekker <[e-mail]>\n"
-"Michael Vogt <[e-mail]>\n"
-"Sebastian Heinlein <[e-mail]>\n"
-"\n"
-"Manual:\n"
-"Sebastian Heinlein <[e-mail]>"
-msgstr ""
-
-#: ../gtk/glade/window_about.glade.h:15
-msgid ""
-"Original author:\n"
-"Alfredo K. Kojima <[e-mail]>\n"
-"\n"
-"Maintainers:\n"
-"Michael Vogt <[e-mail]>\n"
-"Gustavo Niemeyer <[e-mail]>\n"
-"Sebastian Heinlein <[e-mail]>\n"
-"\n"
-"Contributors:\n"
-"Enrico Zini <[e-mail]>\n"
-"Panu Matilainen <[e-mail]>\n"
-"Sviatoslav Sviridov <[e-mail]>"
-msgstr ""
-
-#: ../gtk/glade/window_about.glade.h:27
-msgid "Package management software using apt."
-msgstr ""
-
-#: ../gtk/glade/window_about.glade.h:28
-msgid ""
-"This software is licensed under the terms of the GNU General Public License, "
-"Version 2"
-msgstr ""
-
-#: ../gtk/glade/window_about.glade.h:29
-msgid "Translated by"
-msgstr ""