--- gnome-app-install-0.5.2.8.orig/AppInstall/distros/Ubuntu.py
+++ gnome-app-install-0.5.2.8/AppInstall/distros/Ubuntu.py
@@ -29,9 +29,7 @@
                                      "full technical and security support by "
                                      "Canonical Ltd.")),
             SHOW_ONLY_THIRD_PARTY :(_("Third party applications"),
-                                    _("Show only applications that are "
-                                      "provided by independent software vendors"
-                                      " and are not part of Ubuntu"))
+                                    "")
             }
         # List of components whose applications should not be installed
         # before asking for a confirmation
@@ -48,15 +46,11 @@
             "main" : [_("Enable the installaion of officially "
                         "supported Ubuntu software?"),
                       # %s is the name of the application
-                      _("%s is part of the Ubuntu main distribution. "
-                        "Canonical Ltd. provides support and security "
-                        "updates, which will be enabled too.")],
+                      ""],
             "universe" : [_("Enable the installation of community maintained "
                             "software?"),
                           # %s is the name of the application
-                          _("%s is maintained by the Ubuntu community. "
-                            "The Ubuntu community provides support and "
-                            "security updates, which will be enabled too.")],
+                          ""],
             "multiverse" : [_("Enable the installation of unsupported and "
                               "restricted software?"),
                             # %s is the name of the application
@@ -93,26 +87,15 @@
         icon_name = None
         tooltip = None
         if app.channel.endswith("-partner") and app.supported:
-            tooltip = _("%s is provided by a third party vendor "
-                        "from the Canonical partner repository.") % app.name
             icon_name = "application-partner"
             emblems.append((icon_name, tooltip))
         elif app.component == "main" or app.supported:
-            tooltip = _("Canonical Ltd. provides technical support and "
-                        "security updates for %s") % app.name
             icon_name = "application-supported"
             emblems.append((icon_name, tooltip))
         elif app.thirdparty or app.channel:
-            tooltip = ("%s is provided by a third party vendor "
-                       "and is therefore not an official part "
-                       "of Ubuntu. The third party vendor is "
-                       "responsible for support and security "
-                       "updates.") % app.name
             icon_name = "application-proprietary"
             emblems.append((icon_name, tooltip))
         if app.component == "universe":
-            tooltip =_("This application is provided by the "
-                       "Ubuntu community.")
             icon_name = "application-community"
             emblems.append((icon_name, tooltip))
         if app.component == "multiverse" or app.thirdparty:
--- gnome-app-install-0.5.2.8.orig/Changelog
+++ gnome-app-install-0.5.2.8/Changelog
@@ -1,3717 +1,2 @@
-2008-06-10 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[595] [merge] * do not show "do you want to install more software" dialog
-	                after a successful codec install (LP: #238685)
-	[594.1.1] * do not show "do you want to install more software" dialog
-	            after a successful codec install (LP: #238685)
-
-2008-04-11 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[594] * AppInstall/widgets/AppListView.py:
-	        - workaround the fact that gdk_icon_theme_load_icon()
-	          sometimes ignore the size request and give huge
-	          icons instead (#209072)
-
-2008-04-04 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[593] * fix crash on pygtk.require("2.0") (LP: #211683)
-	[592] * AppInstall/update.py:
-	        - do not crash if xdg.DesktopEntry can not be importet
-	          (LP: #194111)
-
-2008-03-11 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[591] uploaded as 0.5.2.5
-
-2008-02-21 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[590] * AppInstall/AppInstall.py:
-	        - work around gettext issue in the legal warning
-	          (thanks to Timo Jyrinki)
-
-2008-02-20 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[589] * rebuild against latest python-central
-	      * fix description parser to make it display wormux correctly
-	        (LP: #193094)
-
-2008-02-18 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[588] * AppInstall/widgets/AppDescView.py:
-	        - fix crash homepage field usage (LP: #192068)
-
-2008-02-11 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[587] * AppInstall/widgets/AppDescView.py:
-	        - show the homepage field (if available)
-	      * debian/control:
-	        - depend on the latest python-apt (for the homepage field)
-	          LP: #189490
-
-2008-02-07 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[586] * AppInstall/activation.py:
-	        - fix crash when running with --xul-extensions=firefox
-	          (thanks to Alexander Sack for reporting this issue)
-
-2008-02-05 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[585] release as 0.5.2
-	[584] [merge]   - Use Vcs-Bzr instead of XS-Vcs-Bzr, fix url
-
-2008-02-05 Julian Andres Klode <jak@jak-linux.org> 
-
-	[583.1.4] * man/gnome-app-install.1: another fix
-	[583.1.3] * debian/control: Use Vcs-Bzr instead of XS-Vcs-Bzr, fix url
-	[583.1.2] * Add Julian Andres Klode to AUTHORS
-	[583.1.1] * man: update manpages
-
-2008-02-05 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[583] * add support for https URLs in the app view
-	[582] * add special handling for the canonical partner repositor
-	        in the app view (own text + icon)
-	[581] * be more robust if the description is empty for some
-	        reason
-
-2008-02-04 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[580] Changelog: add @AUTOMATIC@ and use deb_gnulog.py
-	[579] * fix gettext init (LP: #106756)
-
-2008-01-04 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[578] merged rosetta translation export
-	[577] * README: fix some outdated information (closes: #437415)
-	[576] debian/rules:
-	      - use dh_icons everywhere
-	[575] python setup.py build_i18n
-	[574] [merge] merged from julianK
-
-2008-01-04 Julian Andres Klode <jak@jak-linux.org> 
-
-	[573.1.5] * AppInstall/CoreMenu.py, AppInstall/update.py:
-	            - Use more efficient format to store cache (pickle protocol 2)
-	[573.1.4] * setup.py:
-	            - Install gnome-app-install-helper into /usr/sbin/
-	[573.1.3] * data/gnome-app-install.glade:
-	            - Remove the Preferences Button
-	[573.1.2] * debian/control:
-	            - Update to Policy 3.7.3
-	            - Remove dependency on software-properties-gtk
-	[573.1.1] * man/: Add manpages for all commands
-
-2008-01-02 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[573] [merge] * remove some dead code
-	              * support emblemes without description and remove
-	                unclear descriptions
-	              * move search entry so that its more clear that it searches
-	                only in the current category
-
-2007-11-08 Sebastian Heinlein <sebi@glatzor.de> 
-
-	[567.1.6] * remove some never used attributes from the application class
-	[567.1.5] * Read the categroy list from all available .menu files
-
-2007-11-02 Sebastian Heinlein <sebi@glatzor.de> 
-
-	[567.1.4] * change the data-dir command line option to --data-di
-	[567.1.3] * support emblems with an empty description
-	          * remove the description of the gnome, ubuntu and xubuntu emblem
-	          * remove the gnustep emblem completely
-	[567.1.2] * Replace set_default_sort_func(None) with
-	          reset_default_sort_func()
-	[567.1.1] * Hide the preferences button
-	          * Move the search button and the freedom selector to the right
-	          only
-
-2008-01-02 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[572] * AppInstall/AppInstall.py:
-	        - wording fixes (thanks to Matthew Paul Thomas)
-
-2007-12-21 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[571] * AppInstall/Menu.py:
-	        - really fix crash in codec search code when gst.caps_from_string()
-	          is called (LP: #173118). Thanks to Julian Klode and Albert23
-
-2007-12-04 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[570] * AppInstall/Menu.py:
-	        - fix crash in codec search code when gst.caps_from_string()
-	          is called (LP: #173118)
-
-2007-11-26 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[569] util/screenshotMaker.py:
-	      - run gnome-settings-daemon to get a proper theme
-	      util/getMenuData.py:
-	      - print deprecation warning
-
-2007-11-22 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[568] util/screenshotMaker.py:
-	      - commit automatic screenshot maker
-
-2007-10-05 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[567] * upload as 0.4.13-0ubuntu1 , LP was unhappy with the previous upload
-	[566] * remove app-install-data-commercial dependency (LP: #149018)
-
-2007-10-04 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[565] * Revert:
-	        "Remove item.applications.set_default_sort_func(None)
-	         and use reset_default_sort_func() instead"
-	        This breaks sorting the search results
-
-2007-09-24 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[564] * AppInstall/AppInstall.py:
-	        - be more robust about pkg missing in the data files
-	          (LP: #122352)
-
-2007-09-11 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[563] debian/changelog:
-	      - uploading as 0.4.10-0ubuntu1
-	[562]   - use system python (LP: #137985, #138903)
-	[561] * debian/postinst:
-	        - do not fail if update-app-install fails (LP: #138903)
-	[560] * data/gnome-app-install.schemas.in:
-	        - fix typo (thanks to Alexandre Franke)
-	[559] * update-app-install:
-	        - use system python (LP: #137985)
-
-2007-09-06 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[558] * debian/control:
-	        - sexy-python is now called python-sexy
-	[557] * debian/rules:
-	        - use DH_PYCENTRAL=nomove as we need g-a-i code in
-	          app-install-data-{ubuntu,commercial} postinst
-
-2007-09-05 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[556] * fix detection of missing index files and popup a dialog
-	        that offers reloading the sources (LP: #3475)
-	      * debian/control:
-	        - depend on latest python-apt (for pkgSourceList.List support)
-
-2007-08-27 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[555] * uploading as 0.4.7-0ubuntu1
-	[554] * AppInstall/distros/Default.py:
-	        - add missing get_codename() (LP: #128457)
-	[553] [merge] * Make the apply changes button translatable - fixes LP
-	              #133570
-
-2007-08-20 Sebastian Heinlein <renate@renate-laptop> 
-
-	[350.2.132] * update debian changelog
-	[350.2.131] [merge] * merge with Ubuntu
-	[350.2.130] * make the apply changes button translatable
-
-2007-08-27 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[552] * typo fix (LP: #134794), thanks to Malcom Parsons
-
-2007-08-14 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[551] [merge] * merged from sebi
-
-2007-08-14 Sebastian Heinlein <renate@renate-laptop> 
-
-	[350.2.129] * remove the build dep on python-nose
-	[350.2.128] * use the add/remove more software button in all software
-	            situations
-
-2007-08-13 Sebastian Heinlein <renate@renate-laptop> 
-
-	[350.2.127] * Include a valid debian changelog
-	[350.2.126] [merge] * push local changes
-	[350.20.1] * Improve wording, case handling and testing in DialogComplete
-	[350.2.125] [merge] * merge with mvo
-	[350.2.124] * lower required python-distutils-extra version
-
-2007-08-14 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[550] [merge] * Completely remove
-	              item.applications.set_default_sort_func(None)
-	                and use reset_default_sort_func() instead
-
-2007-08-10 Julian Andres Klode <jak@jak-linux.org> 
-
-	[547.1.1] * Completely remove item.applications.set_default_sort_func(None)
-	            and use reset_default_sort_func() instead
-
-2007-08-14 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[549] * util/blacklist.cfg, util/blacklist_desktop.cfg:
-	        - blacklist updated
-
-2007-08-13 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[548] [merge] * tests/:
-	                - added more tests and better test data
-	              * AppInstall/update.py, update-app-install:
-	                - refactored into module
-	              * AppInstall/DialogComplete.py:
-	                - wording improvements
-	              * AppInstall/AppInstall.py:
-	                - improve failure detection
-	                - add option to run in test-mode
-	              * AppInstall/activation.py:
-	                - set column caption depending on activation style
-	              * debian/control:
-	                - build-depend on python-setuptools
-	              * setup.py, setup.cfg:
-	                - build with python-setuptools
-
-2007-08-13 Sebastian Heinlein <renate@renate-laptop> 
-
-	[350.2.123] [merge] * push local improvements to the testing
-	                    infrastructure, setuptools
-	                      migration and scripts code refractoring
-	[350.19.7] * Add missing __init__.py to make test a module
-	[350.19.6] * Add some test data for the cache test
-	           * Rename tests folder to test to get it detected by nosetest
-	           * Add a test suite for the cache updater and the default
-	           application
-	           * Improve mime and codec test
-	[350.19.5] * Add build dep on python-nose, python-setuptools and the latest
-	             python-distutils-extra
-	[350.19.4] * Add a test_mode option
-	           * Do not check if the cache is up-to-date in test_mode
-	           * Do not run dbus in test_mode
-	[350.19.3] * Move the code from the scripts to a module to improve startup
-	           time,
-	             since we can use the precompiled byte-code .pyc files.
-	           Furthermore
-	             it makes writing tests easier.
-
-2007-08-12 Sebastian Heinlein <renate@renate-laptop> 
-
-	[350.19.2] * Switch to setuptools for the build system. And python-nose for
-	           the
-	             unittests. The new python-distutils-extra provide a nice
-	           integration
-	             into the setuptools that does not require any cmdclass hacks
-	           anymore.
-	             Furthermore we get a test command for setup.py
-	[350.19.1] * Use the gobject main loop for dbus explicity - needed for the
-	           tests
-
-2007-08-08 Sebastian Heinlein <renate@renate-laptop> 
-
-	[350.2.122] [merge] * merge with mvo
-	[350.2.121] [merge] * push local changes
-	[350.18.2] * Replace another set_default_sort_func(None) call by
-	           reset_default_sort_func()
-	[350.18.1] [merge] * merge with mvo
-
-2007-08-07 Sebastian Heinlein <renate@renate-laptop> 
-
-	[350.2.120] * fix stderr messages for the prerun test of the mime type
-	            installer
-	[350.2.119] * Use extension/codec in the header of the object column for
-	            the corresponding
-	              activation styles
-	[350.2.118] * fix another obsolete special char
-
-2007-08-09 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[547] uploaded as 0.4.6
-	[546] * AppInstall/AppInstall.py:
-	        - when building the filters, insert them sorted-by-key
-	      * AppInstall/Menu.py:
-	        - make the filter constants match the gconf schema file
-	          (LP: #129669)
-
-2007-08-08 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[545] * AppInstall/activation.py:
-	        - brown paperbag bug
-	      * AppInstall/AppInstall.py:
-	        - cosmetic
-	      * tests/testCodecSearch.py:
-	        - add example to show more useful tests
-	[544] * tests/testCodecSearch.py,
-	        tests/testMimeSearch.py:
-	        - added test for mime and codec install feature
-	      * AppInstall/Menu.py:
-	        - fix some if tests that will be false for both "None" and "0"
-	          to only fail on None
-	        - cosmetic changes
-	      * AppInstall/activation.py:
-	        - use property for isInstallerOnly instead of function
-	        - split CodecSearchActivation.preRun() into interactive and
-	          non-interactive code to make it actually testable
-	      * gnome-app-install:
-	        - fix --selftest
-
-2007-08-07 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[543] debian/changelog:
-	      - set to unreleased, fix version number
-	[542] [merge] * Merge with Debian, remaining changes:
-	                - No debian/patches
-	                - Other list of deps and build-deps
-	                - No watch file
-	              * AppInstall/CoreMenu.py:
-	                - Display icons with filename ending in png,svg or xpm
-	              * AppInstall/AppInstall.py:
-	                - Remove item.applications.set_default_sort_func(None)
-	                  and use reset_default_sort_func() instead
-
-2007-08-07 Julian Andres Klode <jak@jak-linux.org> 
-
-	[540.1.6] [merge] * Merge with sebi
-
-2007-08-02 Julian Andres Klode <jak@jak-linux.org> 
-
-	[540.1.5] * Merge with Debian, remaining changes:
-	            - No debian/patches
-	            - Other list of deps and build-deps
-	            - No watch file
-	          * AppInstall/AppInstall.py:
-	            - Remove item.applications.set_default_sort_func(None)
-	          * AppInstall/CoreMenu.py:
-	            - Display icons with filename ending in png,svg or xpm
-	          * Merge the changelog entries from Ubuntu:
-	            - 0.4.5-0ubuntu1
-	            - 0.4.4ubuntu1
-	          * New/updated patches:
-	            - 01_fixicons.patch: Add patch to fix icons ending in
-	          png,svg,xpm
-	          * Removed patches:
-	            - 02_software-properties.patch
-	            - 04_documentation.patch
-	                                      Heinlein for the diff)
-	[540.1.4] [merge] * merge with sebi
-
-2007-08-01 Julian Andres Klode <jak@jak-linux.org> 
-
-	[540.1.3] * gnome-app-install-profile: removed
-	[540.1.2] * sync with debian
-	[540.1.1] * display icons ending in png,svg,xpm
-
-2007-08-07 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[541] [merge] * Fix no mime type handler error message (Fixes LP #129485)
-	              * HIGification and rewording of the above dialog
-	              * Show the file name in the window title for the mime type
-	              installer
-	              * Only show the broaden your search tip if there is a filter
-	              choser
-	                (fixes LP #130022)
-	              * Store the filter names and tooltips in a less technical
-	              dictonary in the
-	                distribution class
-	              * Make the no results message more context sensitive
-	              * Default to the search button on the initial codec search
-	              dialog
-	              * Restore the state of the main window from the last time
-	              (fixes LP #48436)
-	              * Improve cache update error messages (fixes LP #119198)
-
-2007-08-07 Sebastian Heinlein <renate@renate-laptop> 
-
-	[350.2.117] [merge] * push local changes
-	[350.17.2] * Update the language files
-	[350.17.1] * Fix a missing space
-
-2007-08-05 Sebastian Heinlein <renate@renate-laptop> 
-
-	[350.2.116] * Improve cache update error messages
-
-2007-08-04 Sebastian Heinlein <renate@renate-laptop> 
-
-	[350.2.115] * Add the encoding to the POTFILES.in
-	[350.2.114] * Move the menu._refilter() calls to a separate refilter()
-	            method that
-	              also handles the visual feedback for empty results
-	[350.2.113] * Restore the state of the main window from the last time
-	[350.2.112] * sort codes and mime type handlers by popularity on start up
-	[350.2.111] * disable the application list if there are no search results
-	[350.2.110] * Use a smaller main window for the mime type handler and codec
-	            installer
-
-2007-08-03 Sebastian Heinlein <renate@renate-laptop> 
-
-	[350.2.109] * If not transient use the summary as title for the activation
-	            ask_confirmation
-	              dialog
-	[350.2.108] * Default to the search button on the initial codec search
-	            dialog
-	            * Update Debian changelog
-	[350.2.107] * Minor fix for previous commit
-	[350.2.106] * Remove the SHOW_ALL_AVAILABLE filter - this is now done by
-	            the installer mode
-	[350.2.105] * remove another copy and paste error
-	[350.2.104] * Remove an obsolete copy and paste special character
-	[350.2.103] * Update Debian changelog
-	[350.2.102] [merge] * push today's train ride changes
-	[350.16.5] * In the no results message refer to the filters from the distro
-	           instance
-	             instead of hardcoded ones
-	           * Add some comments for translators
-	           * Only show the all category tip if there is actually a category
-	           choser
-	[350.16.4] * set default of filter_secondary to an empty dict and not None
-	           * add some comments
-	[350.16.3] * Store the filter names and tooltips in a less technical
-	           dictonary in the
-	             distribution class. This allows an easier reference to the
-	           filters
-	           * Update the Default, Debian and Ubuntu class accordingly
-	           * Update the Debian changelog
-	[350.16.2] * update debian changelog
-	[350.16.1] * only show the tip to broaden the search by choosing a
-	           different filter if
-	             there is actually a filter choser
-	[350.2.101] * update debian changelog
-	[350.2.100] * Include the file name in the window title for the mime type
-	            handler installer
-	              if available
-	[350.2.99] * Improve no mime type handler error message:
-	            - no active form for computers
-	            - only show the file's name and not the full path
-	            - make use of primary and secondary message
-	            - print the error message to stderr
-	            - use the close and not the ok button
-	            - make the dialog completely translatable
-	            - use a less technical window name
-	[350.2.98] * Really fix the error msg
-	[350.2.97] * fix mime type error message #129485
-
-2007-08-01 Sebastian Heinlein <renate@renate-laptop> 
-
-	[350.2.96] [merge] * merge with mvo
-	[350.2.95] * replace the profile script by a command line switch
-
-2007-07-31 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[540] * finalize changelog
-	[539] [merge] * Window id has to be stored as an integer - fix LP #129416
-	              * Switch to CDBS
-	              * check whether to use software-properties-gtk or software-
-	              properties
-	              * help/C/figures/*: Updated
-	              * help/{de,sv}: disabled
-	              * po/POTFILES.in: add AppInstall/activation.py
-	              * Remove installation part in the docs and the Ubuntu ML
-
-2007-07-31 Julian Andres Klode <jak@jak-linux.org> 
-
-	[537.1.5] * update po
-	[537.1.4] * help/C/figures/*: Updated
-	          * help/{de,sv}: removed
-	          * po/POTFILES.in: add AppInstall/activation.py
-	[537.1.3] * po/POTFILES.in add AppInstall/activation.py
-	[537.1.2] [merge] * debian changes
-	[537.1.1] [merge] * merge with debian
-
-2007-07-31 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[538] [merge] * Window id has to be stored as an integer - fix LP #129416
-
-2007-07-31 Sebastian Heinlein <renate@renate-laptop> 
-
-	[350.2.94] * update changelog
-	[350.2.93] [merge] * merge with mvo
-	[350.2.92] * window id for transient for has to be an integer
-	[350.2.91] * move from native bzr buildpackage to split to make the life of
-	           the debian
-	             maintainers easier
-
-2007-07-31 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[537] * debian/changelog: finalize changelog
-	[536] [merge] * Add an installer only mode for the mime type handler and
-	              codec
-	                installation
-	              * Do not show the confirmation dialog anymore in the
-	              installer only mode
-	              * Allow to search and choose different filters in the
-	              installer mode
-	                (only used by the mime type installer)
-	              * Rename the add/remove button to apply changes
-	              * Improve command line handling
-	              * Some code refractioning
-	              * Add a XUL extension manager mode
-
-2007-07-31 Sebastian Heinlein <renate@renate-laptop> 
-
-	[350.2.90] * minor change in the changelog: replace firefox by xul
-	[350.2.89] * Simplify the call of AppInstall
-	[350.2.88] * Rename the Firefox activaion stlye to
-	           XULExtenstionsActivationStyle
-	           * Rename the --firefox-extensions command line switch to --xul-
-	           extensions
-	             that gets the xul application as value
-	           * use the mime type: application/x-debian-xul-extension-APP
-	           * Talk about extensions in the user interface
-	[350.2.87] * remove another not required import
-	[350.2.86] * remove some no longer needed imports from gnome-app-install
-
-2007-07-30 Sebastian Heinlein <renate@renate-laptop> 
-
-	[350.2.85] [merge] * push local changes
-	[350.15.1] * Add a firefox extension manager mode
-	[350.2.84] * set the apply changes/install button insensitive after
-	           updating the cache
-	[350.2.83] [merge] * merge with mvo
-	[350.2.82] * Update debian changelog
-	[350.2.81] * Only suggest to double click on an application in the complete
-	           dialog if
-	             there are actually any applications that can be launched (e.g.
-	           !codecs)
-	[350.2.80] * Do not show the confirmation dialog when in installer only
-	           mode
-	[350.2.79] * Do not show the "installed applications" filter in installer
-	           only mode
-	[350.2.78] * Add isInstallerOnly() to the ActivationStyle. If true only not
-	           installed
-	             applications will be shown.
-	           * Set isInstallerOnly to True for the codec and mime type search
-	           style
-	[350.2.77] * Improve import time for activation by removing the import of
-	           menu.SHOW_ALL
-	             and replacing the reference to it by the integer value
-	[350.2.76] * move the mime/codec search to a lower level of the search
-	           method. this way
-	             we can present the user a subset of the applications in which
-	           he or she
-	             can still perform searches
-	           * show the search bar for mime type searches
-	           * skip the description from the codec search string
-	[350.2.75] * Allow to enforce a filter for the menu and use the SHOW_ALL
-	           for the codecs
-	             installer
-	[350.2.74] * Actually call the new modifyUserInterface method from
-	           AppInstall
-	           * Move more code to the new nethod
-	           * Imrpove the mime type progress bar and show a human readable
-	           name for
-	             the given mime type
-
-2007-07-29 Sebastian Heinlein <renate@renate-laptop> 
-
-	[350.2.73] [merge] * push local changes
-	[350.14.4] * Add an options handler to gnome-app-install
-	           * Move the activation styles to a separate module
-	           * Introduce new methods to the activation styles:
-	           modifyUserInterface and preRun
-
-2007-07-24 Sebastian Heinlein <renate@renate-laptop> 
-
-	[350.14.3] * Add a SHOW_ALL_AVAILABLE filter that shows all available and
-	           not installed
-	             applications
-	           * Use the new SHOW_ALL_AVAILABLE fitler in gnome-codec-install
-	[350.14.2] * MPT and me agreed that we need to replace the Add/Remove
-	           button label. We
-	             came up with "Apply Changes"
-	[350.14.1] [merge] * Merge with mvo
-
-2007-07-30 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[535] * util/blacklist.cfg, util/rename.cfg:
-	        - blacklist totem-xine to avoid confusing the extrator
-
-2007-07-25 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[534] * fix POTFILES.in (LP: #125046)
-	[533] * fix double del of a ActionGroup (LP: #126117)
-	      * AppInstall/Menu.py, AppInstall/CoreMenu.py:
-	        - code cleanup
-	[532] * do not display a application start icon for desktop
-	        files without execCmd
-	[531] [merge] * merged from sebi
-
-2007-07-03 Sebastian Heinlein <renate@renate-laptop> 
-
-	[350.2.72] * do not crash if an emblem has got not any icon #122914
-	           * append the emblem tooltip text to the end of the description.
-	           this way
-	             we get some text for not available packges (e.g. third party)
-
-2007-07-25 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[530] [merge]   - Use the new Debian icons
-	              * debian/control:
-	                - Cleanup build-depends
-	              * data/icons/16x16/apps/application-debian-*.png:
-	                - Add icons for Debian
-
-2007-07-17 Julian Andres Klode <jak@jak-linux.org> 
-
-	[529.1.2]   - Use the new Debian icons
-	          * data/icons/16x16/apps/application-debian-*.png:
-	            - Add icons for Debian
-	[529.1.1] * debian/control:
-	            - Cleanup build-depends
-
-2007-07-12 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[529] [merge] * AppInstall/AppInstall.py:
-	                - If close button of the window manager was pressed and
-	              there are no
-	                  pending changes, quit.
-	                - If there are pending changes, ask what to do
-	              * AppInstall/distros/Debian.py:
-	                - Merge changes from Ubuntu.py
-	                - Improve the descriptions
-
-2007-07-12 Julian Andres Klode <jak@jak-linux.org> 
-
-	[528.1.4] * debian/changelog: updated
-	[528.1.3] * Complete jak@jak-linux.org-20070712124707-ekmetlsda2fv3guo: On
-	          closing the window, quit the program
-	[528.1.2] * AppInstall/distros/Debian.py:
-	            - Merge changes from Ubuntu.py
-	            - Improve the descriptions
-	[528.1.1] * On closing the window, quit the program
-
-2007-07-02 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[528] [merge] * Switch to python-distutils-extra
-
-2007-06-28 Sebastian Heinlein <renate@renate-laptop> 
-
-	[350.2.71] * switch to the latest python-distutils-extra
-
-2007-06-27 Sebastian Heinlein <renate@renate-laptop> 
-
-	[350.2.70] * use python-distutils-extra
-	[350.2.69] * Exclude local files from translation that are not part of the
-	           repository
-	[350.2.68] * updated translation template
-	[350.2.67] * fix: a lot of data and code files have not used for the
-	           translation
-	           * remove Makefile - it is obsolete since we use now python-
-	           distutils-extra
-
-2007-06-26 Sebastian Heinlein <renate@renate-laptop> 
-
-	[350.2.66] [merge] * merge with michael
-	[350.2.65] * Use the background color of the description textview for the
-	           emblems
-	             in all states (fixes LP #121887)
-	[350.2.64] * add support for bzr-builddep (just run bzr bd to create a
-	           package)
-	[350.2.63] * remove the install file (makes the life of the Debian
-	           maintainer easier)
-	[350.2.62] [merge] * push local changes
-
-2007-06-07 Sebastian Heinlein <renate@renate-laptop> 
-
-	[350.13.2] * fix some typos
-	[350.13.1] * Do not reset the default sort function in a running query with
-	             changed search terms. This also keeps the the sorting chosen
-	           by the
-	             user after starting the search that was extended
-
-2007-05-22 Sebastian Heinlein <sebi@sebi-laptop> 
-
-	[350.2.61] [merge] * merge with mvo
-
-2007-05-21 Sebastian Heinlein <sebi@sebi-laptop> 
-
-	[350.2.60] * Revert the revert and do not store icon themes in the cache
-	[350.2.59] [merge] * Merge with mvo
-
-2007-07-02 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[527] * util/blacklist.cfg, util/blacklist_desktop.cfg:
-	        - updated for current gutsy
-	      * AppInstall/Cache.py:
-	        - do not crash on broken cache
-	      * debian/changelog:
-	        - finalize changelog
-
-2007-06-28 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[526] [merge] merged from  bzr://jak.kicks-ass.org/gai-patches/
-
-2007-06-28 Julian Andres Klode <jak@jak-linux.org> 
-
-	[525.1.1] * Remove non-existing files
-
-2007-06-26 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[525] merged from http://jak.kicks-ass.org/gai-patches/ (many thanks!)
-
-2007-06-04 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[524] * added README.extraction (LP##107097)
-	[523] * util/addPopconData.py:
-	        - write the popcon data line right after the package= line
-	      * tests/test_get_files.py:
-	        - test correct behaviour of the popcon adding
-	[522] * tests/:
-	        - added tests dir for the desktop file extraction
-	      * tests/test_get_files.py:
-	        - basic test for processDeb(), this needs to be improved into a
-	          propper unittest/doctest thing
-	      * util/getMenuData.py:
-	        - fix extraction for desktop files with multiple desktop sections
-	[521] * link to a example desktop file with codec information
-	[520] * added README.codecs
-	[519] * Fix in the gstreamer caps support
-
-2007-05-21 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[518] * data/gnome-app-install.schemas.in:
-	        - fix in the description of the schemas
-	      * AppInstall/Menu.py:
-	        - default to supported applications
-	[517] AppInstall/Menu.py:
-	      - remove unneeded reading of the descriptions on startup (that is
-	      done
-	        nicely in AppListView now, thanks Sebi!)
-	[516] * util/getMenuData.py:
-	        - use os.path.splitext() to figure out what extension we have (if
-	      any)
-	[515] * util/getMenuData.py:
-	        - fix newIconName test
-	[514] [merge] * merged from sebi (HUGE THANKS):
-	                [Sebastian Heinlein]
-	                * Improved start up time
-	                * Replace the supported Ubuntu applications filter by a
-	                  supported by Canonical one
-	                * Switched from Apply|Cancel|OK to Cancel|Install/Remove
-	              buttons
-	                * Added a clear icon and different background colouring to
-	              the search
-	                  entry
-	                * Allow to specify a human readable name of an independent
-	                  software provider (X-AppInstall-ISV)
-	                * Allow derivates to specify custom messages, components
-	              and filters
-	                * Rewording of the additional components enabling dialogs
-	                  "Install" -> "Enable installation of"
-	                * Allow to retry a failed installation/removal
-	                * Handle errors in the enabling of components in a more
-	              sane way
-	                * Rewording of the confirm restricted software dialog by
-	                  introducing the action confirm
-	                * First check for the legal status and than add repository
-	                * Add a helper script to workarround the missing exit
-	              states sent
-	                  through gksu (only for the component activation)
-	                * Avoid flickering of the codec installer at startup
-	                * Only write fd.o valid icon attributes to the menu data
-	                * Use the KDE/GNOME icons instead of the Kubuntu/Ubuntu
-	              icons for
-	                  the desktop integration emblems
-	                * Improve shown emblems (handle support status and
-	              freedomness separately)
-	              [Michael Vogt]
-	                * ensure proper i18n in cache menu item loader
-	                * no longer depend on the exact app-install-data version
-	                * fix setup.py to include the new widgets
-	                * fix in the codec extraction (for caps intersection)
-	                * default to show supported software (not main)
-	                * partly disable debian backend for now (not quite ready)
-	                * fix in enable channel code
-
-2007-05-21 Sebastian Heinlein <sebi@sebi-laptop> 
-
-	[350.2.58] * Update changelog
-	[350.2.57] * Use the KDE and GNOME icon instead of the Ubuntu/Kubuntu icons
-	           for
-	             the desktop integration emblems - the distro icons transport
-	           to much
-	[350.2.56] * Use multiple emblems to also make more complex situations
-	             visually clear:
-	             - show the supported by Canonical emblem at first
-	             - do not make support/freedom emblems exclusive
-	             - do handle Canonical as an ISV
-	[350.2.55] * Replace the supported Ubuntu apps filter by a more wider
-	           supported by
-	             Canonical one.
-	[350.2.54] [merge] * push local changes
-	[350.12.2] * show all installed apps and not only exectuable once in the
-	           complete
-	             dialog
-	[350.12.1] [merge] * Merge the distro branch
-
-2007-05-19 Sebastian Heinlein <sebi@sebi-laptop> 
-
-	[350.11.4] * Use the get_app_emblems method of the Distribution instance in
-	             AppDescView
-	           * Minor bug fixes
-	[350.11.3] * Merge the DialogComponentEnable into
-	             AppInstall._confirm_source_activation
-	           * Store the confirmed components in a list and not separate
-	           booleans
-	           * Add the list to the gconf schemas
-	           * Allow to specify component dependencies in the distro class
-	           and
-	             make use of this information when enabling components
-
-2007-05-18 Sebastian Heinlein <sebi@sebi-laptop> 
-
-	[350.11.2] * add an infrastructure to provide distribution specific methods
-	           and
-	             information
-
-2007-05-17 Sebastian Heinlein <sebi@sebi-laptop> 
-
-	[350.2.53] [merge] * push todays s-bahn work
-	[350.11.1] * Rename the class and module DialogNewlyInstalled to
-	           DialogComplete
-	           * Remove the obsolete DialogNewlyInstalled from the glade file
-	           * Try to locate failed installations and removals and display
-	           them
-	             in the complete dialog
-	           * Add the posibillity to retry a failed installation/removal
-
-2007-05-14 Sebastian Heinlein <sebi@sebi-laptop> 
-
-	[350.2.52] [merge] * push local changes
-	[350.10.4] * Show windows_complete after installing to allow the user
-	           starting
-	             newly installed apps, see a status report of the installation
-	           and
-	             returning to the main window
-	           * Use the ancient closeZvt option in the synaptic call to avoid
-	           the
-	             merged success dialog of synpatic
-	           * Fix the sample code in DialogNewlyInstalled
-	           * Use the rules hint in AppListView by default
-	[350.10.3] * Do not use headers for the to be removed applications view
-	           (c&p error)
-	[350.10.2] * Make use of the AppListView widget in DialogMultipleApps and
-	             DialogPendingChanges
-	           * Add different styles to the AppListView that define the list
-	           of used
-	             columns
-	           * AppListView dies not require a menu cache in description only
-	           mode
-	           * Change icon of the DialogMultipleApps to a question icon
-	[350.10.1] * more changelog entries
-
-2007-05-13 Sebastian Heinlein <sebi@sebi-laptop> 
-
-	[350.2.51] * Only use fd.o valid icon entries in the menu data
-	[350.2.50] * add more to do
-	[350.2.49] * Remove obsolete self.last_toogle. Replaced by a saner enabling
-	           of
-	             components
-	           * Fix some tabs/spaces
-	[350.2.48] * updated changelog
-	[350.2.47] [merge] * Push local changes
-	[350.9.4] * Do not set the default window icon when initializing the cache
-	[350.9.3] * Use the global installed gnome-app-install-helper script
-	[350.9.2] * Add a helper script to handle enabling components in a more
-	          sane way
-	          * Reword restricted software dialog
-	          * Show confirmation dialogs before enabling channels
-	          * Check if enabling of the components failed
-	          * Fix a wrong call of the search function (API changed)
-	          * Update Debian changelog
-	[350.9.1] * Rename the DialogUnavailable to DialogComponentEnable
-	          * Add a X-AppInstall-ISV attribute to the desktop files
-	          * Make use of the ISV name in the DialogComponentEnable and
-	            DialogProprietary dialog
-	          * Rewording: The proprietary/enabling dialogs do not install
-	          software,
-	                       but allow to enable a software repository
-	                       "Install" -> "Enable installation of"
-	          * Mention security updates in the description of the
-	            DialogComponentEnable
-
-2007-05-11 Sebastian Heinlein <sebi@sebi-laptop> 
-
-	[350.2.46] [merge] * merge with mvo (readding the util)
-	                   * fix the mime search with the new SearchEntry widget,
-	                   trigger the
-	                     search (done in the background) and hide the
-	                   categories sidebar before
-	                     the main is shown
-	                   * add the search term as string argument to the signal
-	                   of the
-	                     SearchEntry
-	[350.2.45] [merge] * push local changes
-	[350.8.3] * use the application name insteade of the pkgname for the
-	          caching
-
-2007-05-10 Sebastian Heinlein <sebi@sebi-laptop> 
-
-	[350.8.2] * repair the stars rating
-	[350.8.1] * no need to raise the rank index
-	[350.2.44] * remove another import of the obsolete common module
-	[350.2.43] * Remove obsolete import of common
-	[350.2.42] [merge] * push local changes
-	[350.7.3] * Cache the renderer pixmaps for the rating and the description
-	          of the
-	            apps
-	[350.7.2] * add a new dialog for the newly installed apps
-	[350.7.1] * do not require a categories treeview for the ApplicationsMenu
-	          * fix the NullActivationStyle so that it can actually be used to
-	          init
-	            a Menu
-
-2007-05-08 Sebastian Heinlein <sebi@sebi-laptop> 
-
-	[350.2.41] * move the rendering function into the AppListView class
-
-2007-05-08 Sebastian Heinlein <sebi@sebi-laptop.daheim> 
-
-	[350.2.40] * Replace the OK button by a Install/Remove button - ok was very
-	             generic
-	           * Completely remove the apply button, we cannot provide a sane
-	           cancel
-	             button, since this would require to revert all changes so that
-	           the
-	             system would be again in the same state as the at the startup
-	           time.
-	             Furthermore we are fast enough now. So that restarting the app
-	             doesn't take so long.
-	           * Reuse the icon theme from the main app for the search entry
-	[350.2.39] * move all custom widgets to a separate module
-	           * move the description and app list view to its own class
-	[350.2.38] * do not use an empty progress state
-	[350.2.37] * always set the progress to the half before loading the cache
-	[350.2.36] * Fix the application icon in the description (was disabled
-	           through the profiling)
-	[350.2.35] * add some fallbacks for missing icons
-	[350.2.34] * use fixed size for the application list treeview
-	[350.2.33] * speedup start up time by only searching for icons in the
-	           current theme and our icon dir, only looking up the name and
-	             description of app name, comment and translation if the app is
-	           shown in the list
-
-2007-05-07 Sebastian Heinlein <sebi@sebi-laptop.daheim> 
-
-	[350.2.32] * add a profiler
-
-2007-05-04 Sebastian Heinlein <sebi@sebi-laptop> 
-
-	[350.2.31] * Add standard header with license to SearchEntry
-	           * Minor documentation additions
-	[350.2.30] * Some fixes fot the signal handling of SearchEntry
-	[350.2.29] [merge] * push local changes
-
-2007-05-03 Sebastian Heinlein <sebi@sebi-laptop> 
-
-	[350.6.1] * Move the IconEntry enhancements to its own class and module
-
-2007-05-16 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[513] * util/outputMenuData.py:
-	       - initial implementation for extraction script that can
-	         write websites
-
-2007-05-03 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[512] [merge] * merged from glatzor, split out the menu-data stuff
-
-2007-05-02 Sebastian Heinlein <sebi@sebi-laptop> 
-
-	[350.2.28] * Use a yellowish background for the search entry if a search is
-	             active - fix #99144
-	[350.2.27] [merge] * push local changes
-	[350.5.3] * use a custom clear button for the sexy search entry, since we
-	          want
-	            to avoid the time out if the icon was clicked
-	[350.5.2] * Replace tabs by spaces
-	          * Fix the false use of "as" as a name of a variable
-	          * Replace yes/no by cancel/search in the search suitable codecs
-	          dialog
-	[350.5.1] * make use of IconEntry from python-sexy to render a nicer search
-	          entry
-
-2007-05-01 Sebastian Heinlein <sebi@sebi-laptop> 
-
-	[350.2.26] [merge] * merge with ubuntu
-
-2007-04-15 Sebastian Heinlein <sebi@sebi-laptop> 
-
-	[350.2.25] * make the search for codec dialog translatable - fix LP#106765
-
-2007-03-03 Sebastian Heinlein <sebi@sebi-desktop> 
-
-	[350.2.24] * revert removal of the .install file
-	           * touch the cache and config dir in debian/dir
-	[350.2.23] * touch /etc/gnome-app-install
-	           * remove g-a-i.install
-	[350.2.22] * increase the version number
-	[350.2.21] * only depend on app-install-data, that is provided by the
-	           distro specific
-	             app-install-data packages
-	[350.2.20] * remote application data from repository, it is now part of its
-	           own
-	             source code repository
-	[350.2.19] [merge] * merge with mvo
-
-2007-03-02 Sebastian Heinlein <sebi@sebi-desktop> 
-
-	[350.2.18] [merge] * mege with mvo
-
-2006-11-12 Sebastian Heinlein <sebi@sebi-pc> 
-
-	[350.2.17] [merge] * merge with mvo
-
-2007-05-03 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[511] [merge] * merged the gstreams caps intersection branch (LP#90737)
-
-2007-03-28 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[502.1.1] * prototyped gst-caps support
-
-2007-05-03 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[510] * updated for gutsy
-	[509] * po/POTFILES.in:
-	        - add missing gnome-app-install main (LP#106756)
-
-2007-04-16 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[508] * gnome-app-install:
-	        - fix crash when window parent is none (LP#106026)
-
-2007-04-13 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[507] * menu-data:
-	        - updated to current feisty
-	[506] * AppInstall/Progress.py:
-	        - only set transient if we have a window
-	      * util/getMenuData.py:
-	        - consider usr/share/icons a valid icon dir as well
-
-2007-04-03 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[505]   - do not crash if no dbus.service.BusName() fails (LP#92073)
-	[504] * data/gnome-app-install-xfce.desktop:
-	        - added so that g-a-i shows up in Applications/System in XFCE
-	      * data/gnome-app-install.desktop:
-	        - remove "System" from Categories (LP#98580)
-
-2007-03-29 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[503] * AppInstall/AppInstall.py:
-	        - fix xmlescape() (LP#91875)
-
-2007-03-28 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[502] * AppInstall/AppInstall.py:
-	        - proper error checking for conflicting installs (LP#86684)
-	[501] * AppInstall/Cache.py:
-	        - if depcache.Init() fails, just try again
-	[500] * menu-data:
-	        - updated to current feisty
-	[499] * gnome-app-install:
-	        - improve the pre codec search dialog
-	[498] * gnome-app-install:
-	        - when runing in codec-instal mode, ask first if the user
-	          wants to search for codecs (#94372)
-	        - warn about unsupported codecs but show them all (LP#87748)
-
-2007-03-26 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[497]   - added System category (LP#93803)
-	      * menu-data/wesnoth.desktop, util/rename.cfg:
-	        - install "wesnoth-all" when selecting wesnoth (LP#96301)
-
-2007-03-21 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[496] * data/gnome-app-install.desktop.in:
-	        - added Settings category (LP#93803)
-	      * AppInstall/CoreMenu.py:
-	        - do not use a regexp list for the mime-type, a string list
-	          works fine
-
-2007-03-13 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[495] * menu-data/*.desktop:
-	        - updated to latest feisty
-
-2007-03-07 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[494]   - protect against odd arguments in tooltip_on_filter (LP#87727)
-	[493]     1 and display a error dialog (LP#88154)
-	        - change the gnome-codec-search return codes to match:
-	          http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-
-	      plugins-base-libs/html/gst-plugins-base-libs-
-	      gstbaseutilsinstallplugins.html
-	[492] * gnome-app-install:
-	        - do not crash for invalid codec arguemnts but return error code
-	          10 and write a message to stderr
-	[491]   - fix updating pkg states when the cache is updated (LP#88246)
-	[490] * AppInstall/PackageWorker.py:
-	        - remove uneeded debug output and unneeded apt option
-	[489] * AppInstall/PackageWorker.py:
-	        - deal better deal with addon CDs
-	[488] * AppInstall/DialogNewlyInstalled.py:
-	        - do not show "Click to launch" label if runing as root
-	          (we do not support it there)
-	[487]   - added for better multimedia support (LP#89999)
-	      * packages-whitelist:
-	        - added gstreamer010-plugins-bad-multiverse
-
-2007-03-06 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[486] * AppInstall/AppInstall.py:
-	        - do not crash if no /etc/apt/sources.list if available
-	          (LP#90078)
-	[485] * menu-data-additional:
-	        - updated to latest stuff from the archive
-	[484] * menu-data-additional/gstreamer-bad-multiverse.desktop:
-	        - added
-	      * menu-data-additional/gstreamer-bad.desktop:
-	        - description updated
-
-2007-02-26 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[483] * menu-data/popcon updated to current feisty
-	[482] * do not show users menu dirs (LP#87733)
-	[481]   gst can call that (LP#87748)
-	      * ensure that the default view is only supported ubuntu applications
-
-2007-02-23 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[480] * gnome-app-install:
-	        - fix in the gnome-codec-install code
-	[479] * debian/control:
-	        - description updated
-	        - suggest totem (as we provide a nice service for it via codec-
-	      install)
-	[478] * install a additional gnome-codec-install so that the new
-	        gst can call that
-	      * debian/control:
-	        - only support python >= 2.4 (LP#78030)
-
-2007-02-21 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[477] * data/gnome-app-install.desktop.in:
-	        - added OnlyShowIn=GNOME;XFCE; (LP#78977)
-	[476] * AppInstall/AppInstall.py:
-	        - only run _ensureInArchive() for installs (LP#86593)
-
-2007-02-20 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[475] * finalize changelog
-	[474] * menu-data/ia32-sun-java6-java.desktop:
-	        - fix arch-specific information
-	      * util/getMenuData.py:
-	        - make sure to write arch-specific information to all desktopfiles
-	          from a single package (LP#81371)
-	[473]   - fix reference to "advanced mode" (LP#70283)
-	[472] * AppInstall/Cache.py:
-	        - move the assert for a clean cache into clean()
-	        - print broken/removed packages after clean()
-	[471] * menu-data-additional/*.py:
-	        - added popcon data
-	      * AppInstall/Menu.py:
-	        - fix init for popcon_max (LP#86530)
-	[470] * data/gnome-app-install.glade:
-	        - disable interactive search in categories (LP#86472)
-	[469] * AppInstall/AppInstall.py:
-	        - make the search timeout bigger (LP#82509)
-	      * data/gnome-app-install.schemas.in:
-	        - add "search-timeout" gconf key
-	[468] * bzr ate my homework^Wchangelog *grrrr*
-	      * generate cached menus for mime-search and codec-search activation
-	      mode
-	      * add feature to use differnet cached menus depending on activation
-	      style* bzr ate my homework^Wchangelog *grrrr*
-	      * generate cached menus for mime-search and codec-search activation
-	      mode
-	      * add feature to use differnet cached menus depending on activation
-	      style* bzr ate my homework^Wchangelog *grrrr*
-	      * generate cached menus for mime-search and codec-search activation
-	      mode
-	      * add feature to use differnet cached menus depending on activation
-	      style* bzr ate my homework^Wchangelog *grrrr*
-	      * generate cached menus for mime-search and codec-search activation
-	      mode
-	      * add feature to use differnet cached menus depending on activation
-	      style
-	[467] * AppInstall/CoreMenu.py:
-	        - removed "available" and "isInstalled" from MenuItem
-	      * AppInstall/Menu.py:
-	        - added itemIsInstalled() and itemAvailable(). Both functions
-	          need a cache to check the state
-	      * AppInstall/AppInstall.py:
-	        - use self.menu.itemIsInstalled(item) instead of item.isInstalled
-	          and self.menu.itemAvailable(item) instead of item.available
-	      * gnome-app-install:
-	        - added --test-me-harder to find memory leaks
-
-2007-02-19 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[466] * AppInstall/Cache.py:
-	        - raise a exception if the BrokenCount is != 0
-	      * AppInstall/AppInstall.py:
-	        - make the exception-on-create-cache text better
-
-2007-02-14 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[465] * added swedish manual and ensure that it is automatically build
-	[464] * AppInstall/AppInstall.py:
-	        - fix typo (#85037)
-
-2007-02-13 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[463] * menu-data/totem.desktop, util/annotate.cfg:
-	        - replace totem-xine (not gstreamer-xine)
-	[462] * menu-data/:
-	        - updated to the latest feisty
-	      * util/blacklist.cfg:
-	        - added xscreensaver-data
-	      * debian/rules:
-	        - install the right changelog
-
-2007-02-06 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[461] * AppInstall/AppInstall.py:
-	        - fix crash in mime-search mode
-	[460] * removed old ChangeLog
-	      * added new empty Changelog
-	      * debian/rules:
-	        - automatically dump the bzr log into Changelog (for seb128)
-	[459] * AppInstall/PackageWorker.py:
-	        - check if we run as root or not before starting synaptic
-	[458] * gnome-app-install:
-	        - added --addon-cd=$mount
-	      * AppInstall/AppInstall.py:
-	        - if a addon-cd is detected, add it
-	      * AppInstall/Progress.py:
-	        - added CdromProgress adapter
-	      * AppInstall/Menu.py:
-	        - deal with empty cachedir
-	      * util/blacklist.cfg:
-	        - blacklist more xscreensaver
-	[457] * removed duplicated Arson desktop files
-	      * removed all xscreensaver screensaver desktop files
-	[456] * menu-data-additional/mozilla-acroread.desktop:
-	        - no longer in the archive
-	      * AppInstall/AppInstall.py:
-	        - use python-apt aptsources
-	      * debian/control:
-	        - depend on latest python-apt
-	      * menu-data/ardour-gtk.desktop:
-	        - fix desktop file
-	      * util/blacklist.cfg:
-	        - blacklist ardour-gtk-altivec, it break adour-gtk.desktop
-
-2007-02-05 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[455] * AppInstall/AppInstall.py:
-	        - call software-properties-gtk
-	      * debian/control:
-	        - depend on software-properties-gtk
-
-2007-02-02 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[454] * AppInstall/AppInstall.py:
-	        - default to self.window_main for progress_transient_for
-	      * update-app-install:
-	        - try to import AppInstall.CoreMenu and do not crash if that fails
-
-2007-02-01 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[453] * added X-AppInstall-PatentBadness flag
-
-2007-01-31 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[452] * updated the gstreamer codec data
-
-2007-01-30 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[451] * AppInstall/DialogUnavailable.py:
-	        - added need_internet arguemnt
-	      * AppInstall/AppInstall.py:
-	        - in ensureUnsupportedWarning() call the unavailableDialog
-	          with need_intenet=False
-	[450] * AppInstall/AppInstall.py:
-	        - warn on first-time universe/mutliverse installs
-	[449] * updated the copyright and author information
-	      * AppInstall/AppInstall.py:
-	        - when the user cacncels enabling a component, deal with it
-	[448] * AppInstall/AppInstall.py:
-	        - if transient_for_xid is set, make the progress transient for this
-	      one
-	      * AppInstall/Progress.py:
-	        - work with both "GtkWindow" and "GdkWindow" parents
-	[447] * AppInstall/AppInstall.py:
-	        - when the apt cache is compared to the sources.list, deal with
-	      I-M-S hits
-	        - when enabling components check for component + archive
-	      (distribution)
-	          to fix problems like "universe" enabled in a different
-	      distribution
-	          (edgy, edgy-proposed when on feisty)
-	        - on reload_sources() save/restore the state. needed for e.g.
-	      codec-install
-	          mode
-	      * data/gnome-app-install.schemas.in:
-	        - cache_dialog_time added, the timestamp of the last refresh cache
-	      run
-
-2007-01-29 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[446] * menu-data/kdevel*.desktop:
-	        - removed some redundant desktop files
-	      * AppInstall/AppInstall.py:
-	        - use a logarithmic scale for the popcon data
-	      * util/blacklist_desktop.cfg:
-	        - blacklist some kdevelop stuff
-	      * util/plotPopconData.py:
-	        - simple test application to test ranking the popcon data
-	[445] * menu-data/*
-	        - updated to the latest feisty
-	      * util/blacklist_desktop.cfg:
-	        - blacklist some redundant boson and hplip desktop files
-	[444] * util/addPopconData.py:
-	        - use by_vote now instead of by_inst
-	      * util/plotPopconData.py:
-	        - plot popcon data diagram
-	      * debian/changelog:
-	        - new version uploaded
-	[443] * AppInstall/AppInstall.py:
-	        - work with the latest python-dbus
-
-2007-01-25 Michael Vogt <egon@tas> 
-
-	[442] * AppInstall/AppInstall.py:
-	        - on KeyExectptions in the cache, do show a more useful error
-	      message
-	[441] * AppInstall/AppInstall.py
-	        - restore a search in restoreState() as well
-	        - be more careful with packages not in the cache
-	[440] enable some codecs
-
-2007-01-22 Michael Vogt <egon@tas> 
-
-	[439] * use /usr/bin/python instead of #!/usr/bin/env python
-	[438] added gstreamer-bad
-
-2007-01-17 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[437] * updated to the latest menu-data
-	[436] * util/getMenuData.py:
-	        - support data starting with ./ and without it
-	        - print packages with codecs but with no data in menu-data-
-	      additional
-	[435] * util/getMenuData.py:
-	        - fnmatch() matches from the start
-	[434] * util/addPopconData.py:
-	        - make propper replacement of the X-AppInstall-Popcon data possible
-	[433] [merge] * merged Ians codec-install branch
-
-2007-01-10 Ian Jackson <ian@anarres> 
-
-	[428.1.1] GnomeAppInstallCodecs initial implementation
-
-2007-01-12 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[432] * AppInstall/AppInstall.py:
-	        - added TODO for AlwaysEnableUnvierseMultiverse spec
-
-2007-01-08 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[431] * added openclipart and uploaded new version
-	[430] * AppInstall/CoreMenu.py:
-	        - use entry.DesktopFileID for duplicate detection
-	[429] * added 7zip
-
-2007-01-05 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[428] * menu-data-additional/ndisgtk.desktop:
-	        - removed, part of the regular system now
-	[427] * AppInstall/DialogNewlyInstalled.py:
-	        - check if item.menupath is definied and only then display it
-	      * AppInstall/CoreMenu.py:
-	        - do not add a menupath for "Settings" menu categories
-	      * menu-data/applications.menu:
-	        - map "Settings" to "Other"
-
-2007-01-03 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[426] * updated to latest policy/python-policy
-	[425] * debian/control:
-	        - make the python stuff Build-Dep (instead of Build-Dep-Indep)
-	[424] * AppInstall/Cache.py:
-	        - moved out of Util.py
-	        - added getDependantAutoDeps()
-	      * AppInstall/AppInstall.py:
-	        - pass pkgnames to PackageWorker instead of MenuItems
-	        - when removing packages, use the auto-installed information to
-	      remove
-	          garbage dependencies too
-
-2006-12-20 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[423] * added preferences button (CommonCustomizations)
-
-2006-12-15 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[422] * prepare release
-	[421] * util/annotate.cfg:
-	        - added generic annotations mechanism for new keys for dekstop
-	      files
-	      * util/getMenuData.py:
-	        - support desktop annotations
-	[420] * menu-data-additional/totem-xine.desktop:
-	        - added the xine totem backend
-	        - added X-AppInstall-Replaces: totem-gstreamer
-	      * AppInstall/CoreMenu.py:
-	        - support new "Replaces" keyword
-	      * AppInstall/AppInstall.py:
-	        - support Replaces keyword in the GUI
-	      * menu-data/totem.desktop:
-	        - added X-AppInstall-Replaces: totem-gstreamer
-	[419] * AppInstall/Menu.py:
-	        - make ubuntu-restricted-extras a pimped package
-	      * menu-data-additional/ubuntu-restricted-extras.desktop:
-	        - add some keywords
-	      * debian/changelog:
-	        - updated
-
-2006-12-12 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[418] * added ace and rar to the menu-data
-
-2006-12-11 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[417] * remove + blacklist cream, breaks the desktop file parser
-	[416] * menu-data updated
-	[415] * menu-data-additional/ubuntu-restricted-extras.desktop:
-	        - added desktop file for ubuntu-restricted-extras (part of
-	      CommonCustromization)
-
-2006-11-23 Michael Vogt <egon@tas> 
-
-	[414] * debian/changelog:
-	        - updated with the latest -propsed upload
-	      * util/apt/sources.list
-	        - switched to fesity
-
-2006-11-07 Michael Vogt <egon@tas> 
-
-	[413] added category to mozilla-acroread
-
-2006-10-27 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[412] [merge] * merged from mainline
-
-2006-10-16 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[409.1.44] * debian/rules:
-	             - run intltool-update -p on build
-
-2006-10-11 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[409.1.43] * debian/control:
-	             - added python-gconf, python-gtkhtml2
-	             - removed python-gnome2, python-gnome2-extras
-	           * menu-data/mail-notification.desktop,
-	           util/blacklist_desktop.cfg:
-	             - removed and blacklisted (buggy)
-
-2006-10-09 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[409.1.42] [merge] * merged from glatzor
-	                   * uploaded
-
-2006-10-09 Sebastian Heinlein <sebi@sebi-pc> 
-
-	[350.4.12] * Add a filter to only show installed apps
-	           * Replace some tabs by spaces
-
-2006-10-09 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[409.1.41] * menu-data updated to current edgy
-	[409.1.40] * util/blacklist.cfg:
-	             - another blacklist candidate
-	[409.1.39] * util/blacklist.cfg:
-	             - blacklist broffice.org (brasil openoffice.org)
-	[409.1.38] * debian/changelog: uploaded
-
-2006-10-05 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[409.1.37] * menu-data/*:
-	             - updated the desktop files
-
-2006-10-04 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[409.1.36] * data/gnome-app-install.glade:
-	             - fix ","
-
-2006-10-02 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[409.1.35] [merge] * merged from glatzor
-
-2006-09-30 Sebastian Heinlein <sebi@sebi-pc> 
-
-	[350.4.11] * make the CoreApplicationsMenu translatable
-
-2006-09-30 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[409.1.34] [merge] * merged from glatzor
-
-2006-09-29 Sebastian Heinlein <sebi@sebi-pc> 
-
-	[350.4.10] * remove duplicated MenuItem
-	           * make sure that we always get an icon for an entry
-	[350.4.9] * polish the rendering of desc without any icon
-	[350.4.8] * user a relative popcon value as base for the ranking
-	          * pimp some appZ
-	[350.4.7] * a comment
-	[350.4.6] * update-app-install does not depend on gtk anymore! done by
-	            implementing a CoreApplicationMenu that can only build a cache.
-	            The ApplicationMenu class is an heritance of
-	          CoreApplicationMenu
-	[350.4.5] * The Ubuntu applications filter should not include third party
-	            applications
-
-2006-09-29 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[409.1.33] [merge] * merged from glatzor
-
-2006-09-27 Sebastian Heinlein <sebi@sebi-pc> 
-
-	[350.4.4] * simplify the dialog progress text - blatant-awkward rules!
-
-2006-09-26 Sebastian Heinlein <sebi@sebi-pc> 
-
-	[350.4.3] * do not print to the terminal if the cache is used - instead
-	          show a
-	            message in the progress dialog
-	          * Improve wording. By the way I am a big fan of sesam street
-	[350.4.2] * be more verbose in the progress dialog
-	[350.4.1] [merge] * merge with mvo
-	[350.2.16] [merge] * merge with mov
-	[350.2.15] [merge] * merge with mvo
-
-2006-09-26 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[409.1.32] * data/gnome-app-install.glade:
-	             - fix server gammar failure
-
-2006-09-25 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[409.1.31] * added browser plugins for mplayer+acroread
-	[409.1.30] * added sun-java5 browser plugin
-	[409.1.29] * menu-data-additional/nact.desktop:
-	             - added nautlus action
-	[409.1.28] * menu-data-additional/ndisgtk.desktop:
-	             - added
-	[409.1.27] * menu-data-additional/mscorefonts.desktop:
-	             - description imporived
-	[409.1.26] * menu-data-additional/fglrx-driver.desktop,
-	             menu-data-additional/nvidia-driver-legacy.desktop,
-	             menu-data-additional/nvidia-driver.desktop:
-	             - added pseudo desktop files for the binary drivers
-	           * debian/changelog:
-	             - updated
-	[409.1.25] * menu-data/:
-	             - updated to current edgy
-	[409.1.24] [merge] * AppInstall/Menu.py:
-	                     - always refresh "available" on refresh() too
-	                   * AppInstall/Progress.py:
-	                     - fix wrong import
-	                   * data/icons/16x16/apps/application-proprietary.png:
-	                     - make the icon more neutral
-	                   * debian/changelog:
-	                     - new upload
-
-2006-09-25 Sebastian Heinlein <sebi@sebi-pc> 
-
-	[350.1.67] * check if a package is available and do not rely on the cached
-	             item.available property.
-	             This is only a workaround. We should set item.available
-	           correctly
-	             on our first iteration of the app list, to avoid duplicate
-	           calls.
-
-2006-09-19 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[409.1.23] * AppInstall/Progress.py:
-	             - hide future warnings from python-apt
-
-2006-09-18 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[409.1.22] * debian/changelog:
-	             - updated, finalized
-	[409.1.21] * blacklist gnome-applets and remove the existing ones from the
-	           menu-data
-	[409.1.20] * AppInstall/common.py:
-	             - use "applications-other" if no icon can be found
-	[409.1.19] * menu-data-additional/j2re1.4-mozilla-plugin.desktop:
-	             - added to make jave plugin install easy
-	[409.1.18] * menu-data/mail-notification.desktop:
-	             - fixed desktop entry
-	[409.1.17] * pre-depend on current python-gtk, unset DISPLAY in update-app-
-	           install
-
-2006-09-11 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[409.1.16] [merge] * merged sebastians changes
-
-2006-09-11 glatzor@ubuntu.com 
-
-	[350.1.66] * do not allow to select the text in the progress window, since
-	           we don't
-	             have got a default focus widget - that results in a selected
-	           label
-	           * change the wording of the progress dialog: WE STARTUP REALLY
-	           FAST NOW!
-	             also mention ISV
-	[350.1.65] * remove the confusing "advanced software manager" terminology
-	[350.1.64] * Do not group the filter "open source ubuntu apps" and
-	           "supported
-	             ubuntu apps", since they overlap
-	           * improve the wording of the supported by canonical emblem
-	           tooltip
-	[350.1.63] * extend the gnome/kde applications by gtk and qt based apps
-	[350.1.62] * make the multiple apps dialog install/remove sensitive. this
-	           helps to
-	             improve the wording - close #59477#
-	           * use ellipsise for the action label in the progress to avoid a
-	           resize
-	             of the dialog by long action
-
-2006-09-09 glatzor@ubuntu.com 
-
-	[350.1.61] [merge] * merge with mvo
-	[350.2.14] [merge] * merge with mvo
-
-2006-09-11 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[409.1.15] * changelog updated
-
-2006-09-08 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[409.1.14] * updated the desktop files to the latest edgy
-	           * updated popcon data
-	[409.1.13] * debian/rules:
-	             - move dh_iconcache down
-	[409.1.12] * debian/rules:
-	             - move dh_gconf down to get proper postinst
-	           * setup.py:
-	             - fix installation of schema file
-	           * po/*:
-	             - make update-po
-
-2006-09-07 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[409.1.11] * update-app-install:
-	             - when caching the mime-data, use the correct dir
-
-2006-09-04 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[409.1.10] * debian/gnome-app-install.postinst:
-	             - added #DEBHELPER# token
-	[409.1.9] [merge] * merged with glatzor
-
-2006-09-03 glatzor@ubuntu.com 
-
-	[350.1.60] * create the cache in the postinst
-	           * remove the cache files on purge (postrm)
-	           * make the setup.py less hackish
-	           * order the pathes in the install file by aplphabet
-	[350.1.59] * improve the multiple binary packages
-
-2006-09-02 glatzor@ubuntu.com 
-
-	[350.1.58] * create the cache in a postinst (this reduces the size of the
-	           package
-	             by 3.5 MBytes): /usr/sbin/update-app-install
-	           * replace all tabs in gnome-app-install by spaces
-	[350.1.57] [merge] * hug merge with mvo
-	[350.2.13] [merge] * merge with mvo
-
-2006-08-26 glatzor@ubuntu.com 
-
-	[350.2.12] [merge] * merge with mvo
-
-2006-09-02 glatzor@ubuntu.com 
-
-	[350.1.56] * reduce the options of the show filter
-
-2006-08-30 glatzor@ubuntu.com 
-
-	[350.1.55] * show a busy cursor during the search - missed this in my last
-	           commit
-	           * show only a busy cursor if the category was changed to "all" -
-	           the
-	             switching to other categories should be fast enough
-	           * fake a better responsitivity by doing the filtering after the
-	             category has been changed
-	[350.1.54] * restore the previous sorting if the category was changed
-	           * show the headers of app list during start up by using an empty
-	             fake applications list
-
-2006-08-29 glatzor@ubuntu.com 
-
-	[350.1.53] * python-gdbm is not only a build dep, but also a runtime
-	           dependency
-
-2006-08-19 glatzor@ubuntu.com 
-
-	[350.1.52] * Also show the tooltip of the current freedom/support filter on
-	             the combobox
-	[350.1.51] * minor semantic fixes: free and supported applications are
-	           subsets of
-	             all applications
-
-2006-08-18 glatzor@ubuntu.com 
-
-	[350.1.50] * Show the package name in the description - fixes #55478
-	[350.1.49] * Update the xfce detection dependencies
-	           * Do not show the freedom info in the desc twice: either icons
-	           or text
-	[350.1.48] * use applications-other instead of the deprecated gnome-other
-	[350.1.47] * Code clean up (treeviews, removing obsolete COL_TYPE)
-	           * Allow to sort by installation status
-	           * Add a hack to sort by rank by default if the category was
-	           changed
-	           * Remove column autoresize since the app name now gets cut off
-	           at the
-	             end of the line
-	           * Fix a bug in isChanged that prevented installing apps at all
-	           (missing
-	             value in the return handler)
-
-2006-09-01 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[409.1.8] * finalize changelog
-
-2006-08-29 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[409.1.7] * debian/control:
-	            - re-added python-gdbm (got lost in the merge :(
-	          * debian/changelog:
-	            - updated
-
-2006-08-28 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[409.1.6] * AppInstall/Menu.py:
-	            - update the installation status on "refresh()" too
-	          * debian/changelog:
-	            - prepare new release
-	[409.1.5] * AppInstall/AppInstall.py:
-	            - set the cursor to the "All" row initially
-	          * debian/changelog:
-	            - fix wrong changelog
-	          * debian/control:
-	            - added more missing build-depends for the cache branch
-	[409.1.4] * debian/control:
-	            - updated build-depends
-	          * AppInstall/Menu.py,Util.py:
-	            - moved the cache to Util.py
-	[409.1.3] * debian/control:
-	            - added python-gtk2 to the build-depends
-	[409.1.2] [merge] * merged with the ubuntu-core-dev branch (changes from
-	                  wiesbaden)
-
-2006-08-18 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[409.1.1] * AppInstall/AppInstall.py:
-	            - fix
-
-2006-08-25 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[411] * merged selected bits from glatzor
-	      * build the pkg_to_app list in "refresh()" because we can't pickle
-	        it without ending up with two different data-structures for the
-	        "Application" objects in pkg_to_app and the ListStores
-	      * fix the popcon
-	      * fix the MultiplApps dialog
-
-2006-08-24 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[410] [merge] merged with the gai--laptop branch
-
-2006-08-23 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[261.2.18] * merged from Ians upload
-	           * don't show the main window initially when run with --mime-
-	           search
-	           * show a different string when doing the mime-search than when
-	           runing
-	             in the "normal" mode
-	[261.2.17] [merge] * merged with the cache branch
-
-2006-08-18 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[384.1.8] * improved the "prof.py" script, it can run now with:
-	            -a == applicaton
-	            -m == menu
-	            -d == display the results
-	[384.1.7] * AppInstall/prof.py:
-	            - added profiling code
-
-2006-08-17 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[384.1.6] * finished caching branch
-	          * integrated cache generation into the build system
-	[384.1.5] [merge] * merged with the mainline
-	                  * fixed conflicts
-	[384.1.4] * reverted the "single-view" idea again
-
-2006-07-31 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[384.1.3] * AppInstall/common.py:
-	            - added internal icon cache
-
-2006-07-28 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[384.1.2] * only use a single liststore and use the visible magic do the
-	          category filtering
-	[384.1.1] * added test-pickle caching for the desktop file reading
-
-2006-08-23 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[261.2.16] [merge] * merged with mainline
-
-2006-08-17 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[409] * renamed the profile code
-	[408] * AppInstall/Menu.py:
-	        - use popcon_max instead of popcon_percent (why was that change
-	      gone?)
-	[407] [merge] * merged from glatzor
-	              * finalized changelog and uploaded
-	              * added AppInstall/profile.py script
-
-2006-08-17 glatzor@ubuntu.com 
-
-	[350.1.46] * Re-rename rating column to popularity
-	           * Add a fine grained sortinging mechanism:
-	             - if we are in search mode add a default sorting by ranking
-	             - if we return from searching mode use the application name
-	           for the
-	               sorting
-	[350.1.45] * re-remove the rank column again
-	[350.1.44] * add a rank column to the applications liststore
-	[350.1.43] * make the pop percent calculation more efficient
-	[350.1.42] [merge] * revert my po file updates
-	[350.2.11] [merge] * improve the application treeview
-
-2006-08-16 glatzor@ubuntu.com 
-
-	[350.1.41] * a new star icon for the popularity ranking
-	[350.1.40] * do not install the removed icons
-	[350.1.39] * remove obselete pngs
-	[350.1.38] [merge] * merge with mvo
-	                   * use ellipsize for the application name
-	                   * move the pop column to the end
-	                   * use a single star instead of all the prerendered rank
-	                   pngs
-	[350.2.10] [merge] * merge with mvo
-	[350.2.9] [merge] * merge wirh mvo
-
-2006-08-16 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[406] * AppInstall/AppInstall.py:
-	        - cleanup of old cruft
-	[405] * fix the sorting by popcon now
-	[404] * ranking works again
-	[403] * bugfix + icon beautification
-	[402] * add a popcon column and make it sortable, display a nice "star" for
-	      it
-	[401] * fix a "false"->"False"
-	      * some debug output removed
-	[400] * util/getMenuData.py:
-	        - imporived the absolute iconName detection
-	[399] [merge] * merged from glatzor
-
-2006-08-11 glatzor@ubuntu.com 
-
-	[350.1.37] * add a plan how we could support cdroms in g-a-i
-	[350.1.36] * Fix Bug #48254: No visual effect to item selection by space
-	           bar
-	             - call the toggle callback directly instead of emitting the
-	           signal
-	             - use the activatable property instead of the sensitive one,
-	           since
-	               it isn't respected (possible gtk+ bug?) - this way we don't
-	           need
-	               a manual sensitive check in the toggle callback anymore
-	             - check for arch support in the row_activated callback, since
-	               there is no way to get the cell renderer of the
-	           corresponding row -
-	               and so no way check for its activatable property
-
-2006-08-15 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[398] * added "show all supported" option
-
-2006-08-03 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[397] * changelog updated
-	[396] [merge] * merged from glatzor
-
-2006-08-03 glatzor@ubuntu.com 
-
-	[350.1.35] [merge] * mrege with mvo
-	[350.2.8] [merge] * merge with mvo
-	[350.1.34] * Fix #52612: use the applications-office icon instead of the
-	           skype one
-	                         for gnome-office
-
-2006-08-02 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[395] * menu-data/*:
-	        - refreshed to current edgya
-	        - run with the new icon extration code (should give more hicolor
-	      and png
-	          icons)
-	[394] * util/getMenuData.py:
-	        - search for svg icons as wella
-	        - added FIXME for icon pathes like "zapping/zapping.png"
-	[393] * util/verifyDesktopFile.py:
-	        - check for missing icons
-	      * util/getMenuData.py:
-	        - allow icons with explicit ending
-	[392] * rewrote the icon extract code to make it extract from iconthemes
-	        first and to prefer png over xpm
-	[391] * bugfixes
-	[390] * updated desktop+popcon data
-	[389] - rename iterate_tree_model to iterate_list_store
-	[388] * AppInstall/AppInstall.py:
-	        - fix aptsources.py import (changed in update-manager)
-
-2006-07-31 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[387] * changelog updated
-	[386] [merge] * merged with glatzor
-
-2006-07-27 glatzor@ubuntu.com 
-
-	[350.1.33] * polish the "no results" message in the description pane
-	[350.1.32] * polish the title of the quick introduction
-	           * instead of hiding not proted applications, disable the
-	             corresponding check button and provide an explanation in the
-	             description
-	[350.1.31] * improve the rendering of the description
-
-2006-07-28 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[385] * AppInstall/AppInstall.py:
-	        - fix merge error via removing duplicated setBusy() code
-
-2006-07-27 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[384] [merge] * merged with sebastian
-
-2006-07-27 glatzor@ubuntu.com 
-
-	[350.1.30] * Set the correct filter if the cache gets updated: formerly the
-	           filter
-	             was set to ONLY_SUPPORTED by default and not to the selected
-	           state.
-	             That was why universe applications disappeared after
-	           installing
-
-2006-07-25 glatzor@ubuntu.com 
-
-	[350.1.29] * More bold! hoping to balance the user interface
-
-2006-07-24 glatzor@ubuntu.com 
-
-	[350.1.28] [merge] * merged with mvo
-	[350.2.7] [merge] * merged with mvo
-
-2006-06-28 glatzor@ubuntu.com 
-
-	[350.2.6] [merge] * merge with mvo
-	[350.2.5] [merge] * merge with mvo
-
-2006-07-24 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[383] * BUGS:
-	        - added some problems we have right now
-	      * TODO:
-	        - updated to reflect current status
-	[382] * AppInstall/AppInstall.py:
-	        - added MyCache.clean()
-	[381] * changelog updated
-	[380] * menu-data/*:
-	        - popcon data refreshed
-	[379] * desktop files updated to latest edgy
-	[378] [merge] * meregd with glatzor
-
-2006-07-23 glatzor@ubuntu.com 
-
-	[350.1.27] * Also change the hint that referse to the change menu entry for
-	           Open
-	             Source applications
-
-2006-07-22 glatzor@ubuntu.com 
-
-	[350.1.26] * wording improvements - skip Free in favor of Open Source -
-	             discussed this with Corey
-	           * use the base color of the textview for the licence emblems
-
-2006-07-11 glatzor@ubuntu.com 
-
-	[350.1.25] * add a lot of atk comments (a11y++)
-	[350.1.24] * Fixed the pending changes dialog: it now displays the
-	           corresponding
-	             apps
-	           * Tag third party applications as proprietray ones
-	[350.1.23] * Use icons to indiacte the level of freedom and support in the
-	             description
-	           * Only scan newly inserted text for links instead of the whole
-	           text -
-	             this rocks!
-	           * Minor spacing improvements for the description
-	           * Improve URL detection
-	           * Do not show scrollbars in the description before we actually
-	           add
-	             content
-
-2006-07-10 glatzor@ubuntu.com 
-
-	[350.1.22] * Removed unused imports
-	           * Only show the watch cursor if the action takes longer than 0.3
-	           sec
-	           * Removed an obsolete function that called SoftwareProperties
-	           * Show some context sensitive hints in the no results message
-	           how to
-	             broaden the search
-	[350.1.21] * show for which desktop environemnt an application was written
-
-2006-07-24 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[377] * AppInstall/AppInstall.py:
-	        - fix mime search
-	      * AppInstall/Util.py:
-	        - raise StopIteration in iterate_tree_model
-	[376] * util/blacklist.cfg:
-	        - blacklist xscreensaver
-	[375] * util/getMenuData.py:
-	        - added a comment
-	[374] * util/getMenuData.py:
-	        - fix arch: all handling
-	[373] * util/apt/sources.list:
-	        - switched to edgy
-	      * util/getMenuData.py:
-	        - bugfixing
-	[372] * util/getMenuData.py:
-	        - don't fail if a arch-specific pkg has no desktop file
-	[371] * util/getMenuData.py:
-	        - add architecture information to the desktop files (if required)
-	[370] * util/getMenuData.py:
-	        - log the arch-specific bits
-	[369] * menu-data-additional:
-	        - added architecture tags where appropriate
-	[368] * AppInstall/AppInstall.py:
-	        - bugfixing
-	        - display the short description in "bold"
-	      * AppInstall/Menu.py:
-	        - don't display applications that are not supported on our
-	      architecture
-	      * debian/changelog:
-	        - fix merge conflict
-	      * setup.py:
-	        - don't install the html template
-	[367] [merge] * reviewed/merged Sebastians changes (thanks!)
-	              * minor adjustments
-
-2006-07-10 glatzor@ubuntu.com 
-
-	[350.1.20] * Added the system installer icon of Tango as app icon - #41664
-	           * Avoid flickering of the textview by showing it quite late
-	           * Clear the textview before showing the intro
-	           * Added a11y support for the runtime created textview_desc
-	           * Removed an obsolete filter box restore
-	           * Delete all tags when a new description is shown
-	           * Fixed that all tags have been links in the ReleaseNotesViewer
-	           * Removed a build file (schemas) from bzr
-	[350.1.19] * separate the short descripton from the long one
-	           * show the amount of freedom and support message at the top of
-	           the
-	           description
-	           * add a sanity check if the description has to be changed in the
-	           filter
-	           changed callback
-
-2006-07-09 glatzor@ubuntu.com 
-
-	[350.1.18] * Replaced the html stuff for the app description by a textview
-	             I reused my ReleaseNoteViewer from UpdateManager. I had to
-	           make
-	             some minor changes, but they do not affect UpdateManager
-	           itself.
-	             So I plan to "port" the changes to UpdateManager. Or create a
-	             new package also including DistInfo and aptsources?
-	           * Fixed #52409 - "Not aware of unsupported architectures"
-	             There is now a "X-AppInstall-Architectures" tag - the app-data
-	           has
-	             still to be modified. This could be done manually for the
-	           commercial
-	             ones at first, since the option is not obligatory
-	           * Cleaned up combobox code and wording
-	           * Moved the combobox and the search entry to the top. The test
-	           persons
-	             were often not aware of a selected category during a search
-	           * Added a "Show:" label next to the comobobox
-	           * Activated the BusyState during a filter change to be more
-	           responsible
-	           * Added some sanity checks for the content of the description
-	           field.
-	             Sometimes it showed a description without a selected
-	           application.
-	           * Replaced the hard coded distro codename by a lsb_release call
-	           * Fixed a bug that showed supported but non free apps if the
-	           "supported"
-	             filter was selected
-	           * Removed all repository and software channels related terms!
-	           Replaced them
-	             by better descriptions of the nature of the corresponding
-	           components
-	           * Changed the wording of the "not available/ported" dialog: It
-	           now uses
-	             "computer type (powerpc)" instead of "system architecture".
-	           See the
-	             discussion on ubuntu-doc about words to avoid. Furthermore it
-	           clearly
-	             says that the vendor perhpas decided to not support the
-	           corresponding type.
-	             A lot of people have asked my in the past why the app was not
-	           available.
-
-2006-07-07 glatzor@ubuntu.com 
-
-	[350.1.17] * add a plus of 1500 for applications that exactly match the
-	           search term
-	             - should fix #52185
-
-2006-06-30 glatzor@ubuntu.com 
-
-	[350.1.16] [merge] * merge with jerome and michael
-
-2006-06-29 Jerome S. Gotangco <jgotangco@ubuntu.com> 
-
-	[363.1.1] merge to bzr branch in LP-added as comment
-
-2006-07-04 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[366] * AppInstall/Progress.py:
-	        - the latest apt has 4 steps now
-	      * AppInstall/DialogPendingChanges.py:
-	        - first init the treeview, than add the model
-	[365] [merge] * merged with sebi
-
-2006-06-30 glatzor@ubuntu.com 
-
-	[350.1.15] * seems that gazpacho also removed all responses of the button
-	             fixed that
-
-2006-06-28 glatzor@ubuntu.com 
-
-	[350.1.14] [merge] * merge with mvo
-	[350.2.4] [merge] i* merge with mvo
-
-2006-06-28 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[364] * changelog updated
-	[363] * AppInstall/AppInstall.py:
-	        - added setBusy() and make extensive use of it
-	[362] * changelog updated
-	[361] [merge] * merged from glazor
-	              * make the mime-type search working again
-
-2006-06-28 glatzor@ubuntu.com 
-
-	[350.1.13] * fix the mime stuff
-	[350.1.12] * try to rank the app by more than popularity
-	[350.1.11] [merge] * merge with mvo
-	[350.2.3] [merge] * merge from mvo
-	[350.1.10] * add a ranking text file
-	[350.1.9] [merge] * merge with mvo
-
-2006-06-27 glatzor@ubuntu.com 
-
-	[350.1.8] * remove the sorting button - use it for searches only
-	[350.1.7] [merge] * merge with mvo
-	[350.2.2] [merge] * merge with mvo
-
-2006-06-28 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[360] * AppInstall/AppInstall.py:
-	        - support "--mime-type=" argument
-	      * AppInstall/Menu.py:
-	        - added Menu._mimeFilter() and refactored the current string filter
-	          into Menu._stringFilter()
-	        - added Menu.mimeSearch attribute to see if we filter for name or
-	          mime-type
-	[359] * AppInstall/AppInstall.py:
-	        - unbreak the third party channel support
-
-2006-06-27 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[358] * added a simple GUI for testing
-	[357] * add popcon data
-	[356] * support sorting by popcon data (no GUI for this yet)
-	[355] * util/addPopconData.py:
-	        - import the popcon data
-	[354] [merge] * merged from the stable branch
-	[350.3.2] * debian/control:
-	            - added missing "gksu" dependency
-
-2006-06-26 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[350.3.1] [merge] * merged with mainline
-
-2006-06-27 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[353] [merge] * merged with glatzor
-
-2006-06-27 glatzor@ubuntu.com 
-
-	[350.1.6] [merge] * merge wirh mvo
-	[350.2.1] [merge] *merge with mvo
-
-2006-06-26 Sebastian Heinlein <sebi@sebi-mac> 
-
-	[350.1.5] * fixed gazpacho weirdness - it seems to be only enterprise ready
-	          * improve tooltips - mention universe
-	          * connect the changed signal later, so that the cosmetic change
-	          at
-	            start up doesn't tigger the callback
-	[350.1.4] * use correct value type in the schemas file
-	[350.1.3] * remove references to the advanced button in the messages
-	          * do not use a custom dialog for gksu
-	[350.1.2] * remove advanced package manager run function
-
-2006-06-24 Sebastian Heinlein <sebi@sebi-mac> 
-
-	[350.1.1] * use a combobox instead of the checkbuttons for filtering
-	          applications
-	          by legal status
-
-2006-06-26 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[352] * AppInstall/Menu.py:
-	        - added a mime-search function
-	[351] * sync with the current version in dapper
-
-2006-05-27 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[350] * menu-data/*:
-	        - desktop files updated
-
-2006-05-26 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[349] * AppInstall/AppInstall.py:
-	        - if dapper-updates is used, add that for the commponents as well
-	        - if multiverse is added, add universe too
-	[348] * AppInstall/AppInstall.py:
-	        - just exit when ok is clicked but nothing is selected
-
-2006-05-22 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[347] * menu-data/mozilla-thunderbird.desktop,
-	        menu-data/icons/mozilla-thunderbird.svg:
-	        - new thunderbird icon
-
-2006-05-19 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[346] * menu-data-additional/wine.desktop:
-	        - fix it
-
-2006-05-18 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[345] * AppInstall/AppInstall.py, AppInstall/PackageWorker.py:
-	        - make sure that gksu succeeded before reopening the cache
-
-2006-05-17 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[344] * menu-data-additional/sun-java5-java.desktop:
-	        - give it a category
-	[343] * moved java to menu-data-additional because the current desktop
-	        files are a bit broken
-	[342] * menu-data/ia32-sun-java5-java.desktop:
-	        menu-data/ia32-sun-java5-javaws.desktop
-	        - removed the ia32 deksotp files for now because we have native
-	          versions for amd64,i386
-	[341] * menu-data/*:
-	        - updated to current dapper
-	[340] * AppInstall/DialogPendingChanges.py:
-	        - remove obsolete code
-	      * AppInstall/AppInstall.py:
-	        - fix in the "add-component" code
-	[339] * data/gnome-app-install.glade:
-	        - make the browser expand when the dialog window expands
-	      * AppInstall/DialogProprietary.py:
-	        - add test in if __name__ == "__main__"
-	      * debian/changelog:
-	        - changelog updated
-
-2006-05-16 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[338] * fix advanced button
-
-2006-05-15 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[337] [merge] * merged with glatzor
-
-2006-05-15 Sebastian Heinlein <sebi@sebi-mac> 
-
-	[213.3.98] * documentation polishing - fixes #44331
-	[213.3.97] [merge] * merge with mvo
-
-2006-05-09 Sebastian Heinlein <sebi@sebi-mac> 
-
-	[213.3.96] * use a correct header for the German po file
-	[213.3.95] * initiall work on the German translation of the manual
-
-2006-05-08 Sebastian Heinlein <sebi@server.daheim> 
-
-	[213.3.94] [merge] * merged with mvo
-	[213.3.93] * use the desktop mode of gksu instead of a custom message
-
-2006-05-15 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[336] * po/*:
-	        - make update-po
-	[335] * data/gnome-app-install.glade:
-	        - disable searching in the columns, we have a search thing for this
-	[334] * data/gnome-app-install.glade:
-	        - make the "Reload" button translatable (why didn't glade set it
-	      translatable in the first place???)
-	[333] * menu-data/applications.menu:
-	        - "Edutainment" -> "Education" (to be in sync with gnome again)
-	[332] * menu-data-additional/gstreamer-ugly.desktop:
-	        - use the 'gstreamer0.10-plugins-ugly' pkg
-	[331] * debian/control:
-	        - depend on app-install-data-commercial (that contains the
-	      commercial
-	          desktop files)
-	      * AppInstall/AppInstall.py, DialogProprietary.py:
-	        - removed some debug code
-	        - fix a problem with 3rd party apps without channels
-	      * TODO: updated
-	[330] * string fixes:
-	        * data/gnome-app-install.glade:
-	          - "show proprietary applications" -> "show commercial
-	      applications"
-	            (as suggested by Malcom)
-	        * AppInstall/Menu.py:
-	          - "Reading desktop files" -> "Reading list of available
-	      applications"
-	            (thanks to Matt for this suggestion)
-	[329] * menu-data/*: updated to current dapper
-	[328] * util/blacklist.cfg:
-	        - updated to the latest version in dapper
-	[327] * debian/rules:
-	        - added "--no-recursion" to arch-build
-
-2006-05-10 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[326] * menu-data/kexi.desktop:
-	        - fix component
-	[325] * desktop files updated
-
-2006-05-09 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[324] * util/rename.cfg: "vim-gui-common" -> "vim-gnome"
-
-2006-05-02 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[323] * help/C/gnome-app-install.xml: merged from docteam svn
-
-2006-04-21 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[322] [merge] * merged from sebi
-
-2006-04-17 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.92] * fix the dbus exception handler
-	[213.3.91] * add start up notification to the desktop file
-
-2006-04-15 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.90] * do not segfault on a missing dbus dameon
-
-2006-04-21 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[321] * menu-data updated
-
-2006-04-20 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[320] * fix bug in the add-channel code
-
-2006-04-19 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[319] * help/C/gnome-app-install.xml: fix incorrect xml (ubuntu #40061)
-
-2006-04-10 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[318] * changelog update
-	[317] [merge] * merged changes from glatzor
-
-2006-04-09 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.89] * wording of the no results message:
-	            - use gettext
-	            - simplify
-	[213.3.88] [merge] * merged from mvo
-
-2006-03-24 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.87] * do not segfault if we fail to initialize the cache - #36378
-
-2006-04-09 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[316] * merged the changes from dholbach
-
-2006-04-07 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[315] * finalized changelog, uploaded
-	[314] * dbus and singleton added
-	      * bug in the duplicate deteciton code fixed
-	[313] * another wording fix in the failed search page
-	[312] * failed search help page implemented
-
-2006-04-05 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[311] * finalized changelog
-	[310] * upated to the latest desktop files
-	[309] * better runtime duplicate detection
-	      * blacklisted EtherApeAsRoot,kimdaba-import and swscanner_asroot
-
-2006-04-03 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[308] * support quit with CTRL-q (ubuntu #3751)
-	[307] * merged the latest g-a-i manual
-	[306] * debian/copyright: updated to the latest download uri (and updated
-	      the authors)
-	      * debian/dirs: removed the not-used usr/sbin
-
-2006-03-29 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[305] * debian/rules: fix clean target
-	[304] * updated the menu-data stuff
-	[303] * fix the network applet icon
-	[302] * when skipping a blacklisted pkg, actually skip it :)
-	[301] * added the nm-applet to the desktop data
-
-2006-03-28 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[300] * fix a bug in the extraction code
-	      * updated the backlist
-	[299] * read the blacklists only once
-	[298] * added capplets-data to blacklist
-	[297] * added already seen pkgs to the pkgs_seen set
-	[296] * lyx-qt -> lyx, blacklisted lyx-xforms
-	[295] * explicitely set the background color (ubuntu #36686)
-
-2006-03-27 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[294] * if the extraction of a desktop file fails, repot error and keep
-	      going
-	[293] * added libxine-extra-codecs
-	[292] * logging improvments
-	[291] * removed espresso, gdm, kdm
-	      * blacklisted espressio-frontend-{qt,gtk}, gdm, kdm
-	[290] * blacklisted kcontrol and konqi
-	      * removed all kcontrol stuff
-	[289] * adeded more stuff to the blacklist
-	      * removed the blacklisted apps
-
-2006-03-24 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[288] * finalized the changelog
-	      * make the blacklist stuff a bit more neutral
-	[287] * changelog updates
-	[286] * added gparted.desktop as a "overwrite"
-	[285] * added README about the menu-data-additonal stuff
-	      * added menu-data-additonal/gparted.desktop to "overwrite" the
-	      default gparted.desktop file
-	[284] * removed some more unneeded desktop icons
-	      * added a desktop file blacklist
-	[283] * fix error in the icon extraction, only extract the icons that we
-	      really want
-	[282] * remove duplicated icons
-	[281] * updated the desktop + icon files (new extraction after the epoch
-	      bug was fixed)
-
-2006-03-23 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[280] * check if we have a candVer before continuing
-	[279] * finally get the epoch handling correct?!?
-	[278] * strip the epoch from the candidate version
-	[277] * fix quoting for version to support epochs
-	[276] * analyzse the result for per-arch pkgs
-	[275] * extract arch data for all arches (three runs)
-	[274] * ignore debs that are not for our arch
-	      * fix some smallish bugs
-	[273] * improve the logging
-	[272] [merge] * move the non-autogenerated desktop files to menu-data-
-	              additional/
-
-2006-03-21 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.86] [merge] * merged from mvo
-
-2006-03-22 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[271] * changelog updates
-	[270] * updated the desktop files
-
-2006-03-20 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[269] * util/rename.txt: totem-xine -> totem-gstreamer
-	[268] [merge] * merged from sebi (he gets another golden start from me
-	              today!)
-
-2006-03-20 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.85] * Better English (TM)
-
-2006-03-19 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.84] * select the first app in the app treeview if none was selected
-	           before. This
-	             fixes having to select an app before being able to toggle the
-	           checkbutton of
-	             it, if none was selected before
-	[213.3.83] * search enhancements:
-	              - ignore case
-	              - allow to search for mulitple terms. this slows down the
-	           search by
-	                0.05 seconds in the worst case
-	              - use a clearer and better readable structure in the search
-	           code.
-	                no measurable effect (different results in a scope of 0.01
-	           seconds)
-
-2006-03-17 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.82] * show an error dialog if the app is not available in any known
-	           channel -
-	            fixes #34125
-	           * use the refresh icon on the reload button
-
-2006-03-20 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[267] [merge] * merged stuff from the laptop branch
-	[261.2.15] [merge] * fix the strings from jane (for real!)
-
-2006-03-14 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.81] * reapplied the jane.patch
-	[213.3.80] [merge] * merged from mvo
-
-2006-03-20 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[266] [merge] * merged with the laptop branch
-
-2006-03-13 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[261.2.14] * cleanups
-	           * AppInstall/AppInstall.py:
-	             - don't break when a mirror was found but continue to see if
-	           there is
-	               a security server that needs to be added as well
-	[261.2.13] * fix debug output
-	[261.2.12] [merge] * merged with sebi
-
-2006-03-13 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.79] * string review by Jane Silber
-	[213.3.78] * do not fail on additional apt cache runs
-
-2006-03-12 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.77] * Revret the string change component/section - there is bug in
-	           the APT HOWTO
-	             using the wrong terms. Thanks to Burgundavia.
-
-2006-03-10 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.76] * Updated German translation
-	[213.3.75] * update the language files
-	[213.3.74] * check if security updates are enabled. if yes add the sec
-	           updates for a
-	             newly added section
-	[213.3.73] * paradigma change: use enable section/channel instead of add -
-	           it is unclear
-	             where the channel will be added to
-	           * explain what a software channel is in the dialog. since it
-	           appears
-	             without any warning :)
-
-2006-03-09 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.72] * restore the marks for installation and removal after a cache
-	           update
-	           * continue the toggle action after a cache update
-	           * use the toggled app and not the currently selected app in
-	           addChannel
-	[213.3.71] * Remove the button "add section/channel" in the description
-	           * always set the toggle button of an app sensitive
-	[213.3.70] * removed debug print - I need a good debugger...
-	[213.3.69] * fixed the menu creation progress bar: add an additional step
-	[213.3.68] [merge] * merge with mvo
-	[213.3.67] * replace the pulsing by a progress
-	           * use only one progress bar
-
-2006-03-09 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[261.2.11] [merge] * merged with sebi
-
-2006-03-09 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.66] [merge] * merged from mvo
-	                   * Do not let the comment of ffmpeg end with a ,
-	[213.3.65] * Do not show the "add section" if the app is not available for
-	           the
-	             system architecture - #34125
-
-2006-03-09 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[261.2.10] * changelog updated
-	[261.2.9] * AppInstall/AppInstall.py:
-	            - fix missing ctime check in the "is the cache outdated" stuff
-	          * AppInstall/Progress.py:
-	            - don't pulse but use a "normal" progress (sorry sebi)
-	          * debian/rules:
-	            - don't fail if we have a empty channel list
-	[261.2.8] * removed unneeded channels
-	[261.2.7] [merge] * merged with sebi
-
-2006-03-09 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.64] * Fixed a lot of i18n related issues:
-	            - set a global gettext textdomain
-	            - Don't resolve variables in the msgid: "_("msg %s) % s" ->
-	           "(_("msg %s") % s)"
-	            - Updated po files
-	           * Complete German translation
-	           * List Jerome in the documentation credits
-	           * Complete string review
-	           * Extend copyrigt to the current year
-	           * HIGified used gtk.MessageDialogs
-	[213.3.63] * Updated po files to reflect the first round of the string
-	           review
-	           * Updated but not completed German translation
-	[213.3.62] * set the gettext text domain to actually use all translated
-	           strings
-	[213.3.61] * Do not use a fixed width. This can result in cutted widgets in
-	           non English
-	             languages
-	[213.3.60] * recalculate the width of the treeview to avoid useless
-	           scrollbars #20787
-	[213.3.59] * produce a valid desktop file - #33571
-
-2006-03-08 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.58] * Also tag URLs without protocol prefix but www. as links -
-	           #30892
-	[213.3.57] * detailed wording in the gksu dialog
-	           * replace program by application, fixed wrong uppercases
-	[213.3.56] [merge] merged from mvo
-
-2006-03-03 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.55] * Nicer wording of the quick introduction #33551
-
-2006-03-06 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[261.2.6] * fix the ffmpeg desktop file
-	[261.2.5] * AppInstall/Menu.p: basic debuging support added
-	          * menu-data/: added gstreamer0.10-plugins-ugly and ffmepg
-	[261.2.4] * changelog: updated
-	[261.2.3] * added gnome-office pseudo desktop file
-
-2006-03-01 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[261.2.2] [merge] * merged from sebi
-
-2006-03-01 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.54] * HIGification of the dialog_outdated_cache
-	            - Use a less technical wording
-	            - Convert to an informational dialog that provides clear
-	           actions on
-	              the button - yes/no can be very misleading
-	            - Set the default action to reload
-	            - Fix spacings
-	            - Remove separator
-	            - Remove close button of the wm
-	[213.3.53] [merge] * merged from mvo
-
-2006-03-01 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[261.2.1] [merge] * merged patch from koke
-
-2006-03-01 Jorge Bernal <jbernal@warp.es> 
-
-	[261.1.1] Make the search entry to grab focus when starting.
-
-2006-03-03 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[265] * changelog updates
-	[264] * fix the common.ThoughIconTheme.lookup() codd
-	[263] * AppInstall/BrowserView.py: remove the threading, as it was
-	      implemented it didn't worked
-
-2006-03-01 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[262] * changelog updated
-
-2006-02-28 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[261] [merge] * is cache up-to-date code ready
-
-2006-02-28 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.52] [merge] merged from mvo
-
-2006-02-27 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.51] [merge] * merged from mvo
-
-2006-02-24 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.50] [merge] * merged from mvo
-
-2006-02-28 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[260] * fix problem with channel files ending up in the wrong location
-	[259] * updated finish translation
-
-2006-02-24 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[258] [merge] * merged with sebi (thanks!)
-
-2006-02-24 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.49] [merge] * merged with michael
-
-2006-02-23 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.48] * Try to get an icon under every circumstances
-	[213.3.47] * Do not crash on a missing icon
-	[213.3.46] * fixed an auto indent error in the setup.py
-	[213.3.45] * Merged manual from  Jerome Gotangco - the development will now
-	           continue in the bzr repo
-	[213.3.44] [merge] * merged from michael
-	[213.3.43] * do not build the schemas file in the source tree
-
-2006-02-23 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[257] * more kde specific fixes
-	[256] * changelog updates
-	[255] * menu-data/icons/: ran the icon cleanup code
-	[254] * corrected mozilla section
-	[253] * updated desktop files
-	[252] * AppInstall/DialogNewlyInstalled.py: don't show stuff that can't be
-	      execed
-	      * TODO: cleanup
-	      * data/gnome-app-install.desktop.in: add X-Ubuntu-Gettext-Domain
-	[251] * AppInstall/AppInstall.p: loads of dead code removed
-	      * TODO: updated
-	[250] * AppInstall/AppInstall.py: reapply search on restore state
-	[249] * AppInstall/AppInstall.py: save/restore state added
-	[248] [merge] * help/* merged the help from sebi
-	              * AppInstall/AppInstall.py: fixed crash when a channel was
-	              added
-	              * TODO: updated
-
-2006-02-21 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.42] * Megred manual
-	[213.3.41] * removed duplicate installation of the omf file
-	[213.3.40] * Fixed the installation of the help files
-	           * Fixed the installation of the language files
-
-2006-02-20 Sebastian Heinlein <sebi@server> 
-
-	[213.3.39] [merge] merged with michael
-
-2006-02-20 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.38] * Merged help from jsgotangco
-	           * crushed png files
-	[213.3.37] * Fixed installation direcotry of the help files
-	           * Fixed omf file
-	           * Setup copyright to Canonical Ltd.
-	[213.3.36] * Add the help of jsgotangco
-	           * Include the help into build system of setup.py
-	           * Use dh_scrollkeeper to register the omf
-
-2006-02-20 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[247] * fixed bug in header (*grumpf*)
-	[246] * updated pt_BR translation (thanks!)
-	[245] * changelog updates
-	[244] [merge] * merged with sebi
-	              * TODO: desktop-menu item rendering issue is fixed
-
-2006-02-18 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.35] * use a variable for the msgid bug contact in the makefile
-	[213.3.34] [merge] * Merged with michael
-	                   * Fixed typos
-	                   * Added my email address for bug reporting in the msgids
-	                   * Updated the po files
-
-2006-02-16 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[243] [merge] * merged with sebi
-	              * applied fixes from zyga
-
-2006-02-16 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.33] * more todo
-	[213.3.32] * more todo
-	[213.3.31] * Updated the TODO file
-
-2006-02-16 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[242] * make the window slightly bigger
-	[241] [merge] * merged with Sebastian (+ minor bits)
-
-2006-02-16 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.30] * Actually quit if the close button of the window manager was
-	           pressed and
-	             there are no pending changes
-	           * Fixed the sensitiveness/insensitveness of the checkbuttons
-	[213.3.29] [merge] * merged from mvo
-	[213.3.28] * Set the checkbutton "install" senstive if the app can be
-	           removed, too
-
-2006-02-15 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.27] * move the missing port error message to the description
-	           * use a larger distributor icon (32pixels)
-	[213.3.26] * Set the toggle install insensitive if the app ist not
-	           available
-	           * Add a separator before the multiple apps info
-	           * Add some comments
-	           * Add working support for adding missing channels (the wording
-	           of the
-	             dialogs needs to be adjusted to the new workflow)
-	[213.3.25] * Use a html form button in the description to add a missing
-	           repository section
-	             (protoype quality :)
-	[213.3.24] * use the distributor logo (here the ubuntu circle) for the
-	           category "all"
-	[213.3.23] [merge] merged from michael
-	                   - This line and the following will be ignored --
-	                   modified:
-	                     AppInstall/AppInstall.py
-	                     AppInstall/Menu.py
-	                     data/gnome-app-install.glade
-	                     debian/changelog
-	                   unknown:
-	                     build
-	                     build-stamp
-	                     AppInstall/Version.py
-	                     AppInstall/test
-	                     data/gnome-app-install.desktop
-	                     data/gnome-app-install.gladep
-	                     data/gnome-app-install.schemas
-	                     debian/arch-build
-	                     debian/files
-	                     debian/gnome-app-install
-	                     debian/gnome-app-install.postinst.debhelper
-	                     debian/gnome-app-install.postrm.debhelper
-	                     debian/gnome-app-install.prerm.debhelper
-	                     debian/gnome-app-install.substvars
-	                     po/mo
-	                   pending merges:
-	                     Michael Vogt 2006-02-15 * search with a timout of 0.5s
-	                   * changelog updates
-	                       Michael Vogt 2006-02-14 * add a "All" category
-	                       Michael Vogt 2006-02-14 * removed
-	                   on_search_activate()
-
-2006-02-16 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[240] * move app data to /usr/share/app-install-data
-
-2006-02-15 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[239] * split the desktop file stuff into a "app-install-data" packages
-	[238] * fix a problem in the DialogNewlyInstalled() when on Apply it wasn't
-	      closable anymore
-	[237] * search with a timout of 0.5s
-	      * changelog updates
-
-2006-02-14 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[236] [merge] * add a "All" category
-
-2006-02-13 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.22] * Add a help button next to the advanced button
-	           * Do not P_WAIT on gnome-open
-	           * Use the same height for all buttons at the buttom
-	[213.3.21] [merge] * merged from michael
-
-2006-02-14 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[235] * removed on_search_activate()
-
-2006-02-13 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[234] [merge] * merged from sebi (only the gray-out change is not yet
-	              merged)
-	              * don't explode on exceptions from gettext.dgettext()
-
-2006-02-11 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.20] * missed the glade file in my last commit
-	[213.3.19] * Put some love at the DialogMultipleApps, DialogUnavailable
-	           * Mention the required internet connection in the add
-	           section/channel dialogs
-	           * Use "Close" and not "quit" in the tooltip of the button
-	           "advanced"
-	           * Add missing files to POTFILES.in
-	[213.3.18] * Sanitisize the close confirmation if there are pending
-	           changes:
-	             "Close Without Applying", "Cancel" and "Apply"
-	           * Add a "final" variable to applyChanges:
-	             if we close g-a-i after applying we don't need an updated
-	           chache
-	             or the main window.
-	           * Do not use a special font for unavailable apps (this was lost
-	           during the
-	             merges?), since the app is still clickable (gray) or the
-	           window gets to
-	             noisy (italic + blod, big, small)
-	[213.3.17] [merge] * merged from mvo
-	[213.3.16] * Do not show empty ignore changes if button quit is clicked
-	           * Move the confirm changes code from on_button_apply_clicked to
-	           its own
-	             method confirmChanges
-	           * Rename do_apply to applyChanges - seems to be more consistent
-	           with
-	             the used naming schema in gai
-
-2006-02-10 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[233] * changelog updates
-	[232] * AppInstall/AppInstall.py: gray out the not available apps again
-	      * AppInstall/Menu.py: use hidden applications as well
-	      * menu-data/applications.menu: don't show the debian menu
-	[231] [merge] * merged with sebi
-
-2006-02-10 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.15] * Add a "nice" string for gksu
-	           * Use raw strings in the URL finders re to make it "more
-	           readable",
-	             additionally find URLs in paranthesis #30892
-	           * Set default buttons on the pending changes and proprietary
-	           channel dialog
-	           * Fix missing section or channel descriptions (string != "" is
-	           not string !=
-	             None). Nicer wording and remove the reference to the menu.
-	           Trying not to
-	             bother translators with html tags
-	           * Move the string "Version" from the template to the code to
-	           make it
-	             translatable and to not show it without an available version
-	           number
-
-2006-02-10 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[230] [merge] * make the pulse step smaler
-	              * merged from sebi
-
-2006-02-09 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.14] * Remove my url parser, the old one is a lot better
-
-2006-02-10 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[229] * give more useful report on non-package menu entries
-	[228] * fix the installing of components
-	[227] * save postition on search
-	[226] * fix bugs in the parser code
-
-2006-02-09 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[225] * removed the old menu data dirs
-	[224] * fix some desktop files
-	[223] * make update-po, took translations from gnome-cvs
-	[222] * support langpack translation in g-a-i for the dekstopfiles
-	[221] [merge] * merged with sebastian
-
-2006-02-09 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.13] * install the gconf schema to ../etc/gconf/schemas. otherwise it
-	           won't
-	             trigger dh_gconf, that adds the schemas regristration to
-	           postinst
-	           * make use of dh_gconf in the debain/rules
-	           * put some love on the prorprietary software dialog: no close
-	           button, bold and
-	             big header, clearer messages, a tooltip for the button add,
-	           spacings
-	             and alignments according to the HIG
-	           * set the main window to normal and not dialog. the main window
-	           is resizable
-	             and so the maximize function could be of use on low res
-	           monitors, it causes
-	             some window postioning problems, too: the dialog of a
-	           dialog...
-	             the gnome-system-tools also provide minimize and maximize
-	           * parse the package description for urls and convert them to
-	           links
-	           * add a sanity check for the values retrieved from gconf
-
-2006-02-08 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.12] [merge] * merged from michael
-	[213.3.11] * Beautification of the synaptic socket window
-
-2006-02-09 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[220] * latest upload
-
-2006-02-08 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[219] * changelog updated
-	[218] * fix post-update-cache visible filter
-	[217] [merge] * save/restore the toggle button settings
-
-2006-02-08 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.10] * Only allow to close the main window if it is sensitive
-	           * Allow to actually close the app by the close button of the
-	           window manager
-	           * Add a non-working gconf client for the checkboxes
-	           * Add a non-installable schemas file for gconf
-	           * OK in main -> Cancel in confirmation -> Return to the main
-	           window
-	           * Cancel -> do abort gai and do not ask for confirmation
-	           * Return of the pulsing progress bar with a greater pulse step
-	           during
-	             the parsing of the desktop files
-	           * Rename the button close of the main window to cancel
-	           * Do not show the close button of the window manager in the
-	           confirmation
-	             dialog
-	           * A small but bold font looks nicer on the confirmation dialog
-	           for "Add" and
-	             "Remove" - also align the text to the left
-	           * Remove the text from the pending dialog in the glade file - it
-	           is set on
-	             runtime - so we avoid duplicated work for the translators
-	[213.3.9] [merge] * merged from michael
-
-2006-02-07 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.8] * Use css clases for the description and deinfe them in the
-	          template
-	          * Add a missing close tag for body and html to the template
-
-2006-02-08 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[216] [merge] * merged the non-root mode changes
-	[170.1.10] * remove some debug
-	[170.1.9] * depend against the right synaptic version
-	[170.1.8] * enable launch application
-	[170.1.7] [merge] * merged to the latest version
-	[214.1.1] [merge] * make it work
-
-2005-12-28 Michael Vogt <egon@top> 
-
-	[170.1.6] * show clickable urls as user but not as root
-	[170.1.5] * show urls when runing as user
-	[170.1.4] [merge] * merged with mainline
-	[170.1.3] * TODO: some remarks about problems with the current approach
-	[170.1.2] [merge] * merged with the mainline
-
-2005-12-16 Michael Vogt <egon@top> 
-
-	[170.1.1] * started with the non-root mode
-
-2006-02-08 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[215] * minor fixes
-	[214] [merge] * merged with the new new-look branch
-
-2006-02-07 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[213.1.14] [merge] * merged with sebi (new templates) THANKS
-
-2006-02-07 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.7] * Do some regular expression magic to get nicer app descriptions
-	[213.3.6] [merge] * merged from michael
-	[213.3.5] * replace paragraphs by divs in the template.html so empty
-	          strings do not add so
-	            much spacing
-
-2006-02-07 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[213.1.13] * menu-data/*:
-	             - updated the desktop files to current dapper
-	[213.1.12] * more fixes
-	[213.1.11] * AppInstall/Menu.py: fix the search
-	           * AppInstall/Progress.py: is not pulsing anymore (sorry Sebi :/)
-	           * AppInstall/AppInstall.py: refilter when the category changes
-	[213.1.10] [merge] * merged with sebastian
-
-2006-02-07 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.4] * Do not show a close button in the decoration of the progress
-	          dialog
-	          * Use hopefully a clearer header in the progress dialog and avoid
-	          to introduce
-	            new terms (in the former dialog: "library")
-	          * Lower the pulse setp to 0.005
-	            Could you give my some feedback on this, Michael? It is quiet
-	          slow on
-	            my ancient computer, so it could be ok for you. :)
-	          * Do not duplicated glade settings in the code
-	[213.3.3] * Missed a closing )
-	[213.3.2] * As suggested by mpt move the checkboxes under the app list
-	          * Make the search entry smaller
-	          * Add a bold header "applications" to increase the visual
-	          attraction of the app
-	            list
-	          * Treat the main window as a dialog window
-	          * Do not use a bold font for the category/menu names
-	          * Strip all white spaces, new lines and tabs from the description
-	          * Modified template:
-	             - do not use a bold font for the app name - it is very
-	          distracting
-	             - do not show the summary - it is already in the app list, the
-	          purpose of the
-	               desc is to provide more information than the app list
-	             - Put the version information at the end - it is not important
-	          * Modified starting page:
-	             - Do not use add/remove since it is a duplication - instead
-	          "quick introduction"
-	             - Tighten the introduction
-	          * Do not show "Loading page /tmp/XXXXXX" - this removes a small
-	          flickering when
-	            another app is selected
-
-2006-01-27 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.3.1] [merge] merge from mvo
-
-2006-01-25 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[213.1.9] * fix ok button to actually quit
-	[213.1.8] * make apply, ok work
-	[213.1.7] [merge] * AppInstall/Menu.py: fix isChanged(), getChanges()
-
-2006-01-24 Sebastian Heinlein <sebastian.heinlein@web.de> 
-
-	[213.2.6] [merge] * merged from mvo
-
-2006-01-23 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[213.1.6] [merge] * merged from Sebastian
-	                  * changed from GtkMozEmbed back to GtkHtml2
-
-2006-01-22 Sebastian Heinlein <sebi@renatepc.pimpzkru> 
-
-	[213.2.5] * Renamed widget "label_ok" in window_main
-	          * Added a frame around the custom_widget. this only works for
-	          gtkhtml2 and dump
-	            i think that we cannot control the gtkmozembed widget to draw a
-	          frame
-	[213.2.4] [merge] * Import from Michaels branch
-	[213.2.3] Progress:
-	           * Don't show the current action in the progress bar, instead use
-	          the text label below
-	           * Use italic style
-	           * Set space between label and progress bar to 4
-
-2006-01-22 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[213.1.5] * added credits for Sebastian Heinlein
-	[213.1.4] [merge] * merged with sebasitan
-
-2006-01-22 Sebastian Heinlein <sebi@renatepc.pimpzkru> 
-
-	[213.2.2] * Progress dialog higification:
-	             - center on parent
-	             - skip taskbar
-	             - skip pager
-	             - no title
-
-2006-01-22 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[213.1.3] [merge] * merged with sebi
-
-2006-01-22 Sebastian Heinlein <sebi@renatepc.pimpzkru> 
-
-	[213.2.1] * Use "Add/Remove..." in the menu "Applications"
-	          * Do not show in the system preferences
-	          * Add access key for the button "Advanced"
-	          * Add a tooltip for the button "Advanced": "Launch the Synaptic
-	          package manager"
-	          * unset rules hint on the category view. I think it adds to much
-	          visual noise. Because of the bold items, the large icons and the
-	          large spaces it should be well readable without the rules hint.
-	          * unset shrink and resize for the category view
-	          * set resize for the right side of the hpaned (package view,
-	          search, description)
-	          * set resize for the package view and unset resize for the
-	          description. I did mainly enlarge the main window to see more
-	          packages on the list.
-	          * unset shrink for the description and the package view
-	          * add a label "Search:" before the search entry
-	          * Add tooltip to "unsupported": "Volunteers maintain a large
-	          selection of software that can be used with Ubuntu, the so called
-	          Universe. Cannonical does not guarantee technical support and
-	          security updates"
-	          * Add a tooltip to "proprietary": "Software with diverse
-	          restrictions on copying, using, redistributing or improving it.
-	          Cannonical does not guarantee complete technical support and
-	          security updates"
-	          * Remove the frame beneath the browser_custom. it should be drawn
-	          by the widget code itself, so that the frame does not enfolds the
-	          scrollbars, too
-	          * Set the width of the left side of the hpanes to 500 to ensure
-	          that it is larger than the category viewer
-	          * Set the height of the package viewer to 150
-
-2006-01-20 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[213.1.2] * finalized changelog
-
-2006-01-19 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[213.1.1] * initial commit of the new-look branch, basicly working (modulo
-	          bugs)
-
-2006-01-13 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[213] * close-button is cancel now
-	      * added "..." ubuntu: #22475
-
-2006-01-10 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[212] * about:blank is understood by GtkHtml2 view now
-	[211] * changelog finalized
-	[210] * desktop environment guessing added
-	[209] [merge] * merged with my laptop branch
-	              * threading support for fetching external uris
-	              * apt-key support
-	              * license display/acceptance
-	[208.1.2] * license display code started
-
-2006-01-06 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[208.1.1] * added support for channel keys
-
-2006-01-05 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[208] * be more robust about broken desktop files (e.g. missing Name=value
-	      tags)
-	[207] * show the menu path in the newly installed applications
-	[206] * disconnect the model from the view before doing a search, otherwise
-	      g-a-i crashs
-	[205] * AppInstall/AppInstall.py: show version information in info page
-	      * AppInstall/BrowserView.py: commented out the gtkembedmoz stuff
-	      * data/template.html: added version
-
-2006-01-02 Michael Vogt <egon@top> 
-
-	[204] * removed some auto* files
-
-2005-12-28 Michael Vogt <egon@top> 
-
-	[203] * AppInstall/AppInstall.py: minor cleanups in the generateInfoPage
-	      code
-	[202] * improve the icon display on gtkhtml2
-	[201] * data/gnome-app-install.glade: typo in row_activate signal
-	[200] * AppInstall/AppInstall.py:
-	        - only display information about multiple packages if there are
-	      actually multiple packages
-	[199] * show progress for desktop file reading
-	[198] * po/*.po:
-	        - make update-po
-	[197] * set version in about dialog
-
-2005-12-21 Michael Vogt <egon@top> 
-
-	[196] * some more fixes to the desktop files
-	[195] * changelog adjusted
-	[194] * fix in the icondir
-	[193] * removed loads of no-longer used desktop icons
-	[192] * removed some obsolete dekstop files
-	      * fixed some problem in existing ones
-	[191] * blacklist some more stuff
-	[190] * added the new desktop files from dapper
-	[189] * re-run the desktop file extraction on dapper
-	[188] * make sure that lines always ends with "\n" when writing the desktop
-	      file
-	[187] * implemented package transform code
-
-2005-12-20 Michael Vogt <egon@top> 
-
-	[186] * fix in the correct "-common"/"-data" pkgs code
-	[185] * implemented blacklist
-	[184] * simple fixer for "-data", "-common" pkgs
-	[183] * fix typo in error handling
-	[182] * properly extract the icon
-	[181] * update the cache and clean up when extracting the menu data
-	[180] * do useful extraction now, don't use xdg.Menu for it (not available
-	      on the server we run the script on)
-	[179] * fix some small errors
-	[178] * make it usable again
-	[177] * started to re-write the getMenuData tool
-	[176] * added _refilter() function that is called when
-	      "show_unsupport/show_proprietary" is set
-	[175] * rewrote the search, put the actual search into the ApplicationMenu
-	      class
-	      * don't use a FilteredApt cache anymore, was a stupid idea from the
-	      begining
-	        -> much faster now
-	      * the ApplicationMenu gets the treeview as argument now that it will
-	      be
-	        displayed in
-
-2005-12-19 Michael Vogt <egon@top> 
-
-	[174] * make the browser a glade custom widget
-	      * AppInstall/Menu.py: add a filter for proprietary and unsupported
-	      stuff for the main view
-	[173] * typo fix (#21251)
-	[172] * po/*: make update-po
-	      * AppInstall/AppInstall.py: restored the default icon
-
-2005-12-16 Michael Vogt <egon@top> 
-
-	[171] * AppInstall/BrowserView.py: removed debug output
-	      * data/gnome-app-install.desktop.in: removed translations from this
-	      file
-	      * debian/changelog: finalized and uploaded
-	[170] * make the gtkhtml2 browser view usable
-	[169] * some comments added
-	      * skype is proprietary
-	      * read proprietary property on a desktop file as well
-	[168] * added reload menu item (for testing, will go away again)
-	      * execl() synaptic when advanced is run
-	[167] * moved the menu specifiy code out to Menu.py
-
-2005-12-15 Michael Vogt <egon@top> 
-
-	[166] * doc updates
-	[165] * fixes in the add new componenet code
-	[164] * cleaned up "search"
-	[163] * newly installed cleaned up
-	[162] * cleaned up the multiple apps per package support
-	[161] * massive code cleanups in AppInstall.py, the *huge* liststore is
-	      gone and replaced with a small one that only contains "type, name,
-	      item". all the interesstign things are in the item object that is a
-	      proper python object
-
-2005-12-13 Michael Vogt <egon@top> 
-
-	[160] * bugfixes
-	      * added bzr as a example for a third party repository
-	[159] * very basic support for channels added
-	[158] * changelog updates
-	[157] * use sources.list.d directory now add components
-	[156] * moved the PackageWorker into PackageWorker.py
-	      * moved the apt search into Util.py (should probably end up in it's
-	      own file)
-	      * more cleanups, removed a lot of cruft
-	[155] * more cleanups
-	[154] * moved the dialogs for multiple installed apps out to
-	      DialogMultipleApps.py
-	      * moved the dialog for apps currently unavailable in the repo out
-	      into
-	        DialogUnavailable.py
-
-2005-12-12 Michael Vogt <egon@top> 
-
-	[153] * add/remove and the newly_installed dialog seems to work again
-	[152] * fixes in the newly installed dialog
-	[151] * moved the "pendingChange" code into DialogPendingChanges.py
-	      * moved some common stuff into Util.py
-	[150] * AppInstall/AppInstall.py:
-	        - moved the newly installed dialog into DialogNewlyInstalled.py
-	[149] * abstracted (or rather started to abstract) the browser into it's
-	      own
-	        file/class AppInstall/BrowserView.py
-	      * move the progress-window into AppInstall/Progress.py
-	[148] * AppInstall/SimpleGladeApp.py:
-	        - added SimpleGladeApp
-	      * renamed src to AppInstall
-	      * switched to distutils
-	      * switched to bzr in debian/rules arch-build
-
-2005-10-05 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[147] * depend on firefox|mozilla-firefox, dekstop file updates
-	[146] * various small fixes
-
-2005-10-04 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[145] * latest upload
-
-2005-09-26 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[144] * fix incorrect sections, make searching multiple times work
-	[143] * locking added, added dependency to mozilla-firefox
-
-2005-09-23 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[142] * depend on gnome-icon-theme
-
-2005-09-21 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[141] * lbreakout2 added
-
-2005-09-19 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[140] * preparing a new upload with some more menu-file fixes
-
-2005-09-14 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[139] * more fixes for the menu-data desktop files
-
-2005-09-13 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[138] * typo fix in the init window
-
-2005-09-12 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[137] * fail if not running as root
-	[136] * fix to wrongly assigned sections
-	[135] * removed bits of kdevelop3, added *.menu to data/Makefile.am
-	[134] * lot's of menu-data fixes (see debian/changelog for details)
-
-2005-09-08 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[133] * fix for #14859
-	[132] * fix #14858
-	[131] * tyo fix (ubuntu #14857)
-	[130] * small ui fixes to the cache init window
-
-2005-09-07 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[129] * merge with niran
-	[128] * merged from niran
-
-2005-09-05 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[127] * more cleanups in featured.txt and the menu-data
-	[126] * ooo2 is a featured application now
-
-2005-09-02 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[125] * merge from niran
-
-2005-08-31 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[124] * merged with nirans tree
-
-2005-08-26 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[123] * improvements to the apt interface
-	[122] * fix gnumeric.desktop file
-	[121] * merged from niran
-
-2005-08-25 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[120] * make search case insensitive
-	[119] * launchpad integration, search improvments
-
-2005-08-18 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[118] * more checks in the verify script
-
-2005-08-16 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[117] * pending dialog improvements
-
-2005-08-15 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[116] * abiword -> abiword-gnome
-	[115] * use utf-8 in data/template.html
-	[114] * verfiyDesktopFile.py added
-	[113] * changelog updates, carfully check if a install is save
-	[112] * conflicts with gnome-app-install-data, merged with niran
-
-2005-08-12 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[111] * undo the packaging split
-
-2005-08-11 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[110] * merged from niran
-
-2005-08-09 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[109] * removed more icons from menu-data-old/icons
-	[108] * removed the icons from menu-data-old, beezy -> breezy in changelog
-	[107] * removed a lot of old desktop files (from menu-data-old, and menu-
-	      data-orig)
-	[106] * typo
-	[105] * minor fixes
-	[104] * don't remove applications if other apps depend on them
-	[103] * about dialog added
-	[102] * cache progress window added
-	[101] * bugfixes
-	[100] * g-a-i builds a g-a-i and g-a-i-data package now
-	[99] * added debian dir, some cleanups in the glade code
-	[98] * merged from niran
-
-2005-08-05 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[97] * merged with niran
-
-2005-08-04 Michael Vogt <michael.vogt@ubuntu.com> 
-
-	[96] * os.tmpname() -> tempfile.NamedTemporaryFile()
-	[95] * ported to the new python-apt api, fix in data/Makefile.am
-	[94] tag of niran@niran.org--soc/gnome-app-install--niran--0--patch-24
-
-2005-08-03 Niran Babalola <niran@niran.org> 
-
-	[93] Fix .desktop file loading to load packages that apt doesn't know about
-	[92] Preserve changes made before editing repositories
-	[91] Show all programs and gray out uninstallable programs.
-	[90] Show all programs and gray out uninstallable programs.
-
-2005-08-01 Niran Babalola <niran@niran.org> 
-
-	[89] Fix bug when running synaptic and provide information about multiple
-	     programs in a package on the information page
-
-2005-07-31 Niran Babalola <niran@niran.org> 
-
-	[88] Notify the user when changing a package that provides multiple
-	     programs, and apply the change to each entry
-
-2005-07-29 Niran Babalola <niran@niran.org> 
-
-	[87] Added menu and repository configuration dialog
-
-2005-07-28 Niran Babalola <niran@niran.org> 
-
-	[86] Added missing applications.menu
-	[85] Conquered baz once and for all. I hope.
-	[84] Even more baz fixing
-
-2005-07-26 Niran Babalola <niran@niran.org> 
-
-	[83] more baz fixing
-	[82] baz fixing
-	[81] Added new menu-data directory
-	[80] Fixed menu-data/Makefile.am
-
-2005-07-22 Niran Babalola <niran@niran.org> 
-
-	[79] Added script to get .desktop files from a Debian mirror
-	[78] Added lots of .desktop files and moved many to submenus
-
-2005-07-11 Niran Babalola <niran@niran.org> 
-
-	[77] Implemented information page generation
-
-2005-07-09 Niran Babalola <niran@niran.org> 
-
-	[76] Moved checkbox column back to the right
-	[75] Code cleanup
-	[74] Show new programs after installation
-
-2005-07-08 Niran Babalola <niran@niran.org> 
-
-	[73] Made program installable
-
-2005-07-01 Niran Babalola <niran@niran.org> 
-
-	[72] Fixed signal handler blocking bug and added placeholder when there are
-	     no search results.
-	[71] Searching works now. It is glorious.
-
-2005-06-30 Niran Babalola <niran@niran.org> 
-
-	[70] Added mozembed, search field, and made menu entries selectable.
-	     Installing won't work right now, run src/AppInstall.py from the root
-	     directory.
-	[69] tag of gnome-app-install@bazaar.ubuntu.com/gnome-app-install--MAIN--0
-	     --patch-67
-
-2005-06-30 Arch Librarian <arch@canonical.com> 
-
-	[68] Filler changeset 1.1->1.1.1.1
-	[67] Filler changeset 1.1->1.1.1.1
-	[66] Filler changeset 1.1->1.1.1.1
-	[65] Filler changeset 1.1->1.1.1.1
-	[64] Filler changeset 1.1->1.1.1.1
-	[63] Filler changeset 1.1->1.1.1.1
-	[62] Filler changeset 1.1->1.1.1.1
-	[61] Filler changeset 1.1->1.1.1.1
-	[60] Filler changeset 1.1->1.1.1.1
-	[59] Filler changeset 1.1->1.1.1.1
-	[58] Filler changeset 1.1->1.1.1.1
-	[57] Filler changeset 1.1->1.1.1.1
-	[56] Filler changeset 1.1->1.1.1.1
-	[55] Filler changeset 1.1->1.1.1.1
-	[54] Filler changeset 1.1->1.1.1.1
-	[53] Filler changeset 1.1->1.1.1.1
-	[52] Filler changeset 1.1->1.1.1.1
-	[51] Filler changeset 1.1->1.1.1.1
-	[50] Filler changeset 1.1->1.1.1.1
-	[49] Filler changeset 1.1->1.1.1.1
-	[48] Filler changeset 1.1->1.1.1.1
-	[47] Filler changeset 1.1->1.1.1.1
-	[46] Filler changeset 1.1->1.1.1.1
-	[45] Filler changeset 1.1->1.1.1.1
-	[44] Filler changeset 1.1->1.1.1.1
-	[43] Filler changeset 1.1->1.1.1.1
-	[42] Filler changeset 1.1->1.1.1.1
-	[41] Filler changeset 1.1->1.1.1.1
-	[40] Filler changeset 1.1->1.1.1.1
-	[39] Filler changeset 1.1->1.1.1.1
-	[38] Filler changeset 1.1->1.1.1.1
-	[37] Filler changeset 1.1->1.1.1.1
-	[36] Filler changeset 1.1->1.1.1.1
-	[35] Filler changeset 1.1->1.1.1.1
-	[34] Filler changeset 1.1->1.1.1.1
-	[33] Filler changeset 1.1->1.1.1.1
-	[32] Filler changeset 1.1->1.1.1.1
-	[31] Filler changeset 1.1->1.1.1.1
-	[30] Filler changeset 1.1->1.1.1.1
-	[29] Filler changeset 1.1->1.1.1.1
-	[28] Filler changeset 1.1->1.1.1.1
-	[27] Filler changeset 1.1->1.1.1.1
-	[26] Filler changeset 1.1->1.1.1.1
-	[25] Filler changeset 1.1->1.1.1.1
-	[24] Filler changeset 1.1->1.1.1.1
-	[23] Filler changeset 1.1->1.1.1.1
-	[22] Filler changeset 1.1->1.1.1.1
-	[21] Filler changeset 1.1->1.1.1.1
-	[20] Filler changeset 1.1->1.1.1.1
-	[19] Filler changeset 1.1->1.1.1.1
-	[18] Filler changeset 1.1->1.1.1.1
-	[17] Filler changeset 1.1->1.1.1.1
-	[16] Filler changeset 1.1->1.1.1.1
-	[15] Filler changeset 1.1->1.1.1.1
-	[14] 2005-06-27  Gabor Kelemen  <kelemeng@gnome.hu>
-	[13] 2005-06-27  Gabor Kelemen  <kelemeng@gnome.hu>
-	[12] 2005-06-23  Adam Weinberger  <adamw@gnome.org>
-	[11] 2005-06-22  Marcel Telka  <marcel@telka.sk>
-	[10] 2005-06-22  Marcel Telka  <marcel@telka.sk>
-	[9] Added Simplified Chinese translation.
-	[8] 2005-06-19  Christian Rose  <menthos@menthos.com>
-	[7] * Changelog:
-	[6] * src/appInstall.py:
-	[5] * configure.in, po/fr.po
-	[4] * Changelog:
-	[3] * src/AppInstall.py:
-	[2] Add Polish translation
-	[1] Initial revision
+@AUTOMATIC@
+	
--- gnome-app-install-0.5.2.8.orig/debian/changelog
+++ gnome-app-install-0.5.2.8/debian/changelog
@@ -0,0 +1,1648 @@
+gnome-app-install (0.5.2.8-0ubuntu1netbook0dennis5) hardy; urgency=low
+
+  * 18_drop_ubuntu.patch:
+    - Drop mention of Ubuntu/Canonical in several places.  Part of LP: #297010
+
+ -- Michael Terry <michael.terry@canonical.com>  Thu, 20 Nov 2008 10:49:10 -0500
+
+gnome-app-install (0.5.2.8-0ubuntu1netbook0dennis4) hardy; urgency=low
+
+  * Update pos: de es fr it ja ko ru zh_CN zh_TW
+
+ -- Kyle Nitzsche <kyle.nitzsche@canonical.com>  Wed, 29 Oct 2008 16:57:01 -0400
+
+gnome-app-install (0.5.2.8-0ubuntu1netbook0dennis3) hardy; urgency=low
+
+  * Add 15_fix_spelling_error.patch to fix the incorrect spelling
+    of the word "available" in the dialog that is shown when no
+    index files are found (LP: 268866).
+
+ -- Gary Lasker <gary.lasker@canonical.com>  Mon, 15 Sep 2008 18:09:21 -0400
+
+gnome-app-install (0.5.2.8-0ubuntu1netbook0dennis2) hardy; urgency=low
+
+  * Rename 10_custom_app_repo.patch to 10_app_filter_combo.patch.
+  * Update 10_app_filter_combo.patch to remove unnecessary separator
+    from the application filter combo box.
+
+ -- Gary Lasker <gary.lasker@canonical.com>  Thu, 31 Jul 2008 12:59:33 -0400
+
+gnome-app-install (0.5.2.8-0ubuntu1netbook0dennis1) hardy; urgency=low
+
+  * Add 10_custom_app_repo.patch to reduce the options in the application
+    filter combo box to allow filtering by "All Available Applications"
+    and "Installed Applications Only".
+
+ -- Gary Lasker <gary.lasker@canonical.com>  Tue, 29 Jul 2008 22:02:47 -0400
+
+gnome-app-install (0.5.2.8-0ubuntu1) hardy-proposed; urgency=low
+
+  * do not show "do you want to install more software" dialog
+    after a successful codec install (LP: #238685)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 10 Jun 2008 11:11:16 +0200
+
+gnome-app-install (0.5.2.7-0ubuntu1) hardy; urgency=low
+
+  * AppInstall/widgets/AppListView.py:
+    - workaround the fact that gdk_icon_theme_load_icon() 
+      sometimes ignore the size request and give huge
+      icons instead (#209072)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 11 Apr 2008 21:58:33 +0200
+
+gnome-app-install (0.5.2.6-0ubuntu1) hardy; urgency=low
+
+  * AppInstall/update.py:
+    - do not crash if xdg.DesktopEntry can not be importet 
+      (LP: #194111)
+  * fix crash on pygtk.require("2.0") (LP: #211683)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 04 Apr 2008 20:19:09 +0200
+
+gnome-app-install (0.5.2.5-0ubuntu1) hardy; urgency=low
+
+  * AppInstall/AppInstall.py:
+    - work around gettext issue in the legal warning 
+      (thanks to Timo Jyrinki)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 11 Mar 2008 21:23:47 +0100
+
+gnome-app-install (0.5.2.4-0ubuntu1) hardy; urgency=low
+
+  * rebuild against latest python-central
+  * fix description parser to make it display wormux correctly 
+    (LP: #193094)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 20 Feb 2008 13:23:58 +0100
+
+gnome-app-install (0.5.2.3-0ubuntu1) hardy; urgency=low
+
+  * AppInstall/widgets/AppDescView.py:
+    - fix crash homepage field usage (LP: #192068)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 18 Feb 2008 13:49:27 +0100
+
+gnome-app-install (0.5.2.2-0ubuntu1) hardy; urgency=low
+
+  * AppInstall/widgets/AppDescView.py:
+    - show the homepage field (if available)
+  * debian/control:
+    - depend on the latest python-apt (for the homepage field)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 11 Feb 2008 10:40:58 +0100
+
+gnome-app-install (0.5.2.1-0ubuntu1) hardy; urgency=low
+
+  * AppInstall/activation.py:
+    - fix crash when running with --xul-extensions=firefox
+      (thanks to Alexander Sack for reporting this issue)
+      LP: #189490
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 07 Feb 2008 14:55:42 +0100
+
+gnome-app-install (0.5.2-0ubuntu1) hardy; urgency=low
+
+  [ Michael Vogt ]
+  * AppInstall/AppInstall.py:
+    - wording fixes (thanks to Matthew Paul Thomas)
+  * remove some dead code
+  * README: fix some outdated information (closes: #437415)
+  * fix gettext init (LP: #106756)
+  * be more robust if the description is empty for some
+    reason
+  * add special handling for the canonical partner repositor
+    in the app view (own text + icon)
+  * add support for https URLs in the app view
+
+  [ Sebastian Heinlein ]
+  * support emblemes without description and remove
+    unclear descriptions
+  * move search entry so that its more clear that it searches
+    only in the current category
+
+  [ Julian Andres Klode ]
+  * man/: Add manpages for all commands
+  * debian/control:
+    - Update to Policy 3.7.3
+    - Remove dependency on software-properties-gtk
+    - Use Vcs-Bzr instead of XS-Vcs-Bzr, fix url
+  * data/gnome-app-install.glade:
+    - Remove the Preferences Button
+  * setup.py:
+    - Install gnome-app-install-helper into /usr/sbin/
+  * AppInstall/CoreMenu.py, AppInstall/update.py:
+    - Use more efficient format to store cache (pickle protocol 2)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 05 Feb 2008 13:48:32 +0100
+
+gnome-app-install (0.5.1-0ubuntu1) hardy; urgency=low
+
+  * AppInstall/Menu.py:
+    - really fix crash in codec search code when gst.caps_from_string()
+      is called (LP: #173118). Thanks to Julian Klode and Albert23
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 21 Dec 2007 14:00:51 +0100
+
+gnome-app-install (0.5.0-0ubuntu1) hardy; urgency=low
+
+  * AppInstall/Menu.py:
+    - fix crash in codec search code when gst.caps_from_string()
+      is called (LP: #173118) 
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 04 Dec 2007 17:16:38 +0100
+
+gnome-app-install (0.4.13-0ubuntu1) gutsy; urgency=low
+
+  * remove app-install-data-commercial dependency (LP: #149018)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 05 Oct 2007 08:03:31 +0200
+
+gnome-app-install (0.4.12-0ubuntu1) gutsy; urgency=low
+
+  * Revert:
+    "Remove item.applications.set_default_sort_func(None) 
+     and use reset_default_sort_func() instead"
+    This breaks sorting the search results
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 04 Oct 2007 12:29:49 +0200
+
+gnome-app-install (0.4.11-0ubuntu1) gutsy; urgency=low
+
+  * AppInstall/AppInstall.py:
+    - be more robust about pkg missing in the data files
+      (LP: #122352)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 24 Sep 2007 13:05:28 +0200
+
+gnome-app-install (0.4.10-0ubuntu1) gutsy; urgency=low
+
+  * update-app-install:
+    - use system python (LP: #137985, #138903)
+  * data/gnome-app-install.schemas.in:
+    - fix typo (thanks to Alexandre Franke)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 11 Sep 2007 19:54:42 +0200
+
+gnome-app-install (0.4.9-0ubuntu1) gutsy; urgency=low
+
+  * debian/rules:
+    - use DH_PYCENTRAL=nomove as we need g-a-i code in
+      app-install-data-{ubuntu,commercial} postinst
+  * debian/control:
+    - sexy-python is now called python-sexy
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 06 Sep 2007 09:15:33 +0200
+
+gnome-app-install (0.4.8-0ubuntu1) gutsy; urgency=low
+
+  * fix detection of missing index files and popup a dialog
+    that offers reloading the sources (LP: #3475)
+  * debian/control:
+    - depend on latest python-apt (for pkgSourceList.List support)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 04 Sep 2007 17:37:12 +0200
+
+gnome-app-install (0.4.7-0ubuntu1) gutsy; urgency=low
+
+  [Michael Vogt]
+  * typo fix (LP: #134794), thanks to Malcom Parsons
+  * AppInstall/distros/Default.py:
+    - add missing get_codename() (LP: #128457)
+  
+  [Sebastian Heinlein]
+  * tests/:
+    - added more tests and better test data
+  * AppInstall/update.py, update-app-install:
+    - refactored into module
+  * AppInstall/DialogComplete.py:
+    - wording improvements
+  * AppInstall/AppInstall.py:
+    - improve failure detection
+    - add option to run in test-mode
+  * AppInstall/activation.py:
+    - set column caption depending on activation style
+  * debian/control:
+    - build-depend on python-setuptools
+  * setup.py, setup.cfg:
+    - build with python-setuptools
+  * Make the apply changes button translatable - fixes LP #133570
+
+  [Julian Andres Klode]
+  * Completely remove item.applications.set_default_sort_func(None)
+    and use reset_default_sort_func() instead
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 27 Aug 2007 14:54:12 +0200
+
+gnome-app-install (0.4.6-0ubuntu1) gutsy; urgency=low
+
+  [ Sebastian Heinlein ]
+  * Fix no mime type handler error message (Fixes LP #129485) 
+  * HIGification and rewording of the above dialog
+  * Show the file name in the window title for the mime type installer
+  * Only show the broaden your search tip if there is a filter choser
+    (fixes LP #130022)
+  * Store the filter names and tooltips in a less technical dictonary in the
+    distribution class
+  * Make the no results message more context sensitive
+  * Default to the search button on the initial codec search dialog
+  * Restore the state of the main window from the last time (fixes LP #48436)
+  * Improve cache update error messages (fixes LP #119198)
+
+  [ Julian Andres Klode ]
+  * Merge with Debian, remaining changes:
+    - No debian/patches
+    - Other list of deps and build-deps
+    - No watch file
+  * AppInstall/CoreMenu.py:
+    - Display icons with filename ending in png,svg or xpm
+  
+  [Michael Vogt]
+  * AppInstall/AppInstall.py:
+    - Remove item.applications.set_default_sort_func(None) 
+      and use reset_default_sort_func() instead
+  * tests/testCodecSearch.py,
+    tests/testMimeSearch.py:
+    - added test for mime and codec install feature
+  * AppInstall/Menu.py:
+    - fix some if tests that will be false for both "None" and "0" 
+      to only fail on None
+    - cosmetic changes 
+  * AppInstall/activation.py:
+    - use property for isInstallerOnly instead of function
+    - split CodecSearchActivation.preRun() into interactive and
+      non-interactive code to make it actually testable
+  * gnome-app-install:
+    - fix --selftest
+  * AppInstall/AppInstall.py:
+    - when building the filters, insert them sorted-by-key
+  * AppInstall/Menu.py:
+    - make the filter constants match the gconf schema file
+      (LP: #129669)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 07 Aug 2007 17:45:38 +0200
+
+gnome-app-install (0.4.5-0ubuntu1) gutsy; urgency=low
+
+  [ Sebastian Heinlein ]
+  * Window id has to be stored as an integer - fix LP #129416
+
+  [ Julian Andres Klode ]
+  * Switch to CDBS
+  * check whether to use software-properties-gtk or software-properties
+  * help/C/figures/*: Updated
+  * help/{de,sv}: disabled
+  * po/POTFILES.in: add AppInstall/activation.py
+  * Remove installation part in the docs and the Ubuntu ML
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 31 Jul 2007 16:38:53 +0200
+
+gnome-app-install (0.4.4ubuntu1) gutsy; urgency=low
+
+  * Add an installer only mode for the mime type handler and codec
+    installation
+  * Do not show the confirmation dialog anymore in the installer only mode
+  * Allow to search and choose different filters in the installer mode
+    (only used by the mime type installer)
+  * Rename the add/remove button to apply changes
+  * Improve command line handling
+  * Some code refractioning
+  * Add a XUL extension manager mode
+
+ -- Sebastian Heinlein <glatzor@ubuntu.com>  Mon, 30 Jul 2007 11:59:04 +0200
+
+gnome-app-install (0.4.3) gutsy; urgency=low
+
+  [Sebastian Heinlein]
+  * Switch to python-distutils-extra 
+  * fix POTFILES.in (LP: #125046)
+  
+  [Michael Vogt]
+  * do not display a application start icon for desktop
+    files without execCmd
+  * fix double del of a ActionGroup (LP: #126117)
+  * AppInstall/Menu.py, AppInstall/CoreMenu.py:
+    - code cleanup
+  
+  [Julian Andres Klode]
+  * AppInstall/AppInstall.py:
+    - If close button of the window manager was pressed and there are no
+      pending changes, quit.
+    - If there are pending changes, ask what to do
+  * AppInstall/distros/Debian.py:
+    - Merge changes from Ubuntu.py
+    - Use the new Debian icons
+    - Improve the descriptions
+  * debian/control:
+    - Cleanup build-depends
+  * data/icons/16x16/apps/application-debian-*.png:
+    - Add icons for Debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 25 Jul 2007 22:12:19 +0200
+
+gnome-app-install (0.4.2) gutsy; urgency=low
+
+  * Fix in the gstreamer caps support (LP#117157)
+  * added README.codecs
+  * added README.extraction (LP#107097)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 04 Jun 2007 16:12:49 +0200
+
+gnome-app-install (0.4.1) gutsy; urgency=low
+
+  [Sebastian Heinlein]
+  * Improved start up time
+  * Replace the supported Ubuntu applications filter by a
+    supported by Canonical one
+  * Switched from Apply|Cancel|OK to Cancel|Install/Remove buttons
+  * Added a clear icon and different background colouring to the search
+    entry
+  * Allow to specify a human readable name of an independent
+    software provider (X-AppInstall-ISV)
+  * Allow derivates to specify custom messages, components and filters
+  * Rewording of the additional components enabling dialogs
+    "Install" -> "Enable installation of"
+  * Allow to retry a failed installation/removal
+  * Handle errors in the enabling of components in a more sane way
+  * Rewording of the confirm restricted software dialog by
+    introducing the action confirm
+  * First check for the legal status and than add repository
+  * Add a helper script to workarround the missing exit states sent
+    through gksu (only for the component activation)
+  * Avoid flickering of the codec installer at startup
+  * Only write fd.o valid icon attributes to the menu data
+  * Use the KDE/GNOME icons instead of the Kubuntu/Ubuntu icons for
+    the desktop integration emblems
+  * Improve shown emblems (handle support status and freedomness separately)
+
+  [Michael Vogt]
+  * ensure proper i18n in cache menu item loader
+  * no longer depend on the exact app-install-data version
+  * fix setup.py to include the new widgets
+  * fix in the codec extraction (for caps intersection)
+  * default to show supported software (not main)
+  * partly disable debian backend for now (not quite ready)
+  * fix in enable channel code
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 21 May 2007 21:47:55 +0200
+
+gnome-app-install (0.4.0) gutsy; urgency=low
+
+  [Michael Vogt]
+  * updated for gutsy
+  * merged the gstreams caps intersection branch (LP#90737)
+  [Sebastian Heinlein]
+  * split out the data into its own "app-instll-data-ubuntu" 
+    source package 
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  3 May 2007 14:54:59 +0200
+
+gnome-app-install (0.3.31) feisty-proposed; urgency=low
+
+  * gnome-app-install:
+    - fix crash when window parent is none (LP#106026)
+  * po/POTFILES.in: 
+    - add missing gnome-app-install main (LP#106756)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  3 May 2007 11:56:15 +0200
+
+gnome-app-install (0.3.30) feisty; urgency=low
+
+  * menu-data:
+    - updated to current feisty
+  * AppInstall/Progress.py:
+    - only set transient if we have a window
+  * util/getMenuData.py:
+    - consider usr/share/icons a valid icon dir as well
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 13 Apr 2007 13:36:05 +0200
+
+gnome-app-install (0.3.29) feisty; urgency=low
+
+  * AppInstall/AppInstall.py:
+    - fix xmlescape() (LP#91875)
+    - do not crash if no dbus.service.BusName() fails (LP#92073)
+  * data/gnome-app-install-xfce.desktop:
+    - added so that g-a-i shows up in Applications/System in XFCE
+  * data/gnome-app-install.desktop:
+    - remove "System" from Categories (LP#98580)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  3 Apr 2007 14:02:30 +0200
+
+gnome-app-install (0.3.28) feisty; urgency=low
+
+  * data/gnome-app-install.desktop.in:
+    - added System category (LP#93803)
+  * menu-data/wesnoth.desktop, util/rename.cfg:
+    - install "wesnoth-all" when selecting wesnoth (LP#96301)
+  * gnome-app-install:
+    - when runing in codec-instal mode, ask first if the user
+      wants to search for codecs (#94372)
+    - warn about unsupported codecs but show them all (LP#87748)
+  * AppInstall/AppInstall.py:
+    - proper error checking for conflicting installs (LP#86684)
+  * menu-data:
+    - updated to current feisty
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 28 Mar 2007 16:13:26 +0200
+
+gnome-app-install (0.3.27) feisty; urgency=low
+
+  * menu-data/*.desktop:
+    - updated to latest feisty
+  * AppInstall/CoreMenu.py:
+    - do not use a regexp list for the mime-type, a string list
+      works fine
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 13 Mar 2007 18:13:58 +0100
+
+gnome-app-install (0.3.26) feisty; urgency=low
+
+  * menu-data-additional/gstreamer-bad-multiverse.desktop:
+    - added for better multimedia support (LP#89999)
+  * menu-data-additional/gstreamer-bad.desktop:
+    - description updated
+  * AppInstall/AppInstall.py:
+    - do not crash if no /etc/apt/sources.list if available
+      (LP#90078)
+    - fix updating pkg states when the cache is updated (LP#88246)
+    - protect against odd arguments in tooltip_on_filter (LP#87727)
+  * AppInstall/DialogNewlyInstalled.py:
+    - do not show "Click to launch" label if runing as root
+      (we do not support it there)
+  * packages-whitelist:
+    - added gstreamer010-plugins-bad-multiverse
+  * AppInstall/PackageWorker.py:
+    - deal better deal with addon CDs
+  * gnome-app-install:
+    - do not crash for invalid codec arguemnts but return error code
+      1 and display a error dialog (LP#88154)
+    - change the gnome-codec-search return codes to match:
+      http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstbaseutilsinstallplugins.html
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  7 Mar 2007 09:34:54 +0100
+
+gnome-app-install (0.3.25) feisty; urgency=low
+
+  * install a additional gnome-codec-install so that the new
+    gst can call that (LP#87748)
+  * ensure that the default view is only supported ubuntu applications
+  * do not show users menu dirs (LP#87733)
+  * menu-data/popcon updated to current feisty
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 26 Feb 2007 09:53:48 +0100
+
+gnome-app-install (0.3.24) feisty; urgency=low
+
+  * AppInstall/AppInstall.py:
+    - only run _ensureInArchive() for installs (LP#86593)
+  * data/gnome-app-install.desktop.in:
+    - added OnlyShowIn=GNOME;XFCE; (LP#78977)
+  * debian/control:
+    - only support python >= 2.4 (LP#78030)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 22 Feb 2007 16:46:08 +0100
+
+gnome-app-install (0.3.23) feisty; urgency=low
+
+  * AppInstall/AppInstall.py:
+    - make the search timeout bigger (LP#82509)
+    - fix reference to "advanced mode" (LP#70283)
+  * data/gnome-app-install.schemas.in:
+    - add "search-timeout" gconf key
+  * data/gnome-app-install.glade:
+    - disable interactive search in categories (LP#86472)
+  * menu-data-additional/*.py:
+    - added popcon data
+  * AppInstall/Menu.py:
+    - fix init for popcon_max (LP#86530)
+  * AppInstall/Cache.py:
+    - move the assert for a clean cache into clean()
+    - print broken/removed packages after clean()
+  * menu-data/ia32-sun-java6-java.desktop:
+    - fix arch-specific information
+  * util/getMenuData.py:
+    - make sure to write arch-specific information to all desktopfiles
+      from a single package (LP#81371)
+  
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 20 Feb 2007 23:19:25 +0100
+
+gnome-app-install (0.3.22) feisty; urgency=low
+
+  * report error on startup with a broken cache
+  * fix memory leak (LP#85306)
+  * speedups on package list reload and after install/remove
+  * optimized the loading for codec and mime search
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 20 Feb 2007 14:46:46 +0100
+
+gnome-app-install (0.3.21) feisty; urgency=low
+
+  * fix typo (LP#85037)
+  * added swedish manual translation (BIG thanks to Daniel Nylander)
+    (LP#85030)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 14 Feb 2007 10:41:02 +0100
+
+gnome-app-install (0.3.20) feisty; urgency=low
+
+  * menu-data/totem.desktop:
+    - fix incorrect replace information (LP#84690)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 13 Feb 2007 17:24:49 +0100
+
+gnome-app-install (0.3.19) feisty; urgency=low
+
+  * updated menu-data/popcon-data for herd4
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 13 Feb 2007 11:24:32 +0100
+
+gnome-app-install (0.3.18) feisty; urgency=low
+
+  * include full bzr changelog in package (for seb128)
+  * relalize window_main before using it as transient parent (lp: #82926)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  6 Feb 2007 18:22:47 +0100
+
+gnome-app-install (0.3.17) feisty; urgency=low
+
+  * added --addon-cd= switch to support addon CDs
+    (EdubuntuOnTwoCDs spec)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  6 Feb 2007 15:06:03 +0100
+
+gnome-app-install (0.3.16) feisty; urgency=low
+
+  * AppInstall/AppInstall.py:
+    - work with the latest python-apt
+  * menu-data/
+    - updated the popcon data
+    - fixed ardour-gtk menu-data
+  * menu-data-additional/mozilla-acroread.desktop:
+    - removed, no longer available in the archive (lp: #83085)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  6 Feb 2007 11:55:13 +0100
+
+gnome-app-install (0.3.15) feisty; urgency=low
+
+  * call software-properties-gtk when preferences is clicked
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  5 Feb 2007 12:10:29 +0100
+
+gnome-app-install (0.3.14) feisty; urgency=low
+
+  * remove 'firefox' dependency (we do not use gtkmozembed anymore)
+  * change update-manager to software-properties-gtk dependency
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  5 Feb 2007 11:12:24 +0100
+
+gnome-app-install (0.3.13) feisty; urgency=low
+
+  * added warning when a codec is installed
+  * fix unbound variable problem (lp: #82713)
+  * update-app-install:
+    - do not crash when import AppInstall.CoreMenu fails (lp: #80589)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  1 Feb 2007 11:08:39 +0100
+
+gnome-app-install (0.3.12) feisty; urgency=low
+
+  * fixed missing X-AppInstall-Codec information for 
+    gstreamer-bad.desktop (lp: #82239)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 31 Jan 2007 10:00:01 +0100
+
+gnome-app-install (0.3.11) feisty; urgency=low
+
+  * fix various UI glitches
+  * fix transient problem (lp: #82247)
+  * various bugfixes for the EasyCodecInstall activation mode
+    (thanks to seb128 for his testing/feedback)
+  * give a warning message for universe/multiverse applications
+    when they are used the first time (AlwaysEnableUniverseMultiverseSpec)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 30 Jan 2007 11:53:48 +0100
+
+gnome-app-install (0.3.10) feisty; urgency=low
+
+  * updated the app-install-data to the latest feisty for HERD-3
+  * menu-data/*.desktop
+    - show only one hplip icon (instead of four)
+    - show only a single kdevelop 
+  * AppInstall/AppInstall.py:
+    - use a logarithmic scale for the popularity
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 29 Jan 2007 15:53:58 +0100
+
+gnome-app-install (0.3.9) feisty; urgency=low
+
+  * fix setupDBus() to work with the latest python-dbus changes
+    (lp: 81727)
+  * updated the popcon-data, use the "by_vote" information for
+    the ranking instead of the "by_inst" data (lp: #82051)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 29 Jan 2007 13:33:48 +0100
+
+gnome-app-install (0.3.8) feisty; urgency=low
+
+  * update-app-install.py: do use #!/usr/bin/python 
+    (lp: #67067)
+  * whitelist gstreamer0.10-ffmpeg, gstreamer0.10-plugins-ugly
+    gstreamer0.10-plugins-bad to make EasyCodecInstallation
+    useful
+  * re-apply the last search on apply
+  * protect against package not in the cache (lp: #81364)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 25 Jan 2007 09:27:17 +0100
+
+gnome-app-install (0.3.7) feisty; urgency=low
+
+  * do not crash if the cache can't be read (lp: #79619)
+    (Thanks to Jonah)
+  * bugfixes in the codec install branch (should be working now)
+  * use /etc/gnome-app-install/package-whitelist for the mime and 
+    codec whitelist
+  * added gstreamer0.10-plugins-bad
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 22 Jan 2007 09:52:55 +0100
+
+gnome-app-install (0.3.6) feisty; urgency=low
+
+  * updated to the current python policy
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 17 Jan 2007 10:13:23 +0100
+
+gnome-app-install (0.3.5) feisty; urgency=low
+
+  [Ian Jackson]
+  * Generalise gnome-app-install mime search to also support codec search
+    according to GnomeAppInstallCodecs:
+    - New command-line invocation mode.  The support for this which
+      replaces the mime_search object which threads its way through
+      AppInstall and Menu with an richer ActivationStyle object.
+    - Set the ActivationStyle earlier during Menu creation to make the
+      whole thing a little less ugly.
+    - Read the X-AppInstall-Codecs entries from desktop files into the
+      item objects.
+    - Support ordinary searching on codecs even if not invoked for codec
+      search, just as for mime type search.
+    - Generalise update-app-install to make gai-codec-map.gdbm as well as
+      gai-mime-map.gdbm.
+    - getMenuData.py generates the X-AppInstall-Codecs entries in the
+      output desktop files, from the .supported files found in scanned
+      .debs.  These entries are included both in getMenuData.py's own
+      generated desktop files, and edited into the pre-supplied ones in
+      menu-data-additional.
+  * Support --transient-for=... option (as specified in
+    GnomeAppInstallCodecs).  Command-line parsing is shoddy,
+    unfortunately and --transient-for has to come first.
+  [Michael Vogt]
+  * menu-data/ updated to latest feisty
+  * menu-data-additional/ updated with the codec information
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 17 Jan 2007 11:58:31 +0100
+
+gnome-app-install (0.3.5) feisty; urgency=low
+
+  * menu-data-additional/:
+    - 7zip.desktop: added 7zip
+    - openclipart.desktop: added openclipart
+  * AppInstall/CoreMenu.py:
+    - fix bug in duplicats detection that prevents clamtk from showing
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  8 Jan 2007 18:09:51 +0100
+
+gnome-app-install (0.3.4) feisty; urgency=low
+
+  * show applications from System/Settings in the "Others" 
+    category to support applications like "SBackup", "Bum", 
+    "gnome-arts" (CommonCustomizations)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri,  5 Jan 2007 12:09:21 +0100
+
+gnome-app-install (0.3.3) feisty; urgency=low
+
+  * fixed FTBFS
+  * updated to latest python-policy
+  
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  3 Jan 2007 16:10:13 +0100
+
+gnome-app-install (0.3.2) feisty; urgency=low
+
+  * AppInstall/AppInstall.py, data/gnome-app-install.glade:
+    - add preferences button (CommonCustomizations)
+  * menu-data/kipnia.desktop:
+    - removed, invalid utf-8 in desktop file
+  * menu-data/cream.desktop:
+    - removed, invalid mime-type line
+  * AppInstall/Cache.py:
+    - make use of the auto-install information when removing 
+      applications (lp: #77095, #69885)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  3 Jan 2007 11:56:20 +0100
+
+gnome-app-install (0.3.1) feisty; urgency=low
+
+  * menu-data-additional/rar.desktop,
+    menu-data-additional/ace.desktop:
+    - added desktop files for ACE and RAR (CommonCustomizations)
+  * AppInstall/Menu.py:
+    - pimp ubuntu-restricted-extras search results
+  * menu-data-additional/totem-xine.desktop:
+    - added totem-xine for DVD support (CommonCustomizations)
+  * AppInstall/AppInstall.py:
+    - support new "Replaces" keyword to support apps like 
+      totem-gstream/totem-xine, abiword-gnome/abiword
+  
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 15 Dec 2006 14:27:45 +0100
+
+gnome-app-install (0.3.0) feisty; urgency=low
+
+  * menu-data-additional/ubuntu-restricted-extras.desktop:
+    - menu file for ubuntu-restricted-extras (part of CommonCustomizations)
+  * menu-data/*:
+    - updated for feisty
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 11 Dec 2006 19:33:07 +0100
+
+gnome-app-install (0.2.22) edgy-proposed; urgency=low
+
+  * menu-data-additional/mozilla-acroread.desktop:
+    - fixed the category to make it actually visible
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  7 Nov 2006 15:31:16 -0800
+
+gnome-app-install (0.2.21) edgy; urgency=low
+
+  * fixed vanished intltool-update -p
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 16 Oct 2006 17:19:38 +0200
+
+gnome-app-install (0.2.20) edgy; urgency=low
+
+  * debian/control, dependencies changed:
+    - added python-gtkhtml2, python-gconf dependency, 
+    - removed python-gnome2, python-gnome2-extras (lp: #65232)
+  * menu-data/mail-notification.desktop:
+    - removed, buggy desktop file
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 11 Oct 2006 14:05:44 +0200
+
+gnome-app-install (0.2.19) edgy; urgency=low
+
+  * menu-data updated to current edgy, fixes error in
+    Openoffice.org menu-data (lp: #64677)
+  * better support checking for installed software (lp: #64964)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  9 Oct 2006 18:16:12 +0200
+
+gnome-app-install (0.2.18) edgy; urgency=low
+
+  * typos (lp: #63487)
+  * update the menu-data files/popcon data to current edgy
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  5 Oct 2006 16:56:59 +0200
+
+gnome-app-install (0.2.17) edgy; urgency=low
+
+  * fix missing file in POTFILES.in
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  2 Oct 2006 14:57:17 +0200
+
+gnome-app-install (0.2.16) edgy; urgency=low
+
+  * data/gnome-app-install.glade:
+    - updated the text to fix "serve grammar failure" (lp: #62359)
+  * wording/typo fixes
+  * split out the gtk bits when run update-app-install (lp: #59403)
+    (thanks to Sebastian Heinlein)
+  * drop python-gtk2 pre-depends
+  
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Sat, 30 Sep 2006 00:39:30 +0200
+
+gnome-app-install (0.2.15) edgy; urgency=low
+
+  * hide python-apt future warnings
+  * update available information on refresh() 
+  * changed the "applications-proprietary" icon
+  * menu-data/*:
+    - updated to current edgy, updated popcon data as well
+  * menu-data-additional/:
+    - nvidia-driver.desktop: pseudo package for the nvidia driver
+    - nvidia-driver-legacy.desktop:pseudo package for the nvidia legacy driver
+    - fglrx-driver.desktop: pseudo package for the ati driver 
+    - mscorefonts.desktop: improved description
+    - ndisgtk.desktop: added for easy wifi setup
+    - nact.desktop: nautilus action
+    - sun-java5-plugin.desktop: sun java5 browser plugin
+    - mozilla-mplayer.desktop: added mplayer browser plugin
+    - mozilla-acroread.desktop: added acroread browser plugin
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 25 Sep 2006 18:40:52 +0200
+
+gnome-app-install (0.2.14) edgy; urgency=low
+
+  * pre-depend on python-gobject as well (lp: #61225)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 19 Sep 2006 10:28:44 +0200
+
+gnome-app-install (0.2.13) edgy; urgency=low
+
+  * debian/control:
+    - pre-depend on current python-gtk to fix upgrade problem 
+      (lp: #59403)
+  * update-app-install: 
+    - unset DISPLAY (lp: #59403)
+  * menu-data/mail-notification.desktop:
+    - fixed incorrect desktop file (lp: #59758)
+  * menu-data/mail-notification-properties.desktop:
+    - removed and blacklisted
+  * menu-data-additonal/j2re1.4-mozilla-plugin.desktop:
+    - added java-plugin desktop file (lp: #61047)
+  * AppInstall/common.py:
+    - use "applications-other" icon when icon can not be found
+      (lp: #59478)
+  * AppInstall/AppInstall.py:
+    - fix typos, better wording (lp: 59477)
+    - make sure the welcome text is no longer selected (lp: #58891)
+  * blacklist gnome-applets (lp: #59418)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 18 Sep 2006 12:42:50 +0200
+
+gnome-app-install (0.2.12) edgy; urgency=low
+
+  * fix mimetype cache creation
+  * fix schema install
+  * updated desktop files to current edgy
+  * updated popcon data
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri,  8 Sep 2006 02:58:45 +0200
+
+gnome-app-install (0.2.11) edgy; urgency=low
+
+  * fix the python-gdbm dependency again lp: #57528)
+  * moved the desktop-files/mime-types cache generation 
+    to the postinst (thanks to Sebastian Heinlein)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  4 Sep 2006 16:42:55 +0200
+
+gnome-app-install (0.2.10) edgy; urgency=low
+
+  * fix incorrect display of installation status
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 28 Aug 2006 15:32:00 +0200
+
+gnome-app-install (0.2.9) edgy; urgency=low
+
+  * fix FTBFS because of missing b-d
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 28 Aug 2006 10:01:12 +0200
+
+gnome-app-install (0.2.8) edgy; urgency=low
+
+  * debian/control: python2.4-dbus -> python-dbus
+  * cache the desktop file information to make startup faster
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 25 Aug 2006 12:27:19 +0200
+
+gnome-app-install (0.2.7) edgy; urgency=low
+
+  * SuggestedPackagesForFiletypesSpec: fix missing Depends on python-gdbm
+    (Malone 57528.)
+
+ -- Ian Jackson <iwj@ubuntu.com>  Thu, 24 Aug 2006 09:24:05 +0100
+
+gnome-app-install (0.2.6) edgy; urgency=low
+
+  * SuggestedPackagesForFiletypesSpec implementation
+    - gnome-app-install checks that no other options or arguments are given
+    - gnome-app-install mime mode: looks in gdbm db
+    - gnome-app-install mime mode: checks component and package whitelists
+    - gnome-app-install mime mode: encodes lookup failures in exit status
+    - app-install-data contains gdbm db for mime->program mapping
+  * Fix for Malone #57323 (stack backtrace when you try to apply).
+
+ -- Ian Jackson <iwj@ubuntu.com>  Wed, 23 Aug 2006 16:12:54 +0100
+
+gnome-app-install (0.2.5) edgy; urgency=low
+
+  * updated the menu-data to current edgy, fixed a icon
+    extraction bug along the way
+  * added popularity column (sortable) 
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 17 Aug 2006 10:25:46 +0200
+
+gnome-app-install (0.2.4) edgy; urgency=low
+
+  * Fix #52612: use the applications-office icon instead of the 
+    skype one for gnome-office
+  * refreshed the desktop files with a new icon extract code
+  * added "Show all supported" view 
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri,  4 Aug 2006 20:05:21 +0200
+
+gnome-app-install (0.2.3) edgy; urgency=low
+
+  * various bug/wording fixes
+  * fix aptsources.py import
+  * updated desktop+popcon data
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  2 Aug 2006 13:05:43 +0200
+
+gnome-app-install (0.2.2) edgy; urgency=low
+
+  The 'everybody should hug Sebastian Heinlein' release:
+  * use custom GtkTextView instead of GtkHtml to display the
+    formated descriptions. This fixes various accessability 
+    problems
+  * better desktop environment detection
+  * use emblems for desktop environment and support status
+  * wording/gui fixes
+  * bugfixes
+  * improve the handling of packages that are only available
+    on certain architectures
+  * refreshed the desktop files to the current edgy
+  (many thanks to Sebastian Heinlein who did a lot of the above)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 24 Jul 2006 19:37:34 +0200
+
+gnome-app-install (0.2.1) edgy; urgency=low
+
+  * fix the gnome-app-install.glade file 
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  4 Jul 2006 13:04:33 +0200
+
+gnome-app-install (0.2) edgy; urgency=low
+
+  * search is weighted now depending on where the searched item
+    was found
+  * make the display/filtering more flexible
+    (thanks to Sebastian Heinlein)
+  * search will also search in the mime information
+  * search is ranked by popcon data
+  * added missing "gksu" dependency
+  * added --mime-type=$mime-type commandline argument
+  * added popcon data (by_inst) to the menu files
+  
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 28 Jun 2006 18:50:07 +0200
+
+gnome-app-install (0.1.33) dapper-updates; urgency=low
+
+  * AppInstall/AppInstall.py:
+    - fix a bug in the addChannel() code that can lead to not
+      adding the gpg key
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  1 Jun 2006 16:44:35 +0200
+
+gnome-app-install (0.1.32) dapper; urgency=low
+
+  * AppInstall/AppInstall.py: 
+    - exit when ok is clicked but no packages where selected
+    - fix a bug that caused universe to be not enabled (ubuntu: #46723)
+      and make sure to enable updates as well
+  * menu-data/*:
+    - updated to the latest dapper
+  * menu-data-additonal/vmware-player.desktop:
+    - added
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 22 May 2006 09:33:43 +0200
+
+gnome-app-install (0.1.31) dapper; urgency=low
+
+  * AppInstall/AppInstall.py:
+    - be more robust about mistyped passwords (ubuntu: #40591)
+  * menu-data-additonal/wine.desktop: 
+    - added a valid desktop file
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 18 May 2006 23:20:50 +0200
+
+gnome-app-install (0.1.30) dapper; urgency=low
+
+  * AppInstall/AppInstall.py:
+    - fix broken "Advanced" button (Ubuntu: #45043)
+    - fix in the "add-channel" code
+  * AppInstall/DialogProprietary.py:
+    - browser window expands with the dialog window
+  * menu-data/*:
+    - updated to the current dapper version (including java5)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 17 May 2006 17:16:45 +0200
+
+gnome-app-install (0.1.29) dapper; urgency=low
+
+  * menu-data/*:
+    - updated to latest dapper archive
+  * data/gnome-app-install.glade:
+    - "show proprietary applications" -> "show commercial applications"
+      (as suggested by Malcom)
+  * AppInstall/Menu.py:
+    - "Reading desktop files" -> "Reading list of available applications"
+      (thanks to Matt for this suggestion)
+  * debian/control:
+    - depend on app-install-data-commercial (that contains the commercial
+      desktop files)
+  * AppInstall/AppInstall.py, DialogProprietary.py:
+    - removed some debug code
+    - fix a problem with 3rd party apps without channels
+  * menu-data-additonal/gstreamer-ugly.desktop:
+    - point to "gstreamer0.10-plugins-ugly" (ubuntu: #40046)
+  * use the "Education" section (to be in sync with the gnome menu 
+    again) (ubuntu: #37921)
+  * data/gnome-app-install.glade:
+    - fix not translatable button (ubuntu: #44417)
+  * help/C/gnome-app-install.xml:
+    - various fixes to the manual (ubuntu: #44331)
+      
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 15 May 2006 19:31:18 +0200
+
+gnome-app-install (0.1.28) dapper; urgency=low
+
+  * menu-data/*:
+    - updated to latest dapper archive
+  * menu-data-additional/nm-applet.desktop:
+    - fixed category, shows up in 'Internet' now
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  9 May 2006 23:47:23 +0200
+
+gnome-app-install (0.1.27) dapper; urgency=low
+
+  * catch more errors, some wording fixes (thanks to Sebastian Heinlein)
+  * AppInstall/AppInstall.py:
+    - fix bug when adding a component
+  * help/C/gnome-app-install.xml: 
+    - fix some incorrect xml (thanks to Matthew East, closes: 40061)
+  * menu-data/*:
+    - updated to latest dapper archive
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 21 Apr 2006 09:52:31 +0200
+
+gnome-app-install (0.1.26) dapper; urgency=low
+
+  * debian/control:
+    - python-dbus -> python2.4-dbus
+
+ -- Daniel Holbach <daniel.holbach@ubuntu.com>  Sat,  8 Apr 2006 01:06:02 +0200
+  
+gnome-app-install (0.1.25) dapper; urgency=low
+
+  * give better feedback when the search had no results (ubuntu: #38112)
+  * only allow a single gnome-app-install instance in a session (ubuntu: #38424)  * fix a bug in the duplication detection when it was too agressive
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri,  7 Apr 2006 22:44:16 +0200
+
+gnome-app-install (0.1.24) dapper; urgency=low
+
+  * debian/rules: fix a bug in the clean target
+  * help/C: updated documentation (thanks to the docteam!)
+  * AppInstall/AppInstall.py: added support for CTRL-q (ubuntu: #3751)
+  * menu-data/*.desktop:
+    - updated to the latest dapper
+  * improved the runtime duplication detection
+  
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  5 Apr 2006 14:37:14 +0200
+
+gnome-app-install (0.1.23) dapper; urgency=low
+
+  * menu-data/*.desktop: 
+    - updated to current dapper
+    - added libxine-extracodecs.desktop (thanks to Jonathan Riddell)
+    - fix a bug in the lyx file
+  * fix a problem with gtkhtml2 and the high-contrast theme (ubuntu #36686)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 28 Mar 2006 15:35:55 +0200
+
+gnome-app-install (0.1.22) dapper; urgency=low
+
+  * menu-data/*.desktop: 
+    - updated to current dapper, fixed a bug in the epoch handling so 
+      this build is much more complete than the previous ones (#35183)
+  * blacklisted some duplicated/bogus desktop files (#33922)
+  * make sure that a security repo is added if component is added (#34613)
+  
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 24 Mar 2006 13:15:51 +0100
+
+gnome-app-install (0.1.21) dapper; urgency=low
+
+  * menu-data/*.desktop: updated to current dapper
+  * typo fix (ubuntu: #35655)
+  * added pseudo desktop packages for flash and msttfonts
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 22 Mar 2006 18:49:09 +0100
+
+gnome-app-install (0.1.20) dapper; urgency=low
+
+  * fixes various strings (thanks to Jane Silber for the review)
+    for real this time, thanks for Sebastian Heinlein for noticing
+    and sending the patch
+  
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 14 Mar 2006 16:47:48 +0000
+
+gnome-app-install (0.1.19) dapper; urgency=low
+
+  * fixes various strings (thanks to Jane Silber for the review)
+  * make sure that {universe,multiverse}-security is also added when 
+    {universe, multiverse} are added
+  * remove the "add" button from the description, this is done via the 
+    toggle button now again
+  * make the progress a single 0-100 run (instead of multiple runs)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 13 Mar 2006 18:26:50 +0000
+
+gnome-app-install (0.1.18) dapper; urgency=low
+
+  * menu-data/gnome-office.desktop: added gnome-desktop
+  * menu-data/gstreamer-ugly.desktop: added gstreamer plugin for the "ugly"
+    codecs
+  * string cleanups
+  * disabled the skype channel because it dosn't work with current dapper
+    (dependency problems)
+  * the pulse is gone and the "normal" progress is back
+  * clicking on a toggle button of a not active channels ask if it should
+    be add
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  6 Mar 2006 12:55:30 +0000
+
+gnome-app-install (0.1.17) dapper; urgency=low
+
+  * po/fi.po: updated Finnish translation (thanks to Timo Jyrinki)
+  * fix problem with the 3rd party channel files ending up in the wrong dir
+  * ask for package list update if the cache is outdated
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 28 Feb 2006 14:41:34 +0100
+
+gnome-app-install (0.1.16) dapper; urgency=low
+
+  * AppInstall/Menu.py: use GenericName is Comment dosn't give anything 
+                        useful (kde requires this)
+  * AppInstall/AppInstall.py: don't crash if the icon-theme dosn't have
+                              gnome icons (kde again). Thanks to Sebastian
+	                      Heinlein for the diff)
+  * help/*: updated to latest svn version
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 24 Feb 2006 14:54:54 +0100
+
+gnome-app-install (0.1.15) dapper; urgency=low
+
+  * help/*: added the help from the docteam (Thanks guys!)
+  * debian/control: changed maintainer field 
+  * menu-data/*: updated to latest dapper data
+  * support desktop files with no Exec line and assume they are
+    "pseudo" files that install e.g. gsteamer plugins or servers
+  * bugfixes
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 23 Feb 2006 10:16:52 +0100
+
+gnome-app-install (0.1.14) dapper; urgency=low
+
+  * po/pt_BR.po: updated translation (thanks to 
+    Carlos Eduardo Pedroza Santiviago)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 20 Feb 2006 15:55:46 +0100
+
+gnome-app-install (0.1.13) dapper; urgency=low
+
+  * fix in the desktop file parsing code (thanks to zyga)
+  * typo fixes (thanks to Sebastian Heinlein)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 16 Feb 2006 23:10:45 +0100
+
+gnome-app-install (0.1.12) dapper; urgency=low
+
+  The 'Thanks to Sebastian Heinlein' release
+  * "All" category has a icon now
+  * "Add repository" button added to document view
+  * bugfixes
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 16 Feb 2006 20:01:31 +0100
+
+gnome-app-install (0.1.11) dapper; urgency=low
+
+  * split the desktop data out into it's own "app-install-data" package
+    that is shared between gnome-app-install and apdept-installer
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 15 Feb 2006 13:02:05 +0100
+
+gnome-app-install (0.1.10) dapper; urgency=low
+
+  * fix ok button poping up empty dialog
+  * don't die if gettext.dgettext() throws a exception (it seems to like 
+    doing this)
+  * add "All" category
+  * imporved searching 
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 13 Feb 2006 11:26:29 +0100
+
+gnome-app-install (0.1.9) dapper; urgency=low
+
+  * fix problem with adding missing components in non-root mode
+  * fix url detection
+  * fix a problem with some applications not being displayed (e.g. inkscape)
+  * fix incorrectly detected urls in the descripton
+  * don't explode on enter in search field
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 10 Feb 2006 21:38:08 +0100
+
+gnome-app-install (0.1.8) dapper; urgency=low
+
+  * fix anoying flickering in dialogs
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  8 Feb 2006 22:55:46 +0100
+
+gnome-app-install (0.1.7) dapper; urgency=low
+
+  * non-root mode added, just run synaptic as backend with gksu 
+  * make links clickable in the package description
+  * make it possible to launch a newly installed application 
+  * remember "show unsupported", "show proprietary" settings
+  * improved the description displaying
+  * bufixes
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  8 Feb 2006 21:11:06 +0100
+
+gnome-app-install (0.1.6) dapper; urgency=low
+
+  * data/gnome-app-install.desktop.in: added "..." (ubuntu: #22475)
+  * improved the UI
+  * menu-data/*.desktop: updated to current dapper
+  * improved formating of the html page
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 20 Jan 2006 10:39:07 +0100
+
+gnome-app-install (0.1.5) dapper; urgency=low
+
+  * show version information in the info page (ubuntu: #21530)
+  * workaround a pygtk crash in the TreeModelFilter (ubuntu: #21527)
+  * fix the menupath display in the dialog that shows the newly installed
+    applications (ubuntu: #21443)
+  * be more robust about (half)broken desktop files (ubuntu: #21442)
+  * support per-channel repository keys as well
+  * support displaying a license agreement
+  * give a hint about the used desktop environment in the info page 
+    (ubuntu: #21531)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 10 Jan 2006 15:26:31 +0100
+
+gnome-app-install (0.1.4) dapper; urgency=low
+
+  * show version in about dialog (ubuntu #21539)
+  * show progress for the menu building 
+  * fix a icon-display problem in the gtkhtml2 browser view
+  * bugfixes/cleanups
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 28 Dec 2005 15:32:25 +0100
+
+gnome-app-install (0.1.3) dapper; urgency=low
+
+  * various bufixes
+  * updated desktop/icon files to current dapper
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 21 Dec 2005 15:55:24 +0100
+
+gnome-app-install (0.1.2) dapper; urgency=low
+
+  * use window default icon again (ubuntu: #21252)
+  * typo fix (ubuntu: #21251)
+  * have checkboxes for proprietary and unsupported software to 
+    make filtering easy
+  * search performance increased/dynmaic filtering on unsupported
+    proprietary possible here as well now 
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 19 Dec 2005 12:08:04 +0100
+
+gnome-app-install (0.1.1) dapper; urgency=low
+
+  * added missing build-dep to python-dev
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Sat, 17 Dec 2005 12:11:00 +0100
+
+gnome-app-install (0.1) dapper; urgency=low
+
+  * new upstream release:
+    - massive code cleanups
+    - use SimpleGladeApp now
+    - split the code into useful modules
+    - use sources.list.d directory now
+    - use the mechanism from gnome-software properties to 
+      read/manipulate the sources.list
+    - make the used browser (pymozemebed/gtkhtml2/raw) plugable
+    - use gtkhtml2 as html widget until firefox is fixed
+  * use gksu in desktop file and added X-KDE-SubstituteUID=true
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 16 Dec 2005 13:57:14 +0100
+
+gnome-app-install (0+20051005) breezy; urgency=low
+
+  * menu-data:
+    - gksu.desktop: removed, title is 'open root terminal' and that
+                    was removed from the menu too
+    - datakiosk.desktop: removed double entry (only development now)
+  * debian/control:
+    - depend on firefox|mozilla-firefox
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  5 Oct 2005 11:35:29 +0200
+
+gnome-app-install (0+20051004) breezy; urgency=low
+
+  * data/gnome-app-install.desktop.in:
+    - add various desktop file translations (ubuntu #16943)
+  * menu-data/gnome-terminal.desktop:
+    - updated category to be in sync with ubuntu (ubuntu #16832)
+  * menu-data/aegis-virus-scanner.desktop:
+    - updated name (ubuntu #15703)
+  * debian/control:
+    - updated dependencies (ubuntu #16456)
+  * src/gnome-app-install.in:
+    - use explicit python path (ubuntu #16547)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  4 Oct 2005 10:17:42 +0200
+
+gnome-app-install (0+20050927) breezy; urgency=low
+
+  * fix a incorrect variable name (ubuntu: #16453)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 27 Sep 2005 17:21:05 +0200
+
+gnome-app-install (0+20050926) breezy; urgency=low
+
+  * added locking support
+  * added firefox|mozilla-browser to dependencies (for gtkmozembed) 
+    (ubuntu #16306)
+  * typo fix: 'Can not remove' -> 'Cannot remove' (ubuntu #16295)
+  * fix a bug when multiple searches are executed (ubuntu #16346)
+  * menu-data/gnome-screensaver-preferences.desktop
+              kghostview.desktop, qdvdauthor.desktop:
+    - fix components
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 26 Sep 2005 22:55:47 +0200
+
+gnome-app-install (0+20050921) breezy; urgency=low
+
+  * added to menu-data/:
+    - lbreakout2 (ubuntu #15703, thanks to Wouter Stomp)
+  * debian/control:
+    - added dependency to gnome-icon-theme (ubuntu: #15918)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 21 Sep 2005 14:34:47 +0200
+
+gnome-app-install (0+20050919) breezy; urgency=low
+
+  * desktop file changes in menu-data/:
+    - remove babytrans.desktop (uninstallable and unfixable)
+    - remove smeg-kde.desktop (duplicate of smeg) (ubuntu #15704)
+  * Fixed/added:
+    banshee.desktop, cream.desktop, d4x.desktop, evince.desktop, 
+    firestarter.desktop, gnome-art.desktop, gnome-breakout.desktop, 
+    gnome-power-preferences.desktop, kmerlin.desktop, revelation.desktop,
+    wifi-radar.desktop (ubuntu #15703)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 19 Sep 2005 17:44:41 +0200
+
+gnome-app-install (0+20050914) breezy; urgency=low
+
+  * data/gnome-app-install.glade:
+    - typo:"initalizing" -> "initializing"
+  * desktop file changes in menu-data/:
+    Changed (because X-AppInstall-Package was wrong):
+    - GnomeICU.desktop: pkg is "gnomeicu"
+    - MySqlAdministrator: pkg is "mysql-admin" (ubuntu #15304)
+    - MySqlQueryBrowser: pkg is "mysql-query-browser" (ubuntu #15304)
+    - anjuta.desktop: pkg is "anjuta"
+    - conglomerate.desktop: pkg is "conglomerate"
+    - galeon.desktop: pkg is "galeon"
+    - gedit.desktop: pkg is "gedit"
+    - startdict.desktop: pkg is "stardict"
+    Corrected section:
+    - totem, kiten, kbemusedsrv, kbluetoothd, kbtobexclient, kbtserialchat,
+      kcm_btpaired, kcm_kbluetoothd
+  * src/verifyDesktopFile.py:
+    - catch "-common" packages as well
+  
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 13 Sep 2005 10:46:49 +0200
+
+gnome-app-install (0+20050912) breezy; urgency=low
+
+  * desktop file changes in menu-data/:
+    Changed (because X-AppInstall-Package was wrong):
+    - atomix.desktop: changed pkg to "atomix" (ubuntu #15207)
+    - chinepaint.desktop: changed pkg to "chinepaint"
+    - enigma.desktop: changed pkg to "enigma"
+    - gcompris.desktop: changed pkg to "gcompris"
+    - gcompris-edit.desktop: changed pkg to "gcompris"
+    - gimp2.2.desktop: changed pkg to "gimp"
+    - glabels.desktop: changed pkg to "glabel"
+    - glade-2.desktop: changed pkg to "glade-gnome-2"
+    - gnome-terminal.desktop: changed pkg to "gnome-terminal"
+    - gnomecc.desktop: changed pkg to "gnome-control-center"
+    - eclipse.desktop: change pkg to "eclipse-platform"
+    - mplayer.desktop: changed pkg to "mplayer"
+    - kdevelop3.desktop: changed pkg to "kdevelop3"
+    - kdevdesigner.desktop: changed pkg to "kdevelop3"
+    - kdevassisant.desktop: changed pkg to "kdevelop3"
+    - kdevelop_c_cpp.desktop: changed pkg to "kdevelop3"
+    - kdevelop_kde_cpp.desktop: changed pkg to "kdevelop3"
+    - kdevelop_ruby.desktop: changed pkg to "kdevelop3"
+    - kdevelop_scripting.desktop: changed pkg to "kdevelop3"  
+    - totem.dekstop: changed pkg to "totem"
+    - xchat.desktop: changed pkg to "xchat"
+    Changed (other reasons):
+    - gnome-phone-manager.desktop: fixed icon location
+    Removed (because in gnome-control-center and no apps):
+    - default-application.desktop, display-properties.desktop
+      at-properties.desktop, font-properties.desktop,
+      gnome-about-me.desktop, gnome-font-viewer.desktop
+      gnome-network-preferences, gnome-settings-mouse.desktop
+      gnome-settings-sound.desktop, gnome-ui-properties.desktop
+      gtk-theme-selector.desktop, themus-theme-applie.desktop
+      keybindings.desktop, window-properties.desktop
+    Removed (other reasons):
+    - acroread.desktop removed, we have "AdobeReader.desktop" already
+    - kresources.desktop: part of kdelibs-data
+    - lilo.desktop: not a application
+    - ubuntu-about.desktop: part of the gnome-panel
+    - kdevelop_c_cpp.desktop, kdevelop_ruby.desktop 
+      kdevelop_kde_cpp.desktop, kdevelop_scripting.desktop: because
+      they are all provided by kdevelop3.desktop already
+  * src/AppInstall.py:
+    - detect packages that are not availabe even when the needed
+      component was added (e.g. helixplayer on amd64)
+  * src/gnome-app-install.py.in:
+    - fail if not started as root (ubuntu #15139)
+  * src/verifyDesktopFile.py:
+    - be smarter about common problems (e.g. -data packages)
+  
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 12 Sep 2005 11:38:53 +0200
+
+gnome-app-install (0+20050909) breezy; urgency=low
+
+  * Changed the title and desktop file to "Add applications"
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri,  9 Sep 2005 14:20:02 +0200
+
+gnome-app-install (0+20050908) breezy; urgency=low
+  
+  * maintain selection when changing repositories (ubuntu #14140)
+  * added python-gnome2 dependency (ubuntu #14962)
+  * small ui fixes for the progress window (half of ubuntu #14141)
+  * typo fix (ubuntu #14857)
+  * fix a incorrect eclipse menu entry (ubuntu #14858)
+  * improve the program not availabe dialog a bit (spacing, image)
+    (ubuntu #14859)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  7 Sep 2005 09:49:10 +0200
+  
+gnome-app-install (0+20050904) breezy; urgency=low
+
+  * more fixes for the menu-data desktop files:
+    - gaim.desktop: X-App-Install package is gaim (not gaim-data)
+  * data/featured.txt:
+    - added: evince, totem, gnome-games, gaim, glade-gnome-2
+    - removed: gpdf, gnome-gv, sodipodi, glade-2, gaim-data, vlc
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  5 Sep 2005 13:59:00 +0200
+
+gnome-app-install (0+20050903) breezy; urgency=low
+
+  * make OpenOffice.org2 a featured application, removed OO1
+  * fix the window title (ubuntu #14556)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  5 Sep 2005 11:37:45 +0200
+
+gnome-app-install (0+20050831) breezy; urgency=low
+
+  * fix error when enabling a repository (#14140)
+  * updated the menu data desktop files to the current archive
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 31 Aug 2005 23:53:33 +0200
+
+gnome-app-install (0+20050825) breezy; urgency=low
+
+  * set apply only sensitive when there are actually actions to perform
+  * added intro page (#13433)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 26 Aug 2005 01:17:12 +0200
+
+gnome-app-install (0+20050824) breezy; urgency=low
+
+  * improve the search (ubuntu #14022)
+  * fix some incorrect desktop data files
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 25 Aug 2005 11:09:19 +0200
+
+gnome-app-install (0+20050823) breezy; urgency=low
+
+  * minor ui improvments
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 23 Aug 2005 17:47:05 +0200
+
+gnome-app-install (0+20050822) breezy; urgency=low
+
+  * added LaunchpadIntegration support
+  * wording improvments (ubuntu #13805, #13906)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 22 Aug 2005 16:18:39 +0200
+
+gnome-app-install (0+20050816) breezy; urgency=low
+
+  * conflicts with gnome-app-install-data
+  * bugfixes:
+    - "Quit" is in the file menu now (ubuntu #13434)
+    - "Advanced" is in the File menu now (ubuntu #13432)
+    - double clicking expands categories (ubuntu #13431)
+    - check if a install operation can be done without breaking the 
+      cache or removing anything already installed) (ubuntu #10009)
+    - display correct utf-8 in the description (ubuntu #13476)
+    - pending dialog improvments (ubuntu #13505)
+    - don't show pending dialog when nothing is selected (ubuntu #13507)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 15 Aug 2005 11:13:44 +0200
+
+gnome-app-install (0+20050810) breezy; urgency=low
+
+  * mime-type search added
+  * added missing icons
+  * undid the split into pkg, pkg-data (pointless for a arch: all pkg)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 11 Aug 2005 15:32:47 +0200
+
+gnome-app-install (0+20050809) breezy; urgency=low
+
+  * make it a native package 
+  * update contains a reworked gui
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  9 Aug 2005 12:52:25 +0200
+
+gnome-app-install (0+20050404a-5) breezy; urgency=low
+
+  * fix a FTBFS (for real this time)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 26 Jul 2005 21:04:36 +0200
+
+gnome-app-install (0+20050404a-4) breezy; urgency=low
+
+  * fix a FTBFS
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 26 Jul 2005 19:45:37 +0200
+
+gnome-app-install (0+20050404a-3) breezy; urgency=low
+
+  * updated to the new pyXDG
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 16 Jun 2005 09:36:51 +0200
+
+gnome-app-install (0+20050404a-2) breezy; urgency=low
+
+  * po/POTFILES.in: Remove nonexisting file data/gnome-app-install.desktop.in.
+  * debian/rules: Automatically create a POT file.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 10 Jun 2005 12:46:51 +0000
+
+gnome-app-install (0+20050404a-1) hoary; urgency=low
+
+  * Freshen .desktop files
+
+ -- LaMont Jones <lamont@ubuntu.com>  Wed,  6 Apr 2005 00:50:49 -0600
+
+gnome-app-install (0+20050404-1) hoary; urgency=low
+
+  * New snapshot, i18n updates only (fr.po, pl.po)
+  * Re-Init the depcache after the PinFile was read (one-line change)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  4 Apr 2005 11:19:49 +0200
+
+gnome-app-install (0+20050331-1) hoary; urgency=low
+  
+  * new snapshot, i18n update only (da.po) and removed a debug statement
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 31 Mar 2005 11:53:33 +0200
+
+gnome-app-install (0+20050321-1) hoary; urgency=low
+
+  * new snapshot, minimal fixes only:
+    - #7892: duplicated entries
+    - #6858: exception after removing some program
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 21 Mar 2005 10:56:52 +0100
+
+gnome-app-install (0+20050317-1) hoary; urgency=low
+  
+  * New snapshot, i18n updates, embedd synaptic
+  * use the depcache and ignore non-installable packages (#7340) 
+  * fix when packages are not found in the cache (#7595)
+  * don't crash on unsupported locale (#7643)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 14 Mar 2005 14:52:41 +0100
+
+gnome-app-install (0+20050217-1) hoary; urgency=low
+
+  * New upstream release
+    - Depend on python-glade2 (closes: #5800)
+    - Hide the Synaptic main window (closes: #5995)
+
+ -- Ross Burton <ross@debian.org>  Thu, 17 Feb 2005 15:20:46 +0000
+
+gnome-app-install (0+20041111-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Ross Burton <ross@debian.org>  Wed, 10 Nov 2004 14:09:00 +0000
--- gnome-app-install-0.5.2.8.orig/debian/control
+++ gnome-app-install-0.5.2.8/debian/control
@@ -0,0 +1,40 @@
+Source: gnome-app-install
+Section: gnome
+Priority: optional
+Maintainer: Michael Vogt <michael.vogt@ubuntu.com>
+XSBC-Original-Maintainer: Julian Andres Klode <jak@jak-linux.org>
+Build-Depends: cdbs,
+               debhelper (>= 5.0.38),
+               gettext,
+               intltool,
+               python,
+               python-central (>= 0.5),
+               python-distutils-extra (>= 1.91),
+	       python-setuptools
+Standards-Version: 3.7.3
+XS-Python-Version: >= 2.4
+Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/gnome-app-install/main
+
+Package: gnome-app-install
+Architecture: all
+Depends: ${python:Depends},
+         ${misc:Depends},
+         app-install-data (>= 0.4.0),
+         gksu,
+         gnome-icon-theme,
+         python-apt (>= 0.7.4ubuntu4),
+         python-dbus,
+         python-gconf,
+         python-gdbm,
+         python-glade2 (>= 2.4.0),
+         python-gst0.10,
+         python-gtk2 (>= 2.10.1),
+         python-gtkhtml2,
+         python-launchpad-integration,
+         python-xdg (>= 0.8),
+         python-sexy,
+         synaptic (>= 0.57.8)
+XB-Python-Version: ${python:Versions}
+Description: GNOME Application Installer
+ A pretty application installer for GNOME. It can also search for mime
+ types or gstreamer codecs.
--- gnome-app-install-0.5.2.8.orig/debian/docs
+++ gnome-app-install-0.5.2.8/debian/docs
@@ -0,0 +1,3 @@
+NEWS
+README*
+TODO
--- gnome-app-install-0.5.2.8.orig/debian/postrm
+++ gnome-app-install-0.5.2.8/debian/postrm
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "purge" ]; then
+    # remove the cached application data
+    rm -f /var/cache/app-install/*
+fi
+
+
+#DEBHELPER#
--- gnome-app-install-0.5.2.8.orig/debian/compat
+++ gnome-app-install-0.5.2.8/debian/compat
@@ -0,0 +1 @@
+5
--- gnome-app-install-0.5.2.8.orig/debian/pycompat
+++ gnome-app-install-0.5.2.8/debian/pycompat
@@ -0,0 +1 @@
+2
--- gnome-app-install-0.5.2.8.orig/debian/manpages
+++ gnome-app-install-0.5.2.8/debian/manpages
@@ -0,0 +1 @@
+man/*.[1-9]
--- gnome-app-install-0.5.2.8.orig/debian/copyright
+++ gnome-app-install-0.5.2.8/debian/copyright
@@ -0,0 +1,55 @@
+This package was debianized by Ross Burton <ross@debian.org> on
+Wed, 10 Nov 2004 14:09:00 +0000.
+
+It was downloaded via bzr from http://people.ubuntu.com/~mvo/bzr/gnome-app-install/gai--main/
+
+Upstream Authors:
+        Ross Burton <ross@burtonini.com>
+        Niran Babalola
+        Sebasitan Heinlein <sebastian.heinlein@web.de>
+        Michael Vogt <michael.vogt@ubuntu.com>
+
+License:
+        Copyright (C) 2004-2006 Ross Burton <ross@burtonini.com>
+        Copyright (C) 2004 Sandino Flores Moreno
+        Copyright (C) 2007 Sebastian Heinlein
+        Copyright (C) 2006-2007 Canonical
+        Copyright (C) 2005 Free Software Foundation, Inc. (some translations in po/)
+        Copyright (C) 2005-2006 Timo Jyrinki (po/fi.po)
+        Copyright (C) 2005 Gnome i18n Project for Vietnamese. (po/vi.po)
+        Copyright (C) 2005 Rosetta Contributors (some translations in po/)
+        Copyright (C) 2005 Adam Weinberger and the GNOME Foundation (po/en_CA.po)
+
+        This package is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; version 2 dated June, 1991.
+
+        This package is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this package; if not, write to the
+        Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+        MA 02110-1301, USA.
+
+License for the documentation (help/*/*.{xml,po}):
+        help/C/gnome-app-install.xml:
+                Written by Jerome Gotangco  <jgotangco@ubuntu.com>
+        help/*/*.po:
+                Copyright (C) 2006 Free Software Foundation, Inc.
+
+        Permission is granted to copy, distribute and/or modify this
+        document under the terms of the GNU Free Documentation
+        License (GFDL), Version 1.1 or any later version published
+        by the Free Software Foundation with no Invariant Sections,
+        no Front-Cover Texts, and no Back-Cover Texts.
+        (See help/C/legal.xml)
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+On Debian systems, the complete text of the GNU Free Documentation
+License can be found in `/usr/share/common-licenses/GFDL'.
+
--- gnome-app-install-0.5.2.8.orig/debian/dirs
+++ gnome-app-install-0.5.2.8/debian/dirs
@@ -0,0 +1,2 @@
+var/cache/app-install
+etc/gnome-app-install
--- gnome-app-install-0.5.2.8.orig/debian/links
+++ gnome-app-install-0.5.2.8/debian/links
@@ -0,0 +1,2 @@
+usr/bin/gnome-app-install usr/bin/gnome-codec-install
+usr/share/man/man1/gnome-app-install.1.gz usr/share/man/man1/gnome-codec-install.1.gz
--- gnome-app-install-0.5.2.8.orig/debian/rules
+++ gnome-app-install-0.5.2.8/debian/rules
@@ -0,0 +1,21 @@
+#!/usr/bin/make -f
+DEB_AUTO_CLEANUP_RCS := yes
+DEB_PYTHON_SYSTEM    := pycentral
+export DH_PYCENTRAL=nomove
+
+# Include CDBS Stuff
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+clean::
+	rm -rf build
+	rm -f AppInstall/Version.py
+
+binary-install/gnome-app-install::
+	dh_scrollkeeper -p$(cdbs_curpkg) $(DEB_DH_SCROLLKEEPER_ARGS)
+	dh_gconf -p$(cdbs_curpkg) $(DEB_DH_GCONF_ARGS)
+	dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS)
+	dh_icons -p$(cdbs_curpkg)
+	# Delete empty dirs
+	find debian/$(cdbs_curpkg)/usr/share/ -type d -empty -delete
--- gnome-app-install-0.5.2.8.orig/debian/postinst
+++ gnome-app-install-0.5.2.8/debian/postinst
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+if [ "$1" = "configure" ]; then
+    # cache the application data
+    /usr/sbin/update-app-install || true
+fi
+
--- gnome-app-install-0.5.2.8.orig/debian/patches/15_fix_spelling_error.patch
+++ gnome-app-install-0.5.2.8/debian/patches/15_fix_spelling_error.patch
@@ -0,0 +1,12 @@
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/AppInstall/AppInstall.py gnome-app-install-0.5.2.8.new/AppInstall/AppInstall.py
+--- gnome-app-install-0.5.2.8/AppInstall/AppInstall.py	2008-09-15 22:15:56.000000000 +0000
++++ gnome-app-install-0.5.2.8.new/AppInstall/AppInstall.py	2008-09-15 22:16:24.000000000 +0000
+@@ -431,7 +431,7 @@
+     def error_no_indexfiles(self):
+         """ show an error message that no index files could be found
+         """
+-        header = _("The list of applications is not availabe")
++        header = _("The list of applications is not available")
+         msg = _("Click on 'Reload' to load it. To reload the "
+                 "list you need a working internet connection. ")
+         d = gtk.MessageDialog(parent=self.window_main,
--- gnome-app-install-0.5.2.8.orig/debian/patches/16_update_pos.patch
+++ gnome-app-install-0.5.2.8/debian/patches/16_update_pos.patch
@@ -0,0 +1,6443 @@
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/de.po gnome-app-install-0.5.2.8.new/po/de.po
+--- gnome-app-install-0.5.2.8/po/de.po	2008-06-10 05:39:55.000000000 -0400
++++ gnome-app-install-0.5.2.8.new/po/de.po	2008-10-29 16:56:25.000000000 -0400
+@@ -8,8 +8,8 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: gnome-app-install 0.1.9\n"
+-"Report-Msgid-Bugs-To: Sebastian Heinlein <sebi@glatzor.de>\n"
+-"POT-Creation-Date: 2008-01-04 20:30+0100\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2008-10-03 13:54-0400\n"
+ "PO-Revision-Date: 2007-10-11 21:53+0000\n"
+ "Last-Translator: Michael Schuelke <m.schuelke@gmx.net>\n"
+ "Language-Team: German <gnome-de@gnome.org>\n"
+@@ -21,7 +21,8 @@
+ 
+ #: ../data/gnome-app-install.schemas.in.h:1
+ msgid "Components that have been confirmed to install applications from"
+-msgstr ""
++msgstr "Komponenten, von denen Anwendungen installiert werden sollen"
++
+ 
+ #: ../data/gnome-app-install.schemas.in.h:2
+ msgid "If true, the main window is maximized."
+@@ -56,11 +57,13 @@
+ 
+ #: ../data/gnome-app-install.schemas.in.h:8
+ msgid "Suggest application for MIME-type: approved components"
+-msgstr ""
++msgstr "Anwendung für MIME-Typ vorschlagen: Genehmigte Komponenten"
++
+ 
+ #: ../data/gnome-app-install.schemas.in.h:9
+ msgid "Timeout for interactive search"
+-msgstr ""
++msgstr "Zeitlimit für interaktive Suche"
++
+ 
+ #: ../data/gnome-app-install.schemas.in.h:10
+ msgid ""
+@@ -183,38 +186,38 @@
+ msgid "Package Manager"
+ msgstr "Paketverwaltung"
+ 
+-#: ../AppInstall/activation.py:112
++#: ../AppInstall/activation.py:116
+ msgid "no suitable application"
+ msgstr "keine zutreffende Anwendung"
+ 
+-#: ../AppInstall/activation.py:113
++#: ../AppInstall/activation.py:117
+ msgid ""
+ "No application suitable for automatic installation is available for handling "
+ "this kind of file."
+ msgstr ""
+ "Keine Anwendung, welche Dateien dieses Typs handhaben kann, ist vorhanden."
+ 
+-#: ../AppInstall/activation.py:116
++#: ../AppInstall/activation.py:120
+ msgid "no application found"
+ msgstr "keine Anwendung gefunden"
+ 
+-#: ../AppInstall/activation.py:117
++#: ../AppInstall/activation.py:121
+ msgid "No application is known for this kind of file."
+ msgstr "Diesem Dateityp sind keine Anwendungen zugeordnet."
+ 
+-#: ../AppInstall/activation.py:131 ../AppInstall/activation.py:289
++#: ../AppInstall/activation.py:134 ../AppInstall/activation.py:296
+ msgid "Searching for appropriate applications"
+ msgstr "Nach geeigneten Anwendungen wird gesucht"
+ 
+-#: ../AppInstall/activation.py:133 ../AppInstall/activation.py:192
++#: ../AppInstall/activation.py:136 ../AppInstall/activation.py:195
+ msgid "Please wait. This might take a minute or two."
+ msgstr "Bitte warten. Dieser Vorgang kann einige Minuten dauern."
+ 
+-#: ../AppInstall/activation.py:161
++#: ../AppInstall/activation.py:164
+ msgid "Search for suitable codec?"
+ msgstr "Nach einem geeigneten Codec suchen?"
+ 
+-#: ../AppInstall/activation.py:162
++#: ../AppInstall/activation.py:165
+ msgid ""
+ "The required software to play this file is not installed. You need to "
+ "install suitable codecs to play media files. Do you want to search for a "
+@@ -228,46 +231,46 @@
+ "\n"
+ "Die Suche liefert auch Software, die nicht offiziell unterstützt wird."
+ 
+-#: ../AppInstall/activation.py:173
++#: ../AppInstall/activation.py:176
+ msgid "Invalid commandline"
+ msgstr "Ungültiger Aufruf"
+ 
+-#: ../AppInstall/activation.py:174
++#: ../AppInstall/activation.py:177
+ #, python-format
+ msgid "'%s' does not understand the commandline argument '%s'"
+ msgstr "»%s« unterstützt das Argument »%s« nicht"
+ 
+-#: ../AppInstall/activation.py:190
++#: ../AppInstall/activation.py:193
+ msgid "Searching for appropriate codecs"
+ msgstr "Nach geeigneten Codecs wird gesucht"
+ 
+-#: ../AppInstall/activation.py:195 ../AppInstall/activation.py:294
++#: ../AppInstall/activation.py:198 ../AppInstall/activation.py:301
+ msgid "_Install"
+ msgstr "_Installieren"
+ 
+-#: ../AppInstall/activation.py:196
++#: ../AppInstall/activation.py:199
+ msgid "Install multimedia codecs"
+ msgstr "Mulitmedia-Codecs installieren"
+ 
+-#: ../AppInstall/activation.py:200
++#: ../AppInstall/activation.py:203
+ msgid "Codec"
+ msgstr "Codec"
+ 
+-#: ../AppInstall/activation.py:231
++#: ../AppInstall/activation.py:234
+ msgid "additional codec installation declined"
+ msgstr "Installation weiterer Codecs wurde abgebrochen"
+ 
+-#: ../AppInstall/activation.py:235
++#: ../AppInstall/activation.py:238
+ msgid "additional codec installation failed"
+ msgstr "Installation weiterer Codecs schlug fehl"
+ 
+ #. TRANSLATORS: %s represents a file path
+-#: ../AppInstall/activation.py:256
++#: ../AppInstall/activation.py:263
+ #, python-format
+ msgid "\"%s\" cannot be opened"
+ msgstr "»%s« konnte nicht geöffnet werden"
+ 
+-#: ../AppInstall/activation.py:291
++#: ../AppInstall/activation.py:298
+ #, python-format
+ msgid ""
+ "A list of applications that can handle documents of the type '%s' will be "
+@@ -277,38 +280,38 @@
+ "erstellt."
+ 
+ #. TRANSLATORS: %s represents a file path
+-#: ../AppInstall/activation.py:297
++#: ../AppInstall/activation.py:304
+ #, python-format
+ msgid "Install applications to open \"%s\""
+ msgstr "Anwendungen zum Öffnen von »%s« installieren"
+ 
+-#: ../AppInstall/activation.py:300
++#: ../AppInstall/activation.py:307
+ msgid "Install applications"
+ msgstr "Anwendungen installieren"
+ 
+-#: ../AppInstall/activation.py:311
++#: ../AppInstall/activation.py:318
+ msgid "_Search"
+ msgstr "_Suchen"
+ 
+-#: ../AppInstall/activation.py:345
++#: ../AppInstall/activation.py:352
+ msgid "Searching for extensions"
+ msgstr "Nach Erweiterung wird gesucht"
+ 
+-#: ../AppInstall/activation.py:346
++#: ../AppInstall/activation.py:353
+ msgid "Extensions allow you to add new features to your application."
+ msgstr ""
+ "Erweiterungen erlauben Ihnen Anwendungen um weitere Leistungsmerkmale zu "
+ "ergänzen."
+ 
+-#: ../AppInstall/activation.py:348
++#: ../AppInstall/activation.py:355
+ msgid "Install/Remove Extensions"
+ msgstr "Erweiterungen installieren/entfernen"
+ 
+-#: ../AppInstall/activation.py:350
++#: ../AppInstall/activation.py:357
+ msgid "Extension"
+ msgstr "Erweiterung"
+ 
+-#: ../AppInstall/AppInstall.py:174
++#: ../AppInstall/AppInstall.py:173
+ msgid ""
+ "To install an application check the box next to the application. Uncheck the "
+ "box to remove the application."
+@@ -316,49 +319,52 @@
+ "Um eine Anwendung zu installieren, aktivieren Sie das Kästchen neben der "
+ "Anwendung. Deaktivieren Sie das Kästchen, um die Anwendung zu entfernen."
+ 
+-#: ../AppInstall/AppInstall.py:177
+-msgid "To perform advanced tasks use the Synaptic package manager."
+-msgstr ""
+-"Um komplexere Aufgaben durchzuführen, verwenden Sie die Synaptic-"
+-"Paketverwaltung."
+-
+-#: ../AppInstall/AppInstall.py:179
++#: ../AppInstall/AppInstall.py:176
+ msgid "Quick Introduction"
+ msgstr "Kurze Einführung"
+ 
+-#: ../AppInstall/AppInstall.py:225
+-#, fuzzy
+-msgid "Installed applications only"
+-msgstr "Installierte Anwendungen"
++#. Just two filters needed, one to show all apps and one to show only installed apps
++#: ../AppInstall/AppInstall.py:200 ../AppInstall/distros/Debian.py:15
++#: ../AppInstall/distros/Default.py:13 ../AppInstall/distros/Ubuntu.py:15
++msgid "All available applications"
++msgstr "Alle verfügbaren Anwendungen"
++
++#: ../AppInstall/AppInstall.py:201
+ 
+-#: ../AppInstall/AppInstall.py:226
++msgid "Show all applications that are available for your computer"
++msgstr "Alle auf dem Rechner verfügbaren Anwendungen anzeigen"
++#: ../AppInstall/AppInstall.py:206
++
++msgid "Installed applications only"
++msgstr "Nur installierte Anwendungen"
++#: ../AppInstall/AppInstall.py:207
+ msgid "Show only applications that are installed on your computer"
+ msgstr "Nur die bereits auf Ihrem Rechner installierten Anwendungen anzeigen"
+ 
+-#: ../AppInstall/AppInstall.py:318
++#: ../AppInstall/AppInstall.py:299
+ msgid "Error reading the addon CD"
+ msgstr "Fehler beim Lesen der Erweiterungs-CD"
+ 
+-#: ../AppInstall/AppInstall.py:319
++#: ../AppInstall/AppInstall.py:300
+ msgid "The addon CD may be corrupt "
+ msgstr "Die Erweiterungs-CD ist wahrscheinlich fehlerhaft "
+ 
+-#: ../AppInstall/AppInstall.py:453
+-msgid "The list of applications is not availabe"
+-msgstr "Die Liste mit Anwendungen ist nicht verfügbar"
++#: ../AppInstall/AppInstall.py:434
+ 
+-#: ../AppInstall/AppInstall.py:454
++msgid "The list of applications is not available"
++msgstr "Die Liste mit Anwendungen ist nicht verfügbar"
++#: ../AppInstall/AppInstall.py:435
+ msgid ""
+ "Click on 'Reload' to load it. To reload the list you need a working internet "
+ "connection. "
+ msgstr ""
+ 
+-#: ../AppInstall/AppInstall.py:473
++#: ../AppInstall/AppInstall.py:454
+ #, python-format
+ msgid "%s cannot be installed on your computer type (%s)"
+ msgstr "%s kann auf Ihrem Rechnertyp nicht installiert werden (%s)"
+ 
+-#: ../AppInstall/AppInstall.py:476
++#: ../AppInstall/AppInstall.py:457
+ msgid ""
+ "Either the application requires special hardware features or the vendor "
+ "decided to not support your computer type."
+@@ -366,12 +372,12 @@
+ "Die Anwendung erfordert entweder spezielle Geräte oder Ihr Rechnertyp wird "
+ "vom Anbieter nicht unterstützt."
+ 
+-#: ../AppInstall/AppInstall.py:517
++#: ../AppInstall/AppInstall.py:498
+ #, python-format
+ msgid "Cannot install '%s'"
+ msgstr "»%s« kann nicht installiert werden"
+ 
+-#: ../AppInstall/AppInstall.py:518
++#: ../AppInstall/AppInstall.py:499
+ #, python-format
+ msgid ""
+ "This application conflicts with other installed software. To install '%s' "
+@@ -383,12 +389,12 @@
+ "werden. Um %s dennoch zu installieren muss diese zuvor entfernt werden. "
+ "Wechseln Sie in die Synpatic-Paketverwaltung, um diesen Konflikt aufzulösen."
+ 
+-#: ../AppInstall/AppInstall.py:579
++#: ../AppInstall/AppInstall.py:560
+ #, python-format
+ msgid "Cannot remove '%s'"
+ msgstr "»%s« kann nicht entfernt werden"
+ 
+-#: ../AppInstall/AppInstall.py:580
++#: ../AppInstall/AppInstall.py:561
+ #, python-format
+ msgid ""
+ "One or more applications depend on %s. To remove %s and the dependent "
+@@ -397,37 +403,36 @@
+ "Eine oder mehrere Anwendungen hängen von %s ab. Um %s samt der abhängigen "
+ "Anwendungen zu entfernen, verwenden Sie die Synaptic-Paketverwaltung."
+ 
+-#: ../AppInstall/AppInstall.py:669
++#: ../AppInstall/AppInstall.py:650
+ msgid "Confirm installation of restricted software"
+ msgstr "Installation von eingeschränkter Software bestätigen"
+ 
+-#: ../AppInstall/AppInstall.py:670
++#: ../AppInstall/AppInstall.py:651
++
+ msgid ""
+ "The use of this software may be restricted in some countries. You must "
+ "verify that one of the following is true:\n"
+ "\n"
+-"• These restrictions do not apply in your country of legal residence\n"
+-"• You have permission to use this software (for  example, a patent license)\n"
+-"• You are using this software for research purposes only"
+-msgstr ""
+-"Die Verwendung dieser Software kann in mehreren Ländern eingeschränkt sein. "
+-"Überprüfen Sie daher, ob einer der folgenden Punkte für Sie zutrifft, bevor "
+-"Sie fortfahren:\n"
+-"• Die Einschränkungen gelten nicht für Ihr Land oder Ihren Aufenthaltsort\n"
+-"• Sie verfügen über eine spezielle Erlaubnis die Software zu Verwenden (z.B. "
+-"eine Patentlizenz)\n"
+-"• Sie verwenden die Software nur zu wissenschaftlichen Forschungszwecken"
+-
+-#: ../AppInstall/AppInstall.py:680
++"* These restrictions do not apply in your country of legal residence\n"
++"* You have permission to use this software (for  example, a patent license)\n"
++"* You are using this software for research purposes only"
++msgstr ""
++"Die Verwendung dieser Software kann in manchen Ländern eingeschränkt sein. Überprüfen Sie "
++"daher, ob einer der folgenden Punkte zutrifft:\n"
++"\n"
++"* Die Einschränkungen gelten nicht für Ihr Land oder Ihren Aufenthaltsort\n"
++"* Sie verfügen über eine spezielle Erlaubnis, die Software zu verwenden (z.B. eine Patentlizenz)\n"
++"* Sie verwenden die Software nur zu Forschungszwecken"
++#: ../AppInstall/AppInstall.py:661
+ msgid "_Confirm"
+ msgstr "_Bestätigen"
+ 
+-#: ../AppInstall/AppInstall.py:719 ../AppInstall/DialogProprietary.py:23
++#: ../AppInstall/AppInstall.py:700 ../AppInstall/DialogProprietary.py:23
+ #, python-format
+ msgid "Enable the installation of software from %s?"
+ msgstr "Software von »%s« installieren?"
+ 
+-#: ../AppInstall/AppInstall.py:721
++#: ../AppInstall/AppInstall.py:702
+ #, python-format
+ msgid ""
+ "%s is provided by a third party vendor. The third party vendor is "
+@@ -436,20 +441,20 @@
+ "%s wird von einem Drittanbieter bereitgestellt. Der Drittanbieter ist für "
+ "die Unterstützung und für Sicherheitsaktualisierungen verantwortlich."
+ 
+-#: ../AppInstall/AppInstall.py:725 ../AppInstall/DialogProprietary.py:26
++#: ../AppInstall/AppInstall.py:706 ../AppInstall/DialogProprietary.py:26
+ msgid "You need a working internet connection to continue."
+ msgstr "Sie benötigen eine bestehende Internet-Verbindung, um fortzufahren."
+ 
+-#: ../AppInstall/AppInstall.py:729 ../AppInstall/DialogProprietary.py:34
++#: ../AppInstall/AppInstall.py:710 ../AppInstall/DialogProprietary.py:34
+ msgid "_Enable"
+ msgstr "_Fortfahren"
+ 
+ #. show an error dialog if something went wrong with the cache
+-#: ../AppInstall/AppInstall.py:953
++#: ../AppInstall/AppInstall.py:934
+ msgid "Failed to check for installed and available applications"
+ msgstr "Verfügbare und installierte Anwendungen konnten nicht ermittelt werden"
+ 
+-#: ../AppInstall/AppInstall.py:954
++#: ../AppInstall/AppInstall.py:935
+ msgid ""
+ "This is a major failure of your software management system. Please check for "
+ "broken packages with synaptic, check the file permissions and correctness of "
+@@ -463,26 +468,26 @@
+ "notwendigen Informationen mit 'sudo apt-get update' und 'sudo apt-get "
+ "install -f' neu."
+ 
+-#: ../AppInstall/AppInstall.py:1005
++#: ../AppInstall/AppInstall.py:986
+ msgid "Apply changes to installed applications before closing?"
+ msgstr "Änderungen vor dem Schließen anwenden?"
+ 
+-#: ../AppInstall/AppInstall.py:1006
++#: ../AppInstall/AppInstall.py:987
+ msgid "If you do not apply your changes they will be lost permanently."
+ msgstr ""
+ "Ihre Änderungen gehen unwiderruflich verloren, wenn Sie sie nicht anwenden."
+ 
+-#: ../AppInstall/AppInstall.py:1010
++#: ../AppInstall/AppInstall.py:991
+ msgid "_Close Without Applying"
+ msgstr "_Schließen ohne Änderungen anzuwenden"
+ 
+ #. FIXME: move this inside the dialog class, we show a different
+ #. text for a quit dialog and a approve dialog
+-#: ../AppInstall/AppInstall.py:1071
++#: ../AppInstall/AppInstall.py:1053
+ msgid "Apply the following changes?"
+ msgstr "Die folgenden Änderungen anwenden?"
+ 
+-#: ../AppInstall/AppInstall.py:1072
++#: ../AppInstall/AppInstall.py:1054
+ msgid ""
+ "Please take a final look through the list of applications that will be "
+ "installed or removed."
+@@ -490,137 +495,155 @@
+ "Bitte überprüfen Sie noch einmal die Liste der Anwendungen, die installiert "
+ "oder entfernt werden sollen."
+ 
+-#: ../AppInstall/AppInstall.py:1281
++#: ../AppInstall/AppInstall.py:1263
+ msgid "There is no matching application available."
+ msgstr "Die gesuchte Anwendung wurde nicht gefunden."
+ 
+ #. TRANSLATORS: %s represents a filter name
+-#: ../AppInstall/AppInstall.py:1291
++#: ../AppInstall/AppInstall.py:1273
+ #, python-format
+ msgid "To broaden your search, choose \"%s\"."
+-msgstr ""
++msgstr "Um Ihre Suche auszudehnen, wählen Sie \"%s\"."
++
+ 
+ #. TRANSLATORS: %s represents a filter name
+-#: ../AppInstall/AppInstall.py:1295
++#: ../AppInstall/AppInstall.py:1277
+ #, python-format
+ msgid "To broaden your search, choose \"%s\" or \"%s\"."
+-msgstr ""
++msgstr "Um Ihre Suche auszudehnen, wählen Sie \"%s\" oder \"%s\"."
++
+ 
+ #. TRANSLATORS: Show refers to the Show: combobox
+-#: ../AppInstall/AppInstall.py:1301
++#: ../AppInstall/AppInstall.py:1283
+ msgid "To broaden your search, choose a different \"Show\" item."
+-msgstr ""
++msgstr "Um Ihre Suche auszudehnen, wählen Sie ein anderes Element für \"Anzeigen\"."
++
+ 
+ #. TRANSLATORS: All refers to the All category in the left list
+-#: ../AppInstall/AppInstall.py:1307
++#: ../AppInstall/AppInstall.py:1289
+ msgid "To broaden your search, choose 'All' categories."
+ msgstr "Um Ihre Suche auszudehnen, wählen sie die Kategorie Alle."
+ 
+ #: ../AppInstall/BrowserView.py:96
+ #, python-format
+ msgid "Failed to open '%s'"
+-msgstr ""
++msgstr "'%s' konnte nicht geöffnet werden."
++
+ 
+-#: ../AppInstall/CoreMenu.py:127
++#: ../AppInstall/CoreMenu.py:128
+ msgid "Applications"
+ msgstr "Anwendungen"
+ 
+-#: ../AppInstall/DialogComplete.py:128
++#: ../AppInstall/DialogComplete.py:131
+ msgid "Software installation failed"
+-msgstr ""
++msgstr "Software-Installation fehlgeschlagen"
++
+ 
+-#: ../AppInstall/DialogComplete.py:129
++#: ../AppInstall/DialogComplete.py:132
+ msgid ""
+ "There has been a problem during the installation of the following pieces of "
+ "software."
+ msgstr ""
+ 
+-#: ../AppInstall/DialogComplete.py:131 ../AppInstall/DialogComplete.py:146
+-#: ../AppInstall/DialogComplete.py:162 ../AppInstall/DialogComplete.py:190
++#: ../AppInstall/DialogComplete.py:134 ../AppInstall/DialogComplete.py:149
++#: ../AppInstall/DialogComplete.py:165 ../AppInstall/DialogComplete.py:193
+ msgid "Add/Remove More Software"
+-msgstr ""
++msgstr "Weitere Software hinzufügen/entfernen"
+ 
+-#: ../AppInstall/DialogComplete.py:133
++
++#: ../AppInstall/DialogComplete.py:136
+ msgid "Application installation failed"
+-msgstr ""
++msgstr "Anwendungsinstallation fehlgeschlagen"
++
+ 
+-#: ../AppInstall/DialogComplete.py:134
++#: ../AppInstall/DialogComplete.py:137
+ msgid ""
+ "There has been a problem during the installation of the following "
+ "applications."
+ msgstr ""
+ 
+-#: ../AppInstall/DialogComplete.py:143
++#: ../AppInstall/DialogComplete.py:146
+ msgid "Software could not be removed"
+-msgstr ""
++msgstr "Die Software konnte nicht entfernt werden."
++
+ 
+-#: ../AppInstall/DialogComplete.py:144
++#: ../AppInstall/DialogComplete.py:147
+ msgid ""
+ "There has been a problem during the removal of the following pieces of "
+ "software."
+ msgstr ""
+ 
+-#: ../AppInstall/DialogComplete.py:148
++#: ../AppInstall/DialogComplete.py:151
+ msgid "Not all applications could be removed"
+-msgstr ""
++msgstr "Es konnten nicht alle Anwendungen entfernt werden."
++
+ 
+-#: ../AppInstall/DialogComplete.py:149
++#: ../AppInstall/DialogComplete.py:152
+ msgid ""
+ "There has been a problem during the removal of the following applications."
+ msgstr ""
+ 
+-#: ../AppInstall/DialogComplete.py:159
++#: ../AppInstall/DialogComplete.py:162
+ msgid "Installation and removal of software failed"
+-msgstr ""
++msgstr "Installieren und Entfernen der Software fehlgeschlagen"
++
+ 
+-#: ../AppInstall/DialogComplete.py:160
++#: ../AppInstall/DialogComplete.py:163
+ msgid ""
+ "There has been a problem during the installation or removal of the following "
+ "pieces of software."
+ msgstr ""
+ 
+-#: ../AppInstall/DialogComplete.py:164
++#: ../AppInstall/DialogComplete.py:167
+ msgid "Installation and removal of applications failed"
+-msgstr ""
++msgstr "Installieren und Entfernen der Anwendungen fehlgeschlagen"
+ 
+-#: ../AppInstall/DialogComplete.py:165
++
++#: ../AppInstall/DialogComplete.py:168
+ msgid ""
+ "There has been a problem during the installation or removal of the following "
+ "applications."
+ msgstr ""
+ 
+-#: ../AppInstall/DialogComplete.py:173
++#: ../AppInstall/DialogComplete.py:176
+ msgid "New application has been installed"
+-msgstr ""
++msgstr "Eine neue Anwendung wurde installiert"
++
+ 
+-#: ../AppInstall/DialogComplete.py:174
++#: ../AppInstall/DialogComplete.py:177
+ msgid "New applications have been installed"
+-msgstr ""
++msgstr "Neue Anwendungen wurden installiert"
++
+ 
+-#: ../AppInstall/DialogComplete.py:179
++#: ../AppInstall/DialogComplete.py:182
+ msgid ""
+ "To start a newly installed application, choose it from the applications menu."
+ msgstr ""
+ 
+-#: ../AppInstall/DialogComplete.py:182
++#: ../AppInstall/DialogComplete.py:185
+ msgid "To start a newly installed application double click on it."
+-msgstr ""
++msgstr "Doppelklicken Sie auf eine neu installierte Anwendung, um sie zu starten."
+ 
+-#: ../AppInstall/DialogComplete.py:186
++
++#: ../AppInstall/DialogComplete.py:189
+ msgid "Software has been installed successfully"
+-msgstr ""
++msgstr "Software wurde erfolgreich installiert"
+ 
+-#: ../AppInstall/DialogComplete.py:187
++
++#: ../AppInstall/DialogComplete.py:190
+ msgid "Do you want to install or remove further software?"
+-msgstr ""
++msgstr "Möchten Sie weitere Software installieren oder entfernen?"
++
+ 
+-#: ../AppInstall/DialogComplete.py:192
++#: ../AppInstall/DialogComplete.py:195
+ msgid "Applications have been removed successfully"
+-msgstr ""
++msgstr "Anwendungen wurden erfolgreich entfernt"
++
+ 
+-#: ../AppInstall/DialogComplete.py:193
++#: ../AppInstall/DialogComplete.py:196
+ msgid "Do you want to install or remove further applications?"
+-msgstr ""
++msgstr "Möchten Sie weitere Anwendungen installieren oder entfernen?"
++
+ 
+ #: ../AppInstall/DialogMultipleApps.py:33
+ #, python-format
+@@ -673,32 +696,27 @@
+ msgid "Accept the license terms and install the software"
+ msgstr "Die Lizenzbedingungen akzeptieren und die Software installieren"
+ 
+-#: ../AppInstall/Menu.py:100
++#: ../AppInstall/Menu.py:98
+ msgid "Loading cache..."
+ msgstr "Zwischenspeicher wird geladen ..."
+ 
+-#: ../AppInstall/Menu.py:109
++#: ../AppInstall/Menu.py:107
+ msgid "Collecting application data..."
+ msgstr "Anwendungsdaten werden gesammelt ..."
+ 
+-#: ../AppInstall/Menu.py:311
++#: ../AppInstall/Menu.py:309
+ msgid "Loading applications..."
+ msgstr "Anwendungen werden geladen ..."
+ 
+-#: ../AppInstall/Menu.py:315 ../AppInstall/Menu.py:318
++#: ../AppInstall/Menu.py:313 ../AppInstall/Menu.py:316
+ msgid "All"
+ msgstr "Alle"
+ 
+-#: ../AppInstall/Menu.py:327
++#: ../AppInstall/Menu.py:325
+ #, python-format
+ msgid "Loading %s..."
+ msgstr "%s wird geladen ..."
+ 
+-#: ../AppInstall/distros/Debian.py:15 ../AppInstall/distros/Default.py:13
+-#: ../AppInstall/distros/Ubuntu.py:15
+-msgid "All available applications"
+-msgstr "Alle verfügbaren Anwendungen"
+-
+ #: ../AppInstall/distros/Debian.py:16
+ msgid ""
+ "Show all applications including ones which are possibly restricted by law or "
+@@ -730,7 +748,8 @@
+ #: ../AppInstall/distros/Debian.py:37
+ #, python-format
+ msgid "Enable the installation of software from the %s component of Debian?"
+-msgstr ""
++msgstr "Software der Debian-Komponente %s installieren?"
++
+ 
+ #. %s is the name of the component
+ #: ../AppInstall/distros/Debian.py:40 ../AppInstall/distros/Default.py:27
+@@ -742,7 +761,8 @@
+ 
+ #: ../AppInstall/distros/Debian.py:42
+ msgid "Enable the installaion of officially supported Debian software?"
+-msgstr ""
++msgstr "Offiziell unterstützte Debian-Software installieren?"
++
+ 
+ #. %s is the name of the application
+ #: ../AppInstall/distros/Debian.py:45
+@@ -754,7 +774,8 @@
+ 
+ #: ../AppInstall/distros/Debian.py:48
+ msgid "Enable the installation of partial free software?"
+-msgstr ""
++msgstr "Teilweise kostenlose Software installieren?"
++
+ 
+ #. %s is the name of the application
+ #: ../AppInstall/distros/Debian.py:50
+@@ -767,11 +788,12 @@
+ 
+ #: ../AppInstall/distros/Debian.py:54
+ msgid "Enable the installation of non-free software?"
+-msgstr ""
++msgstr "Gebührenpflichtige Software installieren?"
++
+ 
+ #. %s is the name of the application
+ #: ../AppInstall/distros/Debian.py:56 ../AppInstall/distros/Ubuntu.py:63
+-#: ../AppInstall/distros/Ubuntu.py:114
++#: ../AppInstall/distros/Ubuntu.py:119
+ #, python-format
+ msgid ""
+ "The use, modification and distribution of %s is restricted by copyright or "
+@@ -784,13 +806,15 @@
+ #: ../AppInstall/distros/Debian.py:65
+ #, python-format
+ msgid "%s integrates well into the KDE desktop"
+-msgstr ""
++msgstr "%s fügt sich gut in den KDE-Desktop ein"
++
+ 
+ #. %s is the name of an application
+ #: ../AppInstall/distros/Debian.py:70
+ #, python-format
+ msgid "%s integrates well into the GNOME desktop"
+-msgstr ""
++msgstr "%s fügt sich gut in den GNOME-Desktop ein"
++
+ 
+ #. %s is the name of an application
+ #: ../AppInstall/distros/Debian.py:75
+@@ -802,12 +826,14 @@
+ #: ../AppInstall/distros/Debian.py:80
+ #, python-format
+ msgid "%s integrates well into the XFCE desktop"
+-msgstr ""
++msgstr "%s fügt sich gut in den XFCE-Desktop ein"
++
+ 
+ #: ../AppInstall/distros/Debian.py:103
+ #, python-format
+ msgid "Debian provides support and security updates for %s"
+-msgstr ""
++msgstr "Debian bietet Unterstützung und Sicherheitsaktualisierungen für %s an"
++
+ 
+ #: ../AppInstall/distros/Debian.py:108
+ #, python-format
+@@ -834,7 +860,8 @@
+ #: ../AppInstall/distros/Default.py:25 ../AppInstall/distros/Ubuntu.py:43
+ #, python-format
+ msgid "Enable the installation of software from the %s component of Ubuntu?"
+-msgstr ""
++msgstr "Software der Ubuntu-Komponente %s installieren?"
++
+ 
+ #: ../AppInstall/distros/Ubuntu.py:16
+ msgid ""
+@@ -857,7 +884,8 @@
+ 
+ #: ../AppInstall/distros/Ubuntu.py:27
+ msgid "Supported applications"
+-msgstr ""
++msgstr "Unterstützte Anwendungen"
++
+ 
+ #: ../AppInstall/distros/Ubuntu.py:28
+ msgid ""
+@@ -875,7 +903,8 @@
+ 
+ #: ../AppInstall/distros/Ubuntu.py:48
+ msgid "Enable the installaion of officially supported Ubuntu software?"
+-msgstr ""
++msgstr "Offiziell unterstützte Ubuntu-Software installieren?"
++
+ 
+ #. %s is the name of the application
+ #: ../AppInstall/distros/Ubuntu.py:51
+@@ -887,7 +916,8 @@
+ 
+ #: ../AppInstall/distros/Ubuntu.py:54
+ msgid "Enable the installation of community maintained software?"
+-msgstr ""
++msgstr "Von der Gemeinde betreute Software installieren?"
++
+ 
+ #. %s is the name of the application
+ #: ../AppInstall/distros/Ubuntu.py:57
+@@ -899,16 +929,23 @@
+ 
+ #: ../AppInstall/distros/Ubuntu.py:60
+ msgid "Enable the installation of unsupported and restricted software?"
+-msgstr ""
++msgstr "Nicht unterstützte und eingeschränkte Software installieren?"
++
+ 
+ #: ../AppInstall/distros/Ubuntu.py:96
++
++msgid ""
++"%s is provided by a third party vendor from the Canonical partner repository."
++msgstr ""
++"%s wird von einem Drittanbieter bereitgestellt."
++#: ../AppInstall/distros/Ubuntu.py:101
+ #, python-format
+ msgid "Canonical Ltd. provides technical support and security updates for %s"
+ msgstr ""
+ "Canonical Ltd. bietet Unterstützung in technischen Fragen und "
+ "Sicherheitsaktualisierungen für %s an"
+ 
+-#: ../AppInstall/distros/Ubuntu.py:109
++#: ../AppInstall/distros/Ubuntu.py:114
+ msgid "This application is provided by the Ubuntu community."
+ msgstr "Die Anwendung wird von der Ubuntu-Gemeinde zur Verfügung gestellt."
+ 
+@@ -916,13 +953,13 @@
+ msgid "Description"
+ msgstr "Beschreibung"
+ 
+-#: ../AppInstall/widgets/AppDescView.py:75
++#: ../AppInstall/widgets/AppDescView.py:87
+ #, python-format
+ msgid "%s cannot be installed"
+ msgstr "%s kann nicht installiert werden"
+ 
+ #. warn that this app is not available on this plattform
+-#: ../AppInstall/widgets/AppDescView.py:84
++#: ../AppInstall/widgets/AppDescView.py:96
+ #, python-format
+ msgid ""
+ "%s cannot be installed on your computer type (%s). Either the application "
+@@ -933,11 +970,18 @@
+ "erfordert entweder spezielle Hardware oder Ihr Rechner-Typ wird vom Anbieter "
+ "nicht unterstützt."
+ 
+-#: ../AppInstall/widgets/AppDescView.py:96
++#: ../AppInstall/widgets/AppDescView.py:108
+ msgid "This application is bundled with the following applications: "
+ msgstr "Diese Anwendung hat folgende abhängigkeiten zu anderen Anwendungen: "
+ 
+-#: ../AppInstall/widgets/AppDescView.py:196
++#: ../AppInstall/widgets/AppDescView.py:208
++#, python-format
++msgid ""
++"\n"
++"Homepage: %s\n"
++msgstr ""
++
++#: ../AppInstall/widgets/AppDescView.py:210
+ #, python-format
+ msgid "Version: %s (%s)"
+ msgstr "Version: %s (%s)"
+@@ -951,6 +995,11 @@
+ msgid "Application"
+ msgstr "Anwendung"
+ 
++#~ msgid "To perform advanced tasks use the Synaptic package manager."
++#~ msgstr ""
++#~ "Um komplexere Aufgaben durchzuführen, verwenden Sie die Synaptic-"
++#~ "Paketverwaltung."
++
+ #~ msgid "%s integrates well into the Kubuntu desktop"
+ #~ msgstr "%s fügt sich gut in den Kubuntu-Desktop ein"
+ 
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/es.po gnome-app-install-0.5.2.8.new/po/es.po
+--- gnome-app-install-0.5.2.8/po/es.po	2008-06-10 05:39:55.000000000 -0400
++++ gnome-app-install-0.5.2.8.new/po/es.po	2008-10-29 16:56:25.000000000 -0400
+@@ -7,8 +7,8 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: es\n"
+-"Report-Msgid-Bugs-To: Sebastian Heinlein <sebi@glatzor.de>\n"
+-"POT-Creation-Date: 2008-01-04 20:30+0100\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2008-10-03 13:54-0400\n"
+ "PO-Revision-Date: 2007-10-15 22:49+0000\n"
+ "Last-Translator: Jorge Bernal <koke@sindominio.net>\n"
+ "Language-Team: Spanish <traductores@gnome.org>\n"
+@@ -186,11 +186,11 @@
+ msgid "Package Manager"
+ msgstr "Gestor de paquetes"
+ 
+-#: ../AppInstall/activation.py:112
++#: ../AppInstall/activation.py:116
+ msgid "no suitable application"
+ msgstr "aplicación no apropiada"
+ 
+-#: ../AppInstall/activation.py:113
++#: ../AppInstall/activation.py:117
+ msgid ""
+ "No application suitable for automatic installation is available for handling "
+ "this kind of file."
+@@ -198,27 +198,27 @@
+ "No existe ninguna aplicación apropiada para una instalación automática que "
+ "sea válida para este tipo de archivo."
+ 
+-#: ../AppInstall/activation.py:116
++#: ../AppInstall/activation.py:120
+ msgid "no application found"
+ msgstr "ninguna aplicación encontrada"
+ 
+-#: ../AppInstall/activation.py:117
++#: ../AppInstall/activation.py:121
+ msgid "No application is known for this kind of file."
+ msgstr "No se conoce aplicación para este tipo de archivo."
+ 
+-#: ../AppInstall/activation.py:131 ../AppInstall/activation.py:289
++#: ../AppInstall/activation.py:134 ../AppInstall/activation.py:296
+ msgid "Searching for appropriate applications"
+ msgstr "Buscar aplicaciones apropiadas"
+ 
+-#: ../AppInstall/activation.py:133 ../AppInstall/activation.py:192
++#: ../AppInstall/activation.py:136 ../AppInstall/activation.py:195
+ msgid "Please wait. This might take a minute or two."
+ msgstr "Por favor, espere. Esto puede tardar uno o dos minutos."
+ 
+-#: ../AppInstall/activation.py:161
++#: ../AppInstall/activation.py:164
+ msgid "Search for suitable codec?"
+ msgstr "¿Buscar un códec apropiado?"
+ 
+-#: ../AppInstall/activation.py:162
++#: ../AppInstall/activation.py:165
+ msgid ""
+ "The required software to play this file is not installed. You need to "
+ "install suitable codecs to play media files. Do you want to search for a "
+@@ -232,46 +232,46 @@
+ "\n"
+ "Esta búsqueda incluirá también software no soportado oficialmente."
+ 
+-#: ../AppInstall/activation.py:173
++#: ../AppInstall/activation.py:176
+ msgid "Invalid commandline"
+ msgstr "Línea de comando no válida"
+ 
+-#: ../AppInstall/activation.py:174
++#: ../AppInstall/activation.py:177
+ #, python-format
+ msgid "'%s' does not understand the commandline argument '%s'"
+ msgstr "«%s» no entiende el parámetro de la línea de comando «%s»"
+ 
+-#: ../AppInstall/activation.py:190
++#: ../AppInstall/activation.py:193
+ msgid "Searching for appropriate codecs"
+ msgstr "Buscando los códecs apropiados"
+ 
+-#: ../AppInstall/activation.py:195 ../AppInstall/activation.py:294
++#: ../AppInstall/activation.py:198 ../AppInstall/activation.py:301
+ msgid "_Install"
+ msgstr "_Instalar"
+ 
+-#: ../AppInstall/activation.py:196
++#: ../AppInstall/activation.py:199
+ msgid "Install multimedia codecs"
+ msgstr "Instalar códecs multimedia"
+ 
+-#: ../AppInstall/activation.py:200
++#: ../AppInstall/activation.py:203
+ msgid "Codec"
+ msgstr "Códec"
+ 
+-#: ../AppInstall/activation.py:231
++#: ../AppInstall/activation.py:234
+ msgid "additional codec installation declined"
+ msgstr "la instalación del códec adicional fue rechazada"
+ 
+-#: ../AppInstall/activation.py:235
++#: ../AppInstall/activation.py:238
+ msgid "additional codec installation failed"
+ msgstr "falló la instalación del códec adicional"
+ 
+ #. TRANSLATORS: %s represents a file path
+-#: ../AppInstall/activation.py:256
++#: ../AppInstall/activation.py:263
+ #, python-format
+ msgid "\"%s\" cannot be opened"
+ msgstr "«%s» no se puede abrir"
+ 
+-#: ../AppInstall/activation.py:291
++#: ../AppInstall/activation.py:298
+ #, python-format
+ msgid ""
+ "A list of applications that can handle documents of the type '%s' will be "
+@@ -281,37 +281,37 @@
+ "s»"
+ 
+ #. TRANSLATORS: %s represents a file path
+-#: ../AppInstall/activation.py:297
++#: ../AppInstall/activation.py:304
+ #, python-format
+ msgid "Install applications to open \"%s\""
+ msgstr "Instalar aplicaciones para abrir «%s»"
+ 
+-#: ../AppInstall/activation.py:300
++#: ../AppInstall/activation.py:307
+ msgid "Install applications"
+ msgstr "Instalar aplicaciones"
+ 
+-#: ../AppInstall/activation.py:311
++#: ../AppInstall/activation.py:318
+ msgid "_Search"
+ msgstr "_Buscar"
+ 
+-#: ../AppInstall/activation.py:345
++#: ../AppInstall/activation.py:352
+ msgid "Searching for extensions"
+ msgstr "Buscando extensiones"
+ 
+-#: ../AppInstall/activation.py:346
++#: ../AppInstall/activation.py:353
+ msgid "Extensions allow you to add new features to your application."
+ msgstr ""
+ "Las extensiones le permiten añadir nuevas características a su aplicación."
+ 
+-#: ../AppInstall/activation.py:348
++#: ../AppInstall/activation.py:355
+ msgid "Install/Remove Extensions"
+ msgstr "Instalar y desinstalar extensiones"
+ 
+-#: ../AppInstall/activation.py:350
++#: ../AppInstall/activation.py:357
+ msgid "Extension"
+ msgstr "Extensión"
+ 
+-#: ../AppInstall/AppInstall.py:174
++#: ../AppInstall/AppInstall.py:173
+ msgid ""
+ "To install an application check the box next to the application. Uncheck the "
+ "box to remove the application."
+@@ -319,37 +319,41 @@
+ "Para instalar una aplicación, marque la casilla situada junto al nombre de "
+ "la misma. Desmarque la casilla para desinstalar la aplicación."
+ 
+-#: ../AppInstall/AppInstall.py:177
+-msgid "To perform advanced tasks use the Synaptic package manager."
+-msgstr ""
+-"Para realizar tareas más avanzadas, use el gestor de paquetes Synaptic."
+-
+-#: ../AppInstall/AppInstall.py:179
++#: ../AppInstall/AppInstall.py:176
+ msgid "Quick Introduction"
+ msgstr "Introducción rápida"
+ 
+-#: ../AppInstall/AppInstall.py:225
+-#, fuzzy
+-msgid "Installed applications only"
+-msgstr "Aplicaciones instaladas"
++#. Just two filters needed, one to show all apps and one to show only installed apps
++#: ../AppInstall/AppInstall.py:200 ../AppInstall/distros/Debian.py:15
++#: ../AppInstall/distros/Default.py:13 ../AppInstall/distros/Ubuntu.py:15
++msgid "All available applications"
++msgstr "Todas las aplicaciones disponibles"
++
++#: ../AppInstall/AppInstall.py:201
+ 
+-#: ../AppInstall/AppInstall.py:226
++msgid "Show all applications that are available for your computer"
++msgstr "Mostrar todas las aplicaciones disponibles para su equipo"
++#: ../AppInstall/AppInstall.py:206
++
++msgid "Installed applications only"
++msgstr "Solo las aplicaciones instaladas"
++#: ../AppInstall/AppInstall.py:207
+ msgid "Show only applications that are installed on your computer"
+ msgstr "Mostrar sólo las aplicaciones instaladas en su equipo"
+ 
+-#: ../AppInstall/AppInstall.py:318
++#: ../AppInstall/AppInstall.py:299
+ msgid "Error reading the addon CD"
+ msgstr "Error leyendo el CD suplementario"
+ 
+-#: ../AppInstall/AppInstall.py:319
++#: ../AppInstall/AppInstall.py:300
+ msgid "The addon CD may be corrupt "
+ msgstr "El CD suplementario puede estar dañado "
+ 
+-#: ../AppInstall/AppInstall.py:453
+-msgid "The list of applications is not availabe"
+-msgstr "La lista de aplicaciones no está disponible"
++#: ../AppInstall/AppInstall.py:434
+ 
+-#: ../AppInstall/AppInstall.py:454
++msgid "The list of applications is not available"
++msgstr "La lista de aplicaciones no está disponible"
++#: ../AppInstall/AppInstall.py:435
+ msgid ""
+ "Click on 'Reload' to load it. To reload the list you need a working internet "
+ "connection. "
+@@ -357,12 +361,12 @@
+ "Pulse en «Recargar» para cargarlo. Para recargar la lista entera se necesita "
+ "un conexión a Internet. "
+ 
+-#: ../AppInstall/AppInstall.py:473
++#: ../AppInstall/AppInstall.py:454
+ #, python-format
+ msgid "%s cannot be installed on your computer type (%s)"
+ msgstr "%s no puede instalarse en un equipo como el suyo (%s)"
+ 
+-#: ../AppInstall/AppInstall.py:476
++#: ../AppInstall/AppInstall.py:457
+ msgid ""
+ "Either the application requires special hardware features or the vendor "
+ "decided to not support your computer type."
+@@ -370,12 +374,12 @@
+ "O bien la aplicación requiere funciones hardware especiales, o bien el "
+ "vendedor ha decidido no soportar los equipos de las características del suyo."
+ 
+-#: ../AppInstall/AppInstall.py:517
++#: ../AppInstall/AppInstall.py:498
+ #, python-format
+ msgid "Cannot install '%s'"
+ msgstr "No se pudo instalar «%s»"
+ 
+-#: ../AppInstall/AppInstall.py:518
++#: ../AppInstall/AppInstall.py:499
+ #, python-format
+ msgid ""
+ "This application conflicts with other installed software. To install '%s' "
+@@ -388,12 +392,12 @@
+ "\n"
+ "Cámbiese al gestor de paquetes Synaptic para resolver este conflicto."
+ 
+-#: ../AppInstall/AppInstall.py:579
++#: ../AppInstall/AppInstall.py:560
+ #, python-format
+ msgid "Cannot remove '%s'"
+ msgstr "No se pudo desinstalar «%s»"
+ 
+-#: ../AppInstall/AppInstall.py:580
++#: ../AppInstall/AppInstall.py:561
+ #, python-format
+ msgid ""
+ "One or more applications depend on %s. To remove %s and the dependent "
+@@ -402,37 +406,36 @@
+ "Una o más aplicaciones dependen de %s. Para desinstalar %s y sus "
+ "aplicaciones dependientes, utilice el gestor de paquetes Synaptic."
+ 
+-#: ../AppInstall/AppInstall.py:669
++#: ../AppInstall/AppInstall.py:650
+ msgid "Confirm installation of restricted software"
+ msgstr "Confirmar instalación de software restringido"
+ 
+-#: ../AppInstall/AppInstall.py:670
++#: ../AppInstall/AppInstall.py:651
++
+ msgid ""
+ "The use of this software may be restricted in some countries. You must "
+ "verify that one of the following is true:\n"
+ "\n"
+-"• These restrictions do not apply in your country of legal residence\n"
+-"• You have permission to use this software (for  example, a patent license)\n"
+-"• You are using this software for research purposes only"
+-msgstr ""
+-"El uso de este software puede estar restringido en algunos países. Usted "
+-"debe verificar si se cumple alguno de los siguientes requisitos:\n"
+-"\n"
+-"• Estas restricciones no se aplican en su lugar de residencia legal\n"
+-"• Usted tiene permiso para usar este software (por ejemplo, una licencia de "
+-"patente)\n"
+-"• Usted utiliza este software únicamente para propósitos de investigación"
+-
+-#: ../AppInstall/AppInstall.py:680
++"* These restrictions do not apply in your country of legal residence\n"
++"* You have permission to use this software (for  example, a patent license)\n"
++"* You are using this software for research purposes only"
++msgstr ""
++"El uso de este software puede estar restringido en algunos países. Debe "
++"verificar que una de las siguientes opciones sea verdadera:\n"
++"\n"
++"* Estas restricciones no se aplican a su país de residencia legal\n"
++"* Usted tiene permiso para utilizar este software (por ejemplo, una licencia de patente)\n"
++"* Usted va a utilizar este software únicamente para fines de investigación"
++#: ../AppInstall/AppInstall.py:661
+ msgid "_Confirm"
+ msgstr "_Confirmar"
+ 
+-#: ../AppInstall/AppInstall.py:719 ../AppInstall/DialogProprietary.py:23
++#: ../AppInstall/AppInstall.py:700 ../AppInstall/DialogProprietary.py:23
+ #, python-format
+ msgid "Enable the installation of software from %s?"
+ msgstr "¿Permitir la instalación de software desde %s?"
+ 
+-#: ../AppInstall/AppInstall.py:721
++#: ../AppInstall/AppInstall.py:702
+ #, python-format
+ msgid ""
+ "%s is provided by a third party vendor. The third party vendor is "
+@@ -441,20 +444,20 @@
+ "%s lo proporciona otro proveedor. Ese proveedor es el responsable del "
+ "soporte y las actualizaciones de seguridad."
+ 
+-#: ../AppInstall/AppInstall.py:725 ../AppInstall/DialogProprietary.py:26
++#: ../AppInstall/AppInstall.py:706 ../AppInstall/DialogProprietary.py:26
+ msgid "You need a working internet connection to continue."
+ msgstr "Necesita una conexión a Internet para continuar."
+ 
+-#: ../AppInstall/AppInstall.py:729 ../AppInstall/DialogProprietary.py:34
++#: ../AppInstall/AppInstall.py:710 ../AppInstall/DialogProprietary.py:34
+ msgid "_Enable"
+ msgstr "_Permitir"
+ 
+ #. show an error dialog if something went wrong with the cache
+-#: ../AppInstall/AppInstall.py:953
++#: ../AppInstall/AppInstall.py:934
+ msgid "Failed to check for installed and available applications"
+ msgstr "Error al comprobar las aplicaciones instaladas y disponibles"
+ 
+-#: ../AppInstall/AppInstall.py:954
++#: ../AppInstall/AppInstall.py:935
+ msgid ""
+ "This is a major failure of your software management system. Please check for "
+ "broken packages with synaptic, check the file permissions and correctness of "
+@@ -467,25 +470,25 @@
+ "información del software con: «sudo apt-get update» y «sudo apt-get install -"
+ "f»."
+ 
+-#: ../AppInstall/AppInstall.py:1005
++#: ../AppInstall/AppInstall.py:986
+ msgid "Apply changes to installed applications before closing?"
+ msgstr "¿Aplicar los cambios a las aplicaciones instaladas antes de cerrar?"
+ 
+-#: ../AppInstall/AppInstall.py:1006
++#: ../AppInstall/AppInstall.py:987
+ msgid "If you do not apply your changes they will be lost permanently."
+ msgstr "Si no aplica sus cambios, se perderán permanentemente."
+ 
+-#: ../AppInstall/AppInstall.py:1010
++#: ../AppInstall/AppInstall.py:991
+ msgid "_Close Without Applying"
+ msgstr "_Cerrar sin aplicar"
+ 
+ #. FIXME: move this inside the dialog class, we show a different
+ #. text for a quit dialog and a approve dialog
+-#: ../AppInstall/AppInstall.py:1071
++#: ../AppInstall/AppInstall.py:1053
+ msgid "Apply the following changes?"
+ msgstr "¿Aplicar los siguientes cambios?"
+ 
+-#: ../AppInstall/AppInstall.py:1072
++#: ../AppInstall/AppInstall.py:1054
+ msgid ""
+ "Please take a final look through the list of applications that will be "
+ "installed or removed."
+@@ -493,29 +496,29 @@
+ "Por favor, eche un último vistazo a la lista de aplicaciones que van a ser "
+ "instaladas o desinstaladas."
+ 
+-#: ../AppInstall/AppInstall.py:1281
++#: ../AppInstall/AppInstall.py:1263
+ msgid "There is no matching application available."
+ msgstr "No hay ninguna aplicación disponible que coincida con su búsqueda."
+ 
+ #. TRANSLATORS: %s represents a filter name
+-#: ../AppInstall/AppInstall.py:1291
++#: ../AppInstall/AppInstall.py:1273
+ #, python-format
+ msgid "To broaden your search, choose \"%s\"."
+ msgstr "Para ampliar su búsqueda, seleccione «%s»."
+ 
+ #. TRANSLATORS: %s represents a filter name
+-#: ../AppInstall/AppInstall.py:1295
++#: ../AppInstall/AppInstall.py:1277
+ #, python-format
+ msgid "To broaden your search, choose \"%s\" or \"%s\"."
+ msgstr "Para ampliar su búsqueda, seleccione «%s» o «%s»."
+ 
+ #. TRANSLATORS: Show refers to the Show: combobox
+-#: ../AppInstall/AppInstall.py:1301
++#: ../AppInstall/AppInstall.py:1283
+ msgid "To broaden your search, choose a different \"Show\" item."
+ msgstr "Para ampliar su búsqueda, seleccione una opción distinta en «Mostrar»."
+ 
+ #. TRANSLATORS: All refers to the All category in the left list
+-#: ../AppInstall/AppInstall.py:1307
++#: ../AppInstall/AppInstall.py:1289
+ msgid "To broaden your search, choose 'All' categories."
+ msgstr "Para ampliar su búsqueda, seleccione «Todas» las categorías."
+ 
+@@ -524,64 +527,64 @@
+ msgid "Failed to open '%s'"
+ msgstr "Fallo al abrir «%s»"
+ 
+-#: ../AppInstall/CoreMenu.py:127
++#: ../AppInstall/CoreMenu.py:128
+ msgid "Applications"
+ msgstr "Aplicaciones"
+ 
+-#: ../AppInstall/DialogComplete.py:128
++#: ../AppInstall/DialogComplete.py:131
+ msgid "Software installation failed"
+ msgstr "La instalación del software ha fallado"
+ 
+-#: ../AppInstall/DialogComplete.py:129
++#: ../AppInstall/DialogComplete.py:132
+ msgid ""
+ "There has been a problem during the installation of the following pieces of "
+ "software."
+ msgstr ""
+ "Ocurrió un problema durante la instalación de los siguientes programas."
+ 
+-#: ../AppInstall/DialogComplete.py:131 ../AppInstall/DialogComplete.py:146
+-#: ../AppInstall/DialogComplete.py:162 ../AppInstall/DialogComplete.py:190
++#: ../AppInstall/DialogComplete.py:134 ../AppInstall/DialogComplete.py:149
++#: ../AppInstall/DialogComplete.py:165 ../AppInstall/DialogComplete.py:193
+ msgid "Add/Remove More Software"
+ msgstr "Añadir o quitar más programas"
+ 
+-#: ../AppInstall/DialogComplete.py:133
++#: ../AppInstall/DialogComplete.py:136
+ msgid "Application installation failed"
+ msgstr "Fallo en la instalación de la aplicación"
+ 
+-#: ../AppInstall/DialogComplete.py:134
++#: ../AppInstall/DialogComplete.py:137
+ msgid ""
+ "There has been a problem during the installation of the following "
+ "applications."
+ msgstr ""
+ "Ha habido un problema durante la instalación de las siguientes aplicaciones."
+ 
+-#: ../AppInstall/DialogComplete.py:143
++#: ../AppInstall/DialogComplete.py:146
+ msgid "Software could not be removed"
+ msgstr "La aplicación no ha podido ser desinstalada"
+ 
+-#: ../AppInstall/DialogComplete.py:144
++#: ../AppInstall/DialogComplete.py:147
+ msgid ""
+ "There has been a problem during the removal of the following pieces of "
+ "software."
+ msgstr ""
+ "Ocurrió un problema durante la desinstalación de los siguientes programas."
+ 
+-#: ../AppInstall/DialogComplete.py:148
++#: ../AppInstall/DialogComplete.py:151
+ msgid "Not all applications could be removed"
+ msgstr "No se han podido desinstalar todas las aplicaciones"
+ 
+-#: ../AppInstall/DialogComplete.py:149
++#: ../AppInstall/DialogComplete.py:152
+ msgid ""
+ "There has been a problem during the removal of the following applications."
+ msgstr ""
+ "Ha habido un problema durante la desinstalación de las siguientes "
+ "aplicaciones."
+ 
+-#: ../AppInstall/DialogComplete.py:159
++#: ../AppInstall/DialogComplete.py:162
+ msgid "Installation and removal of software failed"
+ msgstr "La instalación y desinstalación del software han fallado"
+ 
+-#: ../AppInstall/DialogComplete.py:160
++#: ../AppInstall/DialogComplete.py:163
+ msgid ""
+ "There has been a problem during the installation or removal of the following "
+ "pieces of software."
+@@ -589,11 +592,11 @@
+ "Ocurrió un problema durante la instalación o desinstalación de los "
+ "siguientes programas."
+ 
+-#: ../AppInstall/DialogComplete.py:164
++#: ../AppInstall/DialogComplete.py:167
+ msgid "Installation and removal of applications failed"
+ msgstr "Fallo en la instalación y desinstalación de aplicaciones"
+ 
+-#: ../AppInstall/DialogComplete.py:165
++#: ../AppInstall/DialogComplete.py:168
+ msgid ""
+ "There has been a problem during the installation or removal of the following "
+ "applications."
+@@ -601,39 +604,39 @@
+ "Ha habido un problema durante la instalación o desinstalación de las "
+ "siguientes aplicaciones."
+ 
+-#: ../AppInstall/DialogComplete.py:173
++#: ../AppInstall/DialogComplete.py:176
+ msgid "New application has been installed"
+ msgstr "Se ha instalado una nueva aplicación"
+ 
+-#: ../AppInstall/DialogComplete.py:174
++#: ../AppInstall/DialogComplete.py:177
+ msgid "New applications have been installed"
+ msgstr "Se han instalado nuevas aplicaciones"
+ 
+-#: ../AppInstall/DialogComplete.py:179
++#: ../AppInstall/DialogComplete.py:182
+ msgid ""
+ "To start a newly installed application, choose it from the applications menu."
+ msgstr ""
+ "Para iniciar una aplicación recién instalada, selecciónela en el menú de "
+ "aplicaciones."
+ 
+-#: ../AppInstall/DialogComplete.py:182
++#: ../AppInstall/DialogComplete.py:185
+ msgid "To start a newly installed application double click on it."
+ msgstr ""
+ "Para iniciar una aplicación recién instalada, pulse dos veces sobre ella."
+ 
+-#: ../AppInstall/DialogComplete.py:186
++#: ../AppInstall/DialogComplete.py:189
+ msgid "Software has been installed successfully"
+ msgstr "El software ha sido instalado con éxito"
+ 
+-#: ../AppInstall/DialogComplete.py:187
++#: ../AppInstall/DialogComplete.py:190
+ msgid "Do you want to install or remove further software?"
+ msgstr "¿Desea instalar o desinstalar más aplicaciones?"
+ 
+-#: ../AppInstall/DialogComplete.py:192
++#: ../AppInstall/DialogComplete.py:195
+ msgid "Applications have been removed successfully"
+ msgstr "Las aplicaciones se han desinstalado con éxito"
+ 
+-#: ../AppInstall/DialogComplete.py:193
++#: ../AppInstall/DialogComplete.py:196
+ msgid "Do you want to install or remove further applications?"
+ msgstr "¿Desea instalar o desinstalar más aplicaciones?"
+ 
+@@ -690,32 +693,27 @@
+ msgid "Accept the license terms and install the software"
+ msgstr "Aceptar los términos de la licencia e instalar el software"
+ 
+-#: ../AppInstall/Menu.py:100
++#: ../AppInstall/Menu.py:98
+ msgid "Loading cache..."
+ msgstr "Cargando la caché..."
+ 
+-#: ../AppInstall/Menu.py:109
++#: ../AppInstall/Menu.py:107
+ msgid "Collecting application data..."
+ msgstr "Recopilando datos de aplicaciones..."
+ 
+-#: ../AppInstall/Menu.py:311
++#: ../AppInstall/Menu.py:309
+ msgid "Loading applications..."
+ msgstr "Cargando aplicaciones..."
+ 
+-#: ../AppInstall/Menu.py:315 ../AppInstall/Menu.py:318
++#: ../AppInstall/Menu.py:313 ../AppInstall/Menu.py:316
+ msgid "All"
+ msgstr "Todo"
+ 
+-#: ../AppInstall/Menu.py:327
++#: ../AppInstall/Menu.py:325
+ #, python-format
+ msgid "Loading %s..."
+ msgstr "Cargando %s..."
+ 
+-#: ../AppInstall/distros/Debian.py:15 ../AppInstall/distros/Default.py:13
+-#: ../AppInstall/distros/Ubuntu.py:15
+-msgid "All available applications"
+-msgstr "Todas las aplicaciones disponibles"
+-
+ #: ../AppInstall/distros/Debian.py:16
+ msgid ""
+ "Show all applications including ones which are possibly restricted by law or "
+@@ -799,7 +797,7 @@
+ 
+ #. %s is the name of the application
+ #: ../AppInstall/distros/Debian.py:56 ../AppInstall/distros/Ubuntu.py:63
+-#: ../AppInstall/distros/Ubuntu.py:114
++#: ../AppInstall/distros/Ubuntu.py:119
+ #, python-format
+ msgid ""
+ "The use, modification and distribution of %s is restricted by copyright or "
+@@ -946,13 +944,19 @@
+ msgstr "¿Permitir la instalación de software no soportado y restringido?"
+ 
+ #: ../AppInstall/distros/Ubuntu.py:96
++
++msgid ""
++"%s is provided by a third party vendor from the Canonical partner repository."
++msgstr ""
++"%s es proporcionado por otro proveedor del repositorio de socios de Canonical."
++#: ../AppInstall/distros/Ubuntu.py:101
+ #, python-format
+ msgid "Canonical Ltd. provides technical support and security updates for %s"
+ msgstr ""
+ "Canonical Ltd. proporciona soporte técnico y actualizaciones de seguridad "
+ "para %s"
+ 
+-#: ../AppInstall/distros/Ubuntu.py:109
++#: ../AppInstall/distros/Ubuntu.py:114
+ msgid "This application is provided by the Ubuntu community."
+ msgstr "Esta aplicación la proporciona la comunidad de Ubuntu."
+ 
+@@ -960,13 +964,13 @@
+ msgid "Description"
+ msgstr "Descripción"
+ 
+-#: ../AppInstall/widgets/AppDescView.py:75
++#: ../AppInstall/widgets/AppDescView.py:87
+ #, python-format
+ msgid "%s cannot be installed"
+ msgstr "%s no puede instalarse"
+ 
+ #. warn that this app is not available on this plattform
+-#: ../AppInstall/widgets/AppDescView.py:84
++#: ../AppInstall/widgets/AppDescView.py:96
+ #, python-format
+ msgid ""
+ "%s cannot be installed on your computer type (%s). Either the application "
+@@ -977,11 +981,18 @@
+ "requiere funciones hardware especiales, o bien el vendedor ha decidido no "
+ "soportar equipos del mismo tipo que el suyo."
+ 
+-#: ../AppInstall/widgets/AppDescView.py:96
++#: ../AppInstall/widgets/AppDescView.py:108
+ msgid "This application is bundled with the following applications: "
+ msgstr "Esta aplicación se compone de las siguientes aplicaciones: "
+ 
+-#: ../AppInstall/widgets/AppDescView.py:196
++#: ../AppInstall/widgets/AppDescView.py:208
++#, python-format
++msgid ""
++"\n"
++"Homepage: %s\n"
++msgstr ""
++
++#: ../AppInstall/widgets/AppDescView.py:210
+ #, python-format
+ msgid "Version: %s (%s)"
+ msgstr "Versión: %s (%s)"
+@@ -995,6 +1006,10 @@
+ msgid "Application"
+ msgstr "Aplicación"
+ 
++#~ msgid "To perform advanced tasks use the Synaptic package manager."
++#~ msgstr ""
++#~ "Para realizar tareas más avanzadas, use el gestor de paquetes Synaptic."
++
+ #~ msgid "%s integrates well into the Kubuntu desktop"
+ #~ msgstr "%s se integra bien con el escritorio de Kubuntu"
+ 
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/fr.po gnome-app-install-0.5.2.8.new/po/fr.po
+--- gnome-app-install-0.5.2.8/po/fr.po	2008-06-10 05:39:55.000000000 -0400
++++ gnome-app-install-0.5.2.8.new/po/fr.po	2008-10-29 16:56:25.000000000 -0400
+@@ -6,8 +6,8 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: gnome-app-install\n"
+-"Report-Msgid-Bugs-To: Sebastian Heinlein <sebi@glatzor.de>\n"
+-"POT-Creation-Date: 2008-01-04 20:30+0100\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2008-10-03 13:54-0400\n"
+ "PO-Revision-Date: 2007-09-17 19:05+0000\n"
+ "Last-Translator: Bruno Patri <bruno.patri@gmail.com>\n"
+ "Language-Team: french <kde-francophone@kde.org>\n"
+@@ -185,11 +185,11 @@
+ msgid "Package Manager"
+ msgstr "Gestionnaire de paquets"
+ 
+-#: ../AppInstall/activation.py:112
++#: ../AppInstall/activation.py:116
+ msgid "no suitable application"
+ msgstr "Aucune application appropriée"
+ 
+-#: ../AppInstall/activation.py:113
++#: ../AppInstall/activation.py:117
+ msgid ""
+ "No application suitable for automatic installation is available for handling "
+ "this kind of file."
+@@ -197,27 +197,27 @@
+ "Aucune application appropriée n'est installable automatiquement pour prendre "
+ "en charge ce type de fichier."
+ 
+-#: ../AppInstall/activation.py:116
++#: ../AppInstall/activation.py:120
+ msgid "no application found"
+ msgstr "impossible de trouver une application"
+ 
+-#: ../AppInstall/activation.py:117
++#: ../AppInstall/activation.py:121
+ msgid "No application is known for this kind of file."
+ msgstr "Aucune application n'est connue pour ce type de fichier."
+ 
+-#: ../AppInstall/activation.py:131 ../AppInstall/activation.py:289
++#: ../AppInstall/activation.py:134 ../AppInstall/activation.py:296
+ msgid "Searching for appropriate applications"
+ msgstr "Chercher les applications appropriées"
+ 
+-#: ../AppInstall/activation.py:133 ../AppInstall/activation.py:192
++#: ../AppInstall/activation.py:136 ../AppInstall/activation.py:195
+ msgid "Please wait. This might take a minute or two."
+ msgstr "Veuillez patienter. Cela peut prendre une ou deux minutes."
+ 
+-#: ../AppInstall/activation.py:161
++#: ../AppInstall/activation.py:164
+ msgid "Search for suitable codec?"
+ msgstr "Rechercher un codec approprié ?"
+ 
+-#: ../AppInstall/activation.py:162
++#: ../AppInstall/activation.py:165
+ msgid ""
+ "The required software to play this file is not installed. You need to "
+ "install suitable codecs to play media files. Do you want to search for a "
+@@ -233,46 +233,46 @@
+ "La recherche proposera également des logiciels qui ne sont pas pris en "
+ "charge officiellement."
+ 
+-#: ../AppInstall/activation.py:173
++#: ../AppInstall/activation.py:176
+ msgid "Invalid commandline"
+ msgstr "Ligne de commande invalide"
+ 
+-#: ../AppInstall/activation.py:174
++#: ../AppInstall/activation.py:177
+ #, python-format
+ msgid "'%s' does not understand the commandline argument '%s'"
+ msgstr "« %s » ne reconnaît pas l'argument « %s » de la ligne de commande"
+ 
+-#: ../AppInstall/activation.py:190
++#: ../AppInstall/activation.py:193
+ msgid "Searching for appropriate codecs"
+ msgstr "Recherche de codecs appropriés"
+ 
+-#: ../AppInstall/activation.py:195 ../AppInstall/activation.py:294
++#: ../AppInstall/activation.py:198 ../AppInstall/activation.py:301
+ msgid "_Install"
+ msgstr "_Installer"
+ 
+-#: ../AppInstall/activation.py:196
++#: ../AppInstall/activation.py:199
+ msgid "Install multimedia codecs"
+ msgstr "Installer des codecs multimédia"
+ 
+-#: ../AppInstall/activation.py:200
++#: ../AppInstall/activation.py:203
+ msgid "Codec"
+ msgstr "Codec"
+ 
+-#: ../AppInstall/activation.py:231
++#: ../AppInstall/activation.py:234
+ msgid "additional codec installation declined"
+ msgstr "l'installation de codecs supplémentaires est refusée"
+ 
+-#: ../AppInstall/activation.py:235
++#: ../AppInstall/activation.py:238
+ msgid "additional codec installation failed"
+ msgstr "l'installation de codecs supplémentaires a échoué"
+ 
+ #. TRANSLATORS: %s represents a file path
+-#: ../AppInstall/activation.py:256
++#: ../AppInstall/activation.py:263
+ #, python-format
+ msgid "\"%s\" cannot be opened"
+ msgstr "Impossible d'ouvrir « %s »"
+ 
+-#: ../AppInstall/activation.py:291
++#: ../AppInstall/activation.py:298
+ #, python-format
+ msgid ""
+ "A list of applications that can handle documents of the type '%s' will be "
+@@ -282,38 +282,38 @@
+ "va être créée"
+ 
+ #. TRANSLATORS: %s represents a file path
+-#: ../AppInstall/activation.py:297
++#: ../AppInstall/activation.py:304
+ #, python-format
+ msgid "Install applications to open \"%s\""
+ msgstr "Installer des applications pour ouvrir « %s »"
+ 
+-#: ../AppInstall/activation.py:300
++#: ../AppInstall/activation.py:307
+ msgid "Install applications"
+ msgstr "Installer des applications"
+ 
+-#: ../AppInstall/activation.py:311
++#: ../AppInstall/activation.py:318
+ msgid "_Search"
+ msgstr "_ Rechercher"
+ 
+-#: ../AppInstall/activation.py:345
++#: ../AppInstall/activation.py:352
+ msgid "Searching for extensions"
+ msgstr "Recherche d'extensions"
+ 
+-#: ../AppInstall/activation.py:346
++#: ../AppInstall/activation.py:353
+ msgid "Extensions allow you to add new features to your application."
+ msgstr ""
+ "Les extensions vous permettent d'ajouter de nouvelles fonctionnalités à "
+ "votre application."
+ 
+-#: ../AppInstall/activation.py:348
++#: ../AppInstall/activation.py:355
+ msgid "Install/Remove Extensions"
+ msgstr "Installer/supprimer des extensions"
+ 
+-#: ../AppInstall/activation.py:350
++#: ../AppInstall/activation.py:357
+ msgid "Extension"
+ msgstr "Extension"
+ 
+-#: ../AppInstall/AppInstall.py:174
++#: ../AppInstall/AppInstall.py:173
+ msgid ""
+ "To install an application check the box next to the application. Uncheck the "
+ "box to remove the application."
+@@ -321,39 +321,42 @@
+ "Pour installer une application, cochez la case située à gauche de "
+ "l'application. Décochez cette case pour supprimer l'application."
+ 
+-#: ../AppInstall/AppInstall.py:177
+-msgid "To perform advanced tasks use the Synaptic package manager."
+-msgstr ""
+-"Pour effectuer des tâches plus complexes, utilisez le gestionnaire de "
+-"paquets Synaptic."
+-
+-#: ../AppInstall/AppInstall.py:179
++#: ../AppInstall/AppInstall.py:176
+ msgid "Quick Introduction"
+ msgstr "Présentation rapide"
+ 
+-#: ../AppInstall/AppInstall.py:225
+-#, fuzzy
+-msgid "Installed applications only"
+-msgstr "Applications installées"
++#. Just two filters needed, one to show all apps and one to show only installed apps
++#: ../AppInstall/AppInstall.py:200 ../AppInstall/distros/Debian.py:15
++#: ../AppInstall/distros/Default.py:13 ../AppInstall/distros/Ubuntu.py:15
++msgid "All available applications"
++msgstr "Toutes les applications disponibles"
++
++#: ../AppInstall/AppInstall.py:201
+ 
+-#: ../AppInstall/AppInstall.py:226
++msgid "Show all applications that are available for your computer"
++msgstr "Afficher toutes les applications installées sur votre ordinateur"
++#: ../AppInstall/AppInstall.py:206
++
++msgid "Installed applications only"
++msgstr "Applications installées uniquement"
++#: ../AppInstall/AppInstall.py:207
+ msgid "Show only applications that are installed on your computer"
+ msgstr ""
+ "Afficher uniquement les applications déjà installées sur votre ordinateur"
+ 
+-#: ../AppInstall/AppInstall.py:318
++#: ../AppInstall/AppInstall.py:299
+ msgid "Error reading the addon CD"
+ msgstr "Erreur lors de la lecture du CD d'éléments supplémentaires"
+ 
+-#: ../AppInstall/AppInstall.py:319
++#: ../AppInstall/AppInstall.py:300
+ msgid "The addon CD may be corrupt "
+ msgstr "Le CD d'éléments supplémentaires est peut-être corrompu "
+ 
+-#: ../AppInstall/AppInstall.py:453
+-msgid "The list of applications is not availabe"
+-msgstr "La liste des applications n'est pas disponible"
++#: ../AppInstall/AppInstall.py:434
+ 
+-#: ../AppInstall/AppInstall.py:454
++msgid "The list of applications is not available"
++msgstr "La liste des applications n'est pas disponible"
++#: ../AppInstall/AppInstall.py:435
+ msgid ""
+ "Click on 'Reload' to load it. To reload the list you need a working internet "
+ "connection. "
+@@ -361,12 +364,12 @@
+ "Cliquez sur « Recharger » pour la charger. Pour recharger la liste vous avez "
+ "besoin d'être connecté à Internet. "
+ 
+-#: ../AppInstall/AppInstall.py:473
++#: ../AppInstall/AppInstall.py:454
+ #, python-format
+ msgid "%s cannot be installed on your computer type (%s)"
+ msgstr "%s ne peut être installé sur votre type d'ordinateur (%s)"
+ 
+-#: ../AppInstall/AppInstall.py:476
++#: ../AppInstall/AppInstall.py:457
+ msgid ""
+ "Either the application requires special hardware features or the vendor "
+ "decided to not support your computer type."
+@@ -374,12 +377,12 @@
+ "Soit cette application requiert des caractéristiques matérielles spéciales, "
+ "soit le vendeur a décidé de ne pas prendre en charge votre type d'ordinateur."
+ 
+-#: ../AppInstall/AppInstall.py:517
++#: ../AppInstall/AppInstall.py:498
+ #, python-format
+ msgid "Cannot install '%s'"
+ msgstr "Impossible d'installer « %s »"
+ 
+-#: ../AppInstall/AppInstall.py:518
++#: ../AppInstall/AppInstall.py:499
+ #, python-format
+ msgid ""
+ "This application conflicts with other installed software. To install '%s' "
+@@ -388,17 +391,16 @@
+ "Switch to the 'synaptic' package manager to resolve this conflict."
+ msgstr ""
+ "Cette application entre en conflit avec d'autres logiciels installés. Pour "
+-"installer « %s », les logiciels problématiques doivent d'abord être "
+-"enlevés.\n"
++"installer « %s », les logiciels problématiques doivent d'abord être enlevés.\n"
+ "\n"
+ "Utilisez le gestionnaire de paquets Synaptic pour résoudre ce conflit."
+ 
+-#: ../AppInstall/AppInstall.py:579
++#: ../AppInstall/AppInstall.py:560
+ #, python-format
+ msgid "Cannot remove '%s'"
+ msgstr "Impossible de supprimer « %s »"
+ 
+-#: ../AppInstall/AppInstall.py:580
++#: ../AppInstall/AppInstall.py:561
+ #, python-format
+ msgid ""
+ "One or more applications depend on %s. To remove %s and the dependent "
+@@ -407,38 +409,37 @@
+ "Une ou plusieurs applications dépendent de %s. Pour supprimer %s et les "
+ "applications qui en dépendent, utilisez le gestionnaire de paquets Synaptic."
+ 
+-#: ../AppInstall/AppInstall.py:669
++#: ../AppInstall/AppInstall.py:650
+ msgid "Confirm installation of restricted software"
+ msgstr "Confirmer l'installation de logiciels ayant des restrictions d'usage"
+ 
+-#: ../AppInstall/AppInstall.py:670
++#: ../AppInstall/AppInstall.py:651
++
+ msgid ""
+ "The use of this software may be restricted in some countries. You must "
+ "verify that one of the following is true:\n"
+ "\n"
+-"• These restrictions do not apply in your country of legal residence\n"
+-"• You have permission to use this software (for  example, a patent license)\n"
+-"• You are using this software for research purposes only"
+-msgstr ""
+-"L'utilisation de ce logiciel peut être restreinte (par la loi) dans certains "
+-"pays. Vous devez vérifier que vous êtes dans l'un de ces cas :\n"
+-"\n"
+-"• Ces restrictions ne s'appliquent pas dans le pays où se situe votre "
+-"résidence légale\n"
+-"• Vous avez l'autorisation d'utiliser ce logiciel (par exemple, une "
+-"licence)\n"
+-"• Vous utilisez ce logiciel uniquement à des fins de recherche"
++"* These restrictions do not apply in your country of legal residence\n"
++"* You have permission to use this software (for  example, a patent license)\n"
++"* You are using this software for research purposes only"
++msgstr ""
++"L'utilisation de ce logiciel peut être restreinte dans certains pays. Vous devez "
++"vérifier que vous êtes dans l'un de ces cas :\n"
++"\n"
++"* Ces restrictions ne s'appliquent pas dans le pays où se situe votre résidence légale\n"
++"* Vous avez l'autorisation d'utiliser ce logiciel (par exemple, une licence)\n"
++"* Vous utilisez ce logiciel uniquement à des fins de recherche"
+ 
+-#: ../AppInstall/AppInstall.py:680
++#: ../AppInstall/AppInstall.py:661
+ msgid "_Confirm"
+ msgstr "_Confirmer"
+ 
+-#: ../AppInstall/AppInstall.py:719 ../AppInstall/DialogProprietary.py:23
++#: ../AppInstall/AppInstall.py:700 ../AppInstall/DialogProprietary.py:23
+ #, python-format
+ msgid "Enable the installation of software from %s?"
+ msgstr "Activer l'installation de logiciels depuis %s ?"
+ 
+-#: ../AppInstall/AppInstall.py:721
++#: ../AppInstall/AppInstall.py:702
+ #, python-format
+ msgid ""
+ "%s is provided by a third party vendor. The third party vendor is "
+@@ -447,21 +448,21 @@
+ "%s est proposé par un vendeur tierce partie. Les vendeurs tierce partie sont "
+ "responsables de l'assistance et des mises à jour de sécurité."
+ 
+-#: ../AppInstall/AppInstall.py:725 ../AppInstall/DialogProprietary.py:26
++#: ../AppInstall/AppInstall.py:706 ../AppInstall/DialogProprietary.py:26
+ msgid "You need a working internet connection to continue."
+ msgstr ""
+ "Vous avez besoin d'une connexion Internet fonctionnelle pour continuer."
+ 
+-#: ../AppInstall/AppInstall.py:729 ../AppInstall/DialogProprietary.py:34
++#: ../AppInstall/AppInstall.py:710 ../AppInstall/DialogProprietary.py:34
+ msgid "_Enable"
+ msgstr "_Activer"
+ 
+ #. show an error dialog if something went wrong with the cache
+-#: ../AppInstall/AppInstall.py:953
++#: ../AppInstall/AppInstall.py:934
+ msgid "Failed to check for installed and available applications"
+ msgstr "Échec de la vérification des applications installées et disponibles"
+ 
+-#: ../AppInstall/AppInstall.py:954
++#: ../AppInstall/AppInstall.py:935
+ msgid ""
+ "This is a major failure of your software management system. Please check for "
+ "broken packages with synaptic, check the file permissions and correctness of "
+@@ -474,27 +475,27 @@
+ "rechargez les informations sur les logiciels avec les commandes : « sudo apt-"
+ "get update » et « sudo apt-get install -f »."
+ 
+-#: ../AppInstall/AppInstall.py:1005
++#: ../AppInstall/AppInstall.py:986
+ msgid "Apply changes to installed applications before closing?"
+ msgstr ""
+ "Appliquer les changements aux applications installées avant de quitter ?"
+ 
+-#: ../AppInstall/AppInstall.py:1006
++#: ../AppInstall/AppInstall.py:987
+ msgid "If you do not apply your changes they will be lost permanently."
+ msgstr ""
+ "Si vous n'appliquez pas vos changements, ils seront définitivement perdus."
+ 
+-#: ../AppInstall/AppInstall.py:1010
++#: ../AppInstall/AppInstall.py:991
+ msgid "_Close Without Applying"
+ msgstr "_Quitter sans appliquer"
+ 
+ #. FIXME: move this inside the dialog class, we show a different
+ #. text for a quit dialog and a approve dialog
+-#: ../AppInstall/AppInstall.py:1071
++#: ../AppInstall/AppInstall.py:1053
+ msgid "Apply the following changes?"
+ msgstr "Appliquer les changements suivants ?"
+ 
+-#: ../AppInstall/AppInstall.py:1072
++#: ../AppInstall/AppInstall.py:1054
+ msgid ""
+ "Please take a final look through the list of applications that will be "
+ "installed or removed."
+@@ -502,30 +503,30 @@
+ "Cette liste récapitulative vous permet de vérifier les applications qui "
+ "seront installées ou désinstallées."
+ 
+-#: ../AppInstall/AppInstall.py:1281
++#: ../AppInstall/AppInstall.py:1263
+ msgid "There is no matching application available."
+ msgstr "Aucune application correspondante n'est disponible."
+ 
+ #. TRANSLATORS: %s represents a filter name
+-#: ../AppInstall/AppInstall.py:1291
++#: ../AppInstall/AppInstall.py:1273
+ #, python-format
+ msgid "To broaden your search, choose \"%s\"."
+ msgstr "Pour élargir votre recherche, choisissez « %s »."
+ 
+ #. TRANSLATORS: %s represents a filter name
+-#: ../AppInstall/AppInstall.py:1295
++#: ../AppInstall/AppInstall.py:1277
+ #, python-format
+ msgid "To broaden your search, choose \"%s\" or \"%s\"."
+ msgstr "Pour élargir votre recherche, choisissez « %s » ou « %s »."
+ 
+ #. TRANSLATORS: Show refers to the Show: combobox
+-#: ../AppInstall/AppInstall.py:1301
++#: ../AppInstall/AppInstall.py:1283
+ msgid "To broaden your search, choose a different \"Show\" item."
+ msgstr ""
+ "Pour élargir votre recherche, choisissez une option « Afficher » différente."
+ 
+ #. TRANSLATORS: All refers to the All category in the left list
+-#: ../AppInstall/AppInstall.py:1307
++#: ../AppInstall/AppInstall.py:1289
+ msgid "To broaden your search, choose 'All' categories."
+ msgstr "Pour élargir votre recherche, sélectionnez toutes les catégories."
+ 
+@@ -534,61 +535,61 @@
+ msgid "Failed to open '%s'"
+ msgstr "Échec de l'ouverture de « %s »"
+ 
+-#: ../AppInstall/CoreMenu.py:127
++#: ../AppInstall/CoreMenu.py:128
+ msgid "Applications"
+ msgstr "Applications"
+ 
+-#: ../AppInstall/DialogComplete.py:128
++#: ../AppInstall/DialogComplete.py:131
+ msgid "Software installation failed"
+ msgstr "Échec de l'installation du logiciel"
+ 
+-#: ../AppInstall/DialogComplete.py:129
++#: ../AppInstall/DialogComplete.py:132
+ msgid ""
+ "There has been a problem during the installation of the following pieces of "
+ "software."
+ msgstr "Il y a eu un problème lors de l'installation des logiciels suivants."
+ 
+-#: ../AppInstall/DialogComplete.py:131 ../AppInstall/DialogComplete.py:146
+-#: ../AppInstall/DialogComplete.py:162 ../AppInstall/DialogComplete.py:190
++#: ../AppInstall/DialogComplete.py:134 ../AppInstall/DialogComplete.py:149
++#: ../AppInstall/DialogComplete.py:165 ../AppInstall/DialogComplete.py:193
+ msgid "Add/Remove More Software"
+ msgstr "Ajouter/Supprimer des logiciels"
+ 
+-#: ../AppInstall/DialogComplete.py:133
++#: ../AppInstall/DialogComplete.py:136
+ msgid "Application installation failed"
+ msgstr "Échec de l'installation de l'application"
+ 
+-#: ../AppInstall/DialogComplete.py:134
++#: ../AppInstall/DialogComplete.py:137
+ msgid ""
+ "There has been a problem during the installation of the following "
+ "applications."
+ msgstr ""
+ "Il y a eu un problème lors de l'installation des applications suivantes."
+ 
+-#: ../AppInstall/DialogComplete.py:143
++#: ../AppInstall/DialogComplete.py:146
+ msgid "Software could not be removed"
+ msgstr "Impossible de supprimer le logiciel"
+ 
+-#: ../AppInstall/DialogComplete.py:144
++#: ../AppInstall/DialogComplete.py:147
+ msgid ""
+ "There has been a problem during the removal of the following pieces of "
+ "software."
+ msgstr "Il y a eu un problème lors de la suppression des logiciels suivants."
+ 
+-#: ../AppInstall/DialogComplete.py:148
++#: ../AppInstall/DialogComplete.py:151
+ msgid "Not all applications could be removed"
+ msgstr "Toutes les applications n'ont pu être supprimées"
+ 
+-#: ../AppInstall/DialogComplete.py:149
++#: ../AppInstall/DialogComplete.py:152
+ msgid ""
+ "There has been a problem during the removal of the following applications."
+ msgstr ""
+ "Il y a eu un problème lors de la désinstallation des applications suivantes."
+ 
+-#: ../AppInstall/DialogComplete.py:159
++#: ../AppInstall/DialogComplete.py:162
+ msgid "Installation and removal of software failed"
+ msgstr "Échec de l'installation et de la suppression des logiciels"
+ 
+-#: ../AppInstall/DialogComplete.py:160
++#: ../AppInstall/DialogComplete.py:163
+ msgid ""
+ "There has been a problem during the installation or removal of the following "
+ "pieces of software."
+@@ -596,11 +597,11 @@
+ "Il y a eu un problème lors de l'installation ou la suppression des logiciels "
+ "suivants."
+ 
+-#: ../AppInstall/DialogComplete.py:164
++#: ../AppInstall/DialogComplete.py:167
+ msgid "Installation and removal of applications failed"
+ msgstr "Échec de l'installation ou de la suppression des logiciels"
+ 
+-#: ../AppInstall/DialogComplete.py:165
++#: ../AppInstall/DialogComplete.py:168
+ msgid ""
+ "There has been a problem during the installation or removal of the following "
+ "applications."
+@@ -608,40 +609,40 @@
+ "Il y a eu un problème lors de l'installation ou la désinstallation des "
+ "applications suivantes."
+ 
+-#: ../AppInstall/DialogComplete.py:173
++#: ../AppInstall/DialogComplete.py:176
+ msgid "New application has been installed"
+ msgstr "Une nouvelle application a été installée"
+ 
+-#: ../AppInstall/DialogComplete.py:174
++#: ../AppInstall/DialogComplete.py:177
+ msgid "New applications have been installed"
+ msgstr "De nouvelles applications ont été installées"
+ 
+-#: ../AppInstall/DialogComplete.py:179
++#: ../AppInstall/DialogComplete.py:182
+ msgid ""
+ "To start a newly installed application, choose it from the applications menu."
+ msgstr ""
+ "Pour lancer une application nouvellement installée, choisissez-la dans le "
+ "menu des applications."
+ 
+-#: ../AppInstall/DialogComplete.py:182
++#: ../AppInstall/DialogComplete.py:185
+ msgid "To start a newly installed application double click on it."
+ msgstr ""
+ "Pour lancer une application nouvellement installée, faites un double clic "
+ "dessus."
+ 
+-#: ../AppInstall/DialogComplete.py:186
++#: ../AppInstall/DialogComplete.py:189
+ msgid "Software has been installed successfully"
+ msgstr "Le logiciel a été installé avec succès"
+ 
+-#: ../AppInstall/DialogComplete.py:187
++#: ../AppInstall/DialogComplete.py:190
+ msgid "Do you want to install or remove further software?"
+ msgstr "Voulez-vous installer ou supprimer d'autres logiciels ?"
+ 
+-#: ../AppInstall/DialogComplete.py:192
++#: ../AppInstall/DialogComplete.py:195
+ msgid "Applications have been removed successfully"
+ msgstr "Les applications ont été supprimées avec succès"
+ 
+-#: ../AppInstall/DialogComplete.py:193
++#: ../AppInstall/DialogComplete.py:196
+ msgid "Do you want to install or remove further applications?"
+ msgstr "Voulez-vous installer ou supprimer d'autres applications ?"
+ 
+@@ -698,32 +699,27 @@
+ msgid "Accept the license terms and install the software"
+ msgstr "Accepter les termes de licence et installer le logiciel"
+ 
+-#: ../AppInstall/Menu.py:100
++#: ../AppInstall/Menu.py:98
+ msgid "Loading cache..."
+ msgstr "Chargement du cache..."
+ 
+-#: ../AppInstall/Menu.py:109
++#: ../AppInstall/Menu.py:107
+ msgid "Collecting application data..."
+ msgstr "Récupération des données des applications..."
+ 
+-#: ../AppInstall/Menu.py:311
++#: ../AppInstall/Menu.py:309
+ msgid "Loading applications..."
+ msgstr "Chargement des applications..."
+ 
+-#: ../AppInstall/Menu.py:315 ../AppInstall/Menu.py:318
++#: ../AppInstall/Menu.py:313 ../AppInstall/Menu.py:316
+ msgid "All"
+ msgstr "Tout"
+ 
+-#: ../AppInstall/Menu.py:327
++#: ../AppInstall/Menu.py:325
+ #, python-format
+ msgid "Loading %s..."
+ msgstr "Chargement de %s..."
+ 
+-#: ../AppInstall/distros/Debian.py:15 ../AppInstall/distros/Default.py:13
+-#: ../AppInstall/distros/Ubuntu.py:15
+-msgid "All available applications"
+-msgstr "Toutes les applications disponibles"
+-
+ #: ../AppInstall/distros/Debian.py:16
+ msgid ""
+ "Show all applications including ones which are possibly restricted by law or "
+@@ -810,7 +806,7 @@
+ 
+ #. %s is the name of the application
+ #: ../AppInstall/distros/Debian.py:56 ../AppInstall/distros/Ubuntu.py:63
+-#: ../AppInstall/distros/Ubuntu.py:114
++#: ../AppInstall/distros/Ubuntu.py:119
+ #, python-format
+ msgid ""
+ "The use, modification and distribution of %s is restricted by copyright or "
+@@ -959,13 +955,19 @@
+ "en charge ?"
+ 
+ #: ../AppInstall/distros/Ubuntu.py:96
++
++msgid ""
++"%s is provided by a third party vendor from the Canonical partner repository."
++msgstr ""
++"%s est proposé par un vendeur tiers, partenaire de Canonical."
++#: ../AppInstall/distros/Ubuntu.py:101
+ #, python-format
+ msgid "Canonical Ltd. provides technical support and security updates for %s"
+ msgstr ""
+ "Canonical Ltd. offre une assistance technique et des mises à jour de "
+ "sécurité pour %s"
+ 
+-#: ../AppInstall/distros/Ubuntu.py:109
++#: ../AppInstall/distros/Ubuntu.py:114
+ msgid "This application is provided by the Ubuntu community."
+ msgstr "Cette application est fournie par la communauté Ubuntu."
+ 
+@@ -973,13 +975,13 @@
+ msgid "Description"
+ msgstr "Description"
+ 
+-#: ../AppInstall/widgets/AppDescView.py:75
++#: ../AppInstall/widgets/AppDescView.py:87
+ #, python-format
+ msgid "%s cannot be installed"
+ msgstr "Impossible d'installer %s"
+ 
+ #. warn that this app is not available on this plattform
+-#: ../AppInstall/widgets/AppDescView.py:84
++#: ../AppInstall/widgets/AppDescView.py:96
+ #, python-format
+ msgid ""
+ "%s cannot be installed on your computer type (%s). Either the application "
+@@ -990,13 +992,20 @@
+ "nécessite des caractéristiques matérielles spéciales, soit le vendeur à "
+ "décidé de ne pas prendre en charge votre type ordinateur."
+ 
+-#: ../AppInstall/widgets/AppDescView.py:96
++#: ../AppInstall/widgets/AppDescView.py:108
+ msgid "This application is bundled with the following applications: "
+ msgstr ""
+ "Cette application est fournie sous forme de lot avec les applications "
+ "suivantes : "
+ 
+-#: ../AppInstall/widgets/AppDescView.py:196
++#: ../AppInstall/widgets/AppDescView.py:208
++#, python-format
++msgid ""
++"\n"
++"Homepage: %s\n"
++msgstr ""
++
++#: ../AppInstall/widgets/AppDescView.py:210
+ #, python-format
+ msgid "Version: %s (%s)"
+ msgstr "Version : %s (%s)"
+@@ -1010,6 +1019,11 @@
+ msgid "Application"
+ msgstr "Application"
+ 
++#~ msgid "To perform advanced tasks use the Synaptic package manager."
++#~ msgstr ""
++#~ "Pour effectuer des tâches plus complexes, utilisez le gestionnaire de "
++#~ "paquets Synaptic."
++
+ #~ msgid "%s integrates well into the Kubuntu desktop"
+ #~ msgstr "%s s'intègre bien dans l'environnement de bureau Kubuntu"
+ 
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/it.po gnome-app-install-0.5.2.8.new/po/it.po
+--- gnome-app-install-0.5.2.8/po/it.po	2008-06-10 05:39:55.000000000 -0400
++++ gnome-app-install-0.5.2.8.new/po/it.po	2008-10-29 16:56:25.000000000 -0400
+@@ -8,8 +8,8 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: gnome-app-install VERSION\n"
+-"Report-Msgid-Bugs-To: Sebastian Heinlein <sebi@glatzor.de>\n"
+-"POT-Creation-Date: 2008-01-04 20:30+0100\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2008-10-03 13:54-0400\n"
+ "PO-Revision-Date: 2007-09-23 16:53+0000\n"
+ "Last-Translator: Fabio Marzocca <thesaltydog@gmail.com>\n"
+ "Language-Team: Italian <tp@lists.linux.it>\n"
+@@ -185,11 +185,11 @@
+ msgid "Package Manager"
+ msgstr "Gestore pacchetti"
+ 
+-#: ../AppInstall/activation.py:112
++#: ../AppInstall/activation.py:116
+ msgid "no suitable application"
+ msgstr "Nessuna applicazione adatta"
+ 
+-#: ../AppInstall/activation.py:113
++#: ../AppInstall/activation.py:117
+ msgid ""
+ "No application suitable for automatic installation is available for handling "
+ "this kind of file."
+@@ -197,27 +197,27 @@
+ "Nessuna applicazione adatta per l'installazione automatica è disponibile per "
+ "gestire questo tipo di file."
+ 
+-#: ../AppInstall/activation.py:116
++#: ../AppInstall/activation.py:120
+ msgid "no application found"
+ msgstr "Nessuna applicazione trovata"
+ 
+-#: ../AppInstall/activation.py:117
++#: ../AppInstall/activation.py:121
+ msgid "No application is known for this kind of file."
+ msgstr "Nessuna applicazione conosciuta per questo tipo di file."
+ 
+-#: ../AppInstall/activation.py:131 ../AppInstall/activation.py:289
++#: ../AppInstall/activation.py:134 ../AppInstall/activation.py:296
+ msgid "Searching for appropriate applications"
+ msgstr "Ricerca delle applicazioni appropriate"
+ 
+-#: ../AppInstall/activation.py:133 ../AppInstall/activation.py:192
++#: ../AppInstall/activation.py:136 ../AppInstall/activation.py:195
+ msgid "Please wait. This might take a minute or two."
+ msgstr "Attendere. L'operazione può richiedere un minuto o due."
+ 
+-#: ../AppInstall/activation.py:161
++#: ../AppInstall/activation.py:164
+ msgid "Search for suitable codec?"
+ msgstr "Cercare un codec adatto?"
+ 
+-#: ../AppInstall/activation.py:162
++#: ../AppInstall/activation.py:165
+ msgid ""
+ "The required software to play this file is not installed. You need to "
+ "install suitable codecs to play media files. Do you want to search for a "
+@@ -231,46 +231,46 @@
+ "\n"
+ "La ricerca comprenderà anche software non supportato ufficialmente."
+ 
+-#: ../AppInstall/activation.py:173
++#: ../AppInstall/activation.py:176
+ msgid "Invalid commandline"
+ msgstr "Riga di comando non valida"
+ 
+-#: ../AppInstall/activation.py:174
++#: ../AppInstall/activation.py:177
+ #, python-format
+ msgid "'%s' does not understand the commandline argument '%s'"
+ msgstr "«%s» non è in grado di interpretare l'argomento a riga di comando «%s»"
+ 
+-#: ../AppInstall/activation.py:190
++#: ../AppInstall/activation.py:193
+ msgid "Searching for appropriate codecs"
+ msgstr "Ricerca di codec appropriati"
+ 
+-#: ../AppInstall/activation.py:195 ../AppInstall/activation.py:294
++#: ../AppInstall/activation.py:198 ../AppInstall/activation.py:301
+ msgid "_Install"
+ msgstr "_Installa"
+ 
+-#: ../AppInstall/activation.py:196
++#: ../AppInstall/activation.py:199
+ msgid "Install multimedia codecs"
+ msgstr "Installazione codec multimediali"
+ 
+-#: ../AppInstall/activation.py:200
++#: ../AppInstall/activation.py:203
+ msgid "Codec"
+ msgstr "Codec"
+ 
+-#: ../AppInstall/activation.py:231
++#: ../AppInstall/activation.py:234
+ msgid "additional codec installation declined"
+ msgstr "Installazione codec aggiuntivo rifiutata"
+ 
+-#: ../AppInstall/activation.py:235
++#: ../AppInstall/activation.py:238
+ msgid "additional codec installation failed"
+ msgstr "Installazione codec aggiuntivo fallita"
+ 
+ #. TRANSLATORS: %s represents a file path
+-#: ../AppInstall/activation.py:256
++#: ../AppInstall/activation.py:263
+ #, python-format
+ msgid "\"%s\" cannot be opened"
+ msgstr "Impossibile aprire «%s»"
+ 
+-#: ../AppInstall/activation.py:291
++#: ../AppInstall/activation.py:298
+ #, python-format
+ msgid ""
+ "A list of applications that can handle documents of the type '%s' will be "
+@@ -279,37 +279,37 @@
+ "Verrà creato un elenco di applicazioni che supportano documenti di tipo «%s»"
+ 
+ #. TRANSLATORS: %s represents a file path
+-#: ../AppInstall/activation.py:297
++#: ../AppInstall/activation.py:304
+ #, python-format
+ msgid "Install applications to open \"%s\""
+ msgstr "Installare applicazioni per aprire «%s»"
+ 
+-#: ../AppInstall/activation.py:300
++#: ../AppInstall/activation.py:307
+ msgid "Install applications"
+ msgstr "Installa applicazioni"
+ 
+-#: ../AppInstall/activation.py:311
++#: ../AppInstall/activation.py:318
+ msgid "_Search"
+ msgstr "_Cerca"
+ 
+-#: ../AppInstall/activation.py:345
++#: ../AppInstall/activation.py:352
+ msgid "Searching for extensions"
+ msgstr "Ricerca delle estensioni"
+ 
+-#: ../AppInstall/activation.py:346
++#: ../AppInstall/activation.py:353
+ msgid "Extensions allow you to add new features to your application."
+ msgstr ""
+ "Le estensioni consentono di aggiungere nuove funzionalità al programma."
+ 
+-#: ../AppInstall/activation.py:348
++#: ../AppInstall/activation.py:355
+ msgid "Install/Remove Extensions"
+ msgstr "Installa/Rimuovi estensioni"
+ 
+-#: ../AppInstall/activation.py:350
++#: ../AppInstall/activation.py:357
+ msgid "Extension"
+ msgstr "Estensione"
+ 
+-#: ../AppInstall/AppInstall.py:174
++#: ../AppInstall/AppInstall.py:173
+ msgid ""
+ "To install an application check the box next to the application. Uncheck the "
+ "box to remove the application."
+@@ -317,37 +317,41 @@
+ "Per installare un'applicazione selezionare la casella a fianco di essa. "
+ "Deselezionare la casella per rimuovere l'applicazione."
+ 
+-#: ../AppInstall/AppInstall.py:177
+-msgid "To perform advanced tasks use the Synaptic package manager."
+-msgstr ""
+-"Per svolgere attività avanzate utilizzare il «Gestore pacchetti Synaptic»."
+-
+-#: ../AppInstall/AppInstall.py:179
++#: ../AppInstall/AppInstall.py:176
+ msgid "Quick Introduction"
+ msgstr "Breve introduzione"
+ 
+-#: ../AppInstall/AppInstall.py:225
+-#, fuzzy
++#. Just two filters needed, one to show all apps and one to show only installed apps
++#: ../AppInstall/AppInstall.py:200 ../AppInstall/distros/Debian.py:15
++#: ../AppInstall/distros/Default.py:13 ../AppInstall/distros/Ubuntu.py:15
++msgid "All available applications"
++msgstr "Tutte le applicazioni disponibili"
++
++#: ../AppInstall/AppInstall.py:201
++
++msgid "Show all applications that are available for your computer"
++msgstr "Mostra solo le applicazioni che sono installate sul proprio computer"
++#: ../AppInstall/AppInstall.py:206
++
+ msgid "Installed applications only"
+ msgstr "Applicazioni installate"
+-
+-#: ../AppInstall/AppInstall.py:226
++#: ../AppInstall/AppInstall.py:207
+ msgid "Show only applications that are installed on your computer"
+ msgstr "Mostra solo le applicazioni che sono installate sul proprio computer"
+ 
+-#: ../AppInstall/AppInstall.py:318
++#: ../AppInstall/AppInstall.py:299
+ msgid "Error reading the addon CD"
+ msgstr "Errore nel leggere il CD aggiuntivo"
+ 
+-#: ../AppInstall/AppInstall.py:319
++#: ../AppInstall/AppInstall.py:300
+ msgid "The addon CD may be corrupt "
+ msgstr "Il CD aggiuntivo potrebbe essere danneggiato "
+ 
+-#: ../AppInstall/AppInstall.py:453
+-msgid "The list of applications is not availabe"
+-msgstr "L'elenco delle applicazioni non è disponibile"
++#: ../AppInstall/AppInstall.py:434
+ 
+-#: ../AppInstall/AppInstall.py:454
++msgid "The list of applications is not available"
++msgstr "L'elenco delle applicazioni non è disponibile"
++#: ../AppInstall/AppInstall.py:435
+ msgid ""
+ "Click on 'Reload' to load it. To reload the list you need a working internet "
+ "connection. "
+@@ -355,12 +359,12 @@
+ "Fare clic su «Aggiorna» per caricarlo. Per aggiornare l'elenco è necessaria "
+ "una connessione a Internet funzionante. "
+ 
+-#: ../AppInstall/AppInstall.py:473
++#: ../AppInstall/AppInstall.py:454
+ #, python-format
+ msgid "%s cannot be installed on your computer type (%s)"
+ msgstr "Non è possibile installare %s su questo tipo di computer (%s)"
+ 
+-#: ../AppInstall/AppInstall.py:476
++#: ../AppInstall/AppInstall.py:457
+ msgid ""
+ "Either the application requires special hardware features or the vendor "
+ "decided to not support your computer type."
+@@ -368,12 +372,12 @@
+ "L'applicazione richiede delle particolari impostazioni hardware oppure il "
+ "produttore ha deciso di non supportare il tipo di computer in uso."
+ 
+-#: ../AppInstall/AppInstall.py:517
++#: ../AppInstall/AppInstall.py:498
+ #, python-format
+ msgid "Cannot install '%s'"
+ msgstr "Impossibile installare «%s»"
+ 
+-#: ../AppInstall/AppInstall.py:518
++#: ../AppInstall/AppInstall.py:499
+ #, python-format
+ msgid ""
+ "This application conflicts with other installed software. To install '%s' "
+@@ -386,12 +390,12 @@
+ "\n"
+ "Passare al «Gestore pacchetti Synaptic» per risolvere questo conflitto."
+ 
+-#: ../AppInstall/AppInstall.py:579
++#: ../AppInstall/AppInstall.py:560
+ #, python-format
+ msgid "Cannot remove '%s'"
+ msgstr "Impossibile rimuovere «%s»"
+ 
+-#: ../AppInstall/AppInstall.py:580
++#: ../AppInstall/AppInstall.py:561
+ #, python-format
+ msgid ""
+ "One or more applications depend on %s. To remove %s and the dependent "
+@@ -400,36 +404,36 @@
+ "Una o più applicazioni dipendono da «%s». Per rimuovere «%s» e tutte le "
+ "applicazioni dipendenti, usare il gestore di pacchetti Synaptic."
+ 
+-#: ../AppInstall/AppInstall.py:669
++#: ../AppInstall/AppInstall.py:650
+ msgid "Confirm installation of restricted software"
+ msgstr "Confermare l'installazione del software con restrizioni"
+ 
+-#: ../AppInstall/AppInstall.py:670
++#: ../AppInstall/AppInstall.py:651
++
+ msgid ""
+ "The use of this software may be restricted in some countries. You must "
+ "verify that one of the following is true:\n"
+ "\n"
+-"• These restrictions do not apply in your country of legal residence\n"
+-"• You have permission to use this software (for  example, a patent license)\n"
+-"• You are using this software for research purposes only"
+-msgstr ""
+-"L'uso di questo software potrebbe essere ristretto in alcuni paesi. È "
+-"necessario verificare che una di queste condizioni sia vera:\n"
+-"\n"
+-"• Queste restrizioni non sussistono nel paese di residenza\n"
+-"• Si ha il permesso di usare questo software (es. brevetto)\n"
+-"• Si utilizza questo software solo a fini di ricerca"
+-
+-#: ../AppInstall/AppInstall.py:680
++"* These restrictions do not apply in your country of legal residence\n"
++"* You have permission to use this software (for  example, a patent license)\n"
++"* You are using this software for research purposes only"
++msgstr ""
++"L'uso di questo software potrebbe essere ristretto in alcuni Paesi. È necessario "
++"verificare che una delle seguenti condizioni sia vera:\n"
++"\n"
++"* Queste restrizioni non sussistono nel Paese di residenza\n"
++"* L'utente è autorizzato a utilizzare questo software (ad esempio, un brevetto)\n"
++"* Il software viene utilizzato a soli fini di ricerca"
++#: ../AppInstall/AppInstall.py:661
+ msgid "_Confirm"
+ msgstr "_Conferma"
+ 
+-#: ../AppInstall/AppInstall.py:719 ../AppInstall/DialogProprietary.py:23
++#: ../AppInstall/AppInstall.py:700 ../AppInstall/DialogProprietary.py:23
+ #, python-format
+ msgid "Enable the installation of software from %s?"
+ msgstr "Abilitare l'installazione di software da %s?"
+ 
+-#: ../AppInstall/AppInstall.py:721
++#: ../AppInstall/AppInstall.py:702
+ #, python-format
+ msgid ""
+ "%s is provided by a third party vendor. The third party vendor is "
+@@ -438,20 +442,20 @@
+ "«%s» è fornito da terze parti. Il distributore è responsabile del supporto e "
+ "per gli aggiornamenti di sicurezza."
+ 
+-#: ../AppInstall/AppInstall.py:725 ../AppInstall/DialogProprietary.py:26
++#: ../AppInstall/AppInstall.py:706 ../AppInstall/DialogProprietary.py:26
+ msgid "You need a working internet connection to continue."
+ msgstr "È necessario un collegamento a internet funzionante per continuare."
+ 
+-#: ../AppInstall/AppInstall.py:729 ../AppInstall/DialogProprietary.py:34
++#: ../AppInstall/AppInstall.py:710 ../AppInstall/DialogProprietary.py:34
+ msgid "_Enable"
+ msgstr "A_bilita"
+ 
+ #. show an error dialog if something went wrong with the cache
+-#: ../AppInstall/AppInstall.py:953
++#: ../AppInstall/AppInstall.py:934
+ msgid "Failed to check for installed and available applications"
+ msgstr "Controllo delle applicazioni installate e disponibili fallito"
+ 
+-#: ../AppInstall/AppInstall.py:954
++#: ../AppInstall/AppInstall.py:935
+ msgid ""
+ "This is a major failure of your software management system. Please check for "
+ "broken packages with synaptic, check the file permissions and correctness of "
+@@ -463,26 +467,26 @@
+ "file presenti in «/etc/apt/sources.list» e ricaricare le informazioni del "
+ "software con: «sudo apt-get update» e «sudo apt-get install -f»."
+ 
+-#: ../AppInstall/AppInstall.py:1005
++#: ../AppInstall/AppInstall.py:986
+ msgid "Apply changes to installed applications before closing?"
+ msgstr ""
+ "Applicare i cambiamenti alle applicazioni installate prima di chiudere?"
+ 
+-#: ../AppInstall/AppInstall.py:1006
++#: ../AppInstall/AppInstall.py:987
+ msgid "If you do not apply your changes they will be lost permanently."
+ msgstr "Se i cambiamenti non vengono applicati, saranno persi."
+ 
+-#: ../AppInstall/AppInstall.py:1010
++#: ../AppInstall/AppInstall.py:991
+ msgid "_Close Without Applying"
+ msgstr "_Chiudi senza applicare"
+ 
+ #. FIXME: move this inside the dialog class, we show a different
+ #. text for a quit dialog and a approve dialog
+-#: ../AppInstall/AppInstall.py:1071
++#: ../AppInstall/AppInstall.py:1053
+ msgid "Apply the following changes?"
+ msgstr "Applicare i seguenti cambiamenti?"
+ 
+-#: ../AppInstall/AppInstall.py:1072
++#: ../AppInstall/AppInstall.py:1054
+ msgid ""
+ "Please take a final look through the list of applications that will be "
+ "installed or removed."
+@@ -490,29 +494,29 @@
+ "Prendere un'ultima visione dell'elenco di applicazioni che saranno "
+ "installate o rimosse."
+ 
+-#: ../AppInstall/AppInstall.py:1281
++#: ../AppInstall/AppInstall.py:1263
+ msgid "There is no matching application available."
+ msgstr "Non è disponibile alcuna applicazione corrispondente."
+ 
+ #. TRANSLATORS: %s represents a filter name
+-#: ../AppInstall/AppInstall.py:1291
++#: ../AppInstall/AppInstall.py:1273
+ #, python-format
+ msgid "To broaden your search, choose \"%s\"."
+ msgstr "Per ampliare la ricerca, scegliere «%s»."
+ 
+ #. TRANSLATORS: %s represents a filter name
+-#: ../AppInstall/AppInstall.py:1295
++#: ../AppInstall/AppInstall.py:1277
+ #, python-format
+ msgid "To broaden your search, choose \"%s\" or \"%s\"."
+ msgstr "Per ampliare la ricerca, scegliere «%s» o «%s»."
+ 
+ #. TRANSLATORS: Show refers to the Show: combobox
+-#: ../AppInstall/AppInstall.py:1301
++#: ../AppInstall/AppInstall.py:1283
+ msgid "To broaden your search, choose a different \"Show\" item."
+ msgstr "Per ampliare la ricerca, scegliere un'altra voce da «Mostra»."
+ 
+ #. TRANSLATORS: All refers to the All category in the left list
+-#: ../AppInstall/AppInstall.py:1307
++#: ../AppInstall/AppInstall.py:1289
+ msgid "To broaden your search, choose 'All' categories."
+ msgstr "Per ampliare la ricerca, scegliere «Tutte» le categorie."
+ 
+@@ -521,15 +525,15 @@
+ msgid "Failed to open '%s'"
+ msgstr "Impossibile aprire «%s»"
+ 
+-#: ../AppInstall/CoreMenu.py:127
++#: ../AppInstall/CoreMenu.py:128
+ msgid "Applications"
+ msgstr "Applicazioni"
+ 
+-#: ../AppInstall/DialogComplete.py:128
++#: ../AppInstall/DialogComplete.py:131
+ msgid "Software installation failed"
+ msgstr "Installazione software fallita"
+ 
+-#: ../AppInstall/DialogComplete.py:129
++#: ../AppInstall/DialogComplete.py:132
+ msgid ""
+ "There has been a problem during the installation of the following pieces of "
+ "software."
+@@ -537,16 +541,16 @@
+ "Si è verificato un problema durante l'installazione dei seguenti componenti "
+ "software."
+ 
+-#: ../AppInstall/DialogComplete.py:131 ../AppInstall/DialogComplete.py:146
+-#: ../AppInstall/DialogComplete.py:162 ../AppInstall/DialogComplete.py:190
++#: ../AppInstall/DialogComplete.py:134 ../AppInstall/DialogComplete.py:149
++#: ../AppInstall/DialogComplete.py:165 ../AppInstall/DialogComplete.py:193
+ msgid "Add/Remove More Software"
+ msgstr "Aggiungi/Rimuovi ulteriore software"
+ 
+-#: ../AppInstall/DialogComplete.py:133
++#: ../AppInstall/DialogComplete.py:136
+ msgid "Application installation failed"
+ msgstr "Installazione applicazione fallita"
+ 
+-#: ../AppInstall/DialogComplete.py:134
++#: ../AppInstall/DialogComplete.py:137
+ msgid ""
+ "There has been a problem during the installation of the following "
+ "applications."
+@@ -554,11 +558,11 @@
+ "Si è verificato un problema durante l'installazione delle seguenti "
+ "applicazioni."
+ 
+-#: ../AppInstall/DialogComplete.py:143
++#: ../AppInstall/DialogComplete.py:146
+ msgid "Software could not be removed"
+ msgstr "Il software non può essere rimosso"
+ 
+-#: ../AppInstall/DialogComplete.py:144
++#: ../AppInstall/DialogComplete.py:147
+ msgid ""
+ "There has been a problem during the removal of the following pieces of "
+ "software."
+@@ -566,21 +570,21 @@
+ "Si è verificato un problema durante la rimozione dei seguenti componenti "
+ "software."
+ 
+-#: ../AppInstall/DialogComplete.py:148
++#: ../AppInstall/DialogComplete.py:151
+ msgid "Not all applications could be removed"
+ msgstr "Non è stato possibile rimuovere tutte le applicazioni"
+ 
+-#: ../AppInstall/DialogComplete.py:149
++#: ../AppInstall/DialogComplete.py:152
+ msgid ""
+ "There has been a problem during the removal of the following applications."
+ msgstr ""
+ "Si è verificato un problema durante la rimozione delle seguenti applicazioni."
+ 
+-#: ../AppInstall/DialogComplete.py:159
++#: ../AppInstall/DialogComplete.py:162
+ msgid "Installation and removal of software failed"
+ msgstr "Installazione e rimozione software fallita"
+ 
+-#: ../AppInstall/DialogComplete.py:160
++#: ../AppInstall/DialogComplete.py:163
+ msgid ""
+ "There has been a problem during the installation or removal of the following "
+ "pieces of software."
+@@ -588,11 +592,11 @@
+ "Si è verificato un problema durante l'installazione o la rimozione dei "
+ "seguenti componenti software."
+ 
+-#: ../AppInstall/DialogComplete.py:164
++#: ../AppInstall/DialogComplete.py:167
+ msgid "Installation and removal of applications failed"
+ msgstr "Installazione e rimozione delle applicazioni fallita"
+ 
+-#: ../AppInstall/DialogComplete.py:165
++#: ../AppInstall/DialogComplete.py:168
+ msgid ""
+ "There has been a problem during the installation or removal of the following "
+ "applications."
+@@ -600,39 +604,39 @@
+ "Si è verificato un problema durante l'installazione o la rimozione delle "
+ "seguenti applicazioni."
+ 
+-#: ../AppInstall/DialogComplete.py:173
++#: ../AppInstall/DialogComplete.py:176
+ msgid "New application has been installed"
+ msgstr "La nuova applicazione è stata installata"
+ 
+-#: ../AppInstall/DialogComplete.py:174
++#: ../AppInstall/DialogComplete.py:177
+ msgid "New applications have been installed"
+ msgstr "Le nuove applicazioni sono state installate"
+ 
+-#: ../AppInstall/DialogComplete.py:179
++#: ../AppInstall/DialogComplete.py:182
+ msgid ""
+ "To start a newly installed application, choose it from the applications menu."
+ msgstr ""
+ "Per avviare un'applicazione appena installata, sceglierla dal menù delle "
+ "applicazioni."
+ 
+-#: ../AppInstall/DialogComplete.py:182
++#: ../AppInstall/DialogComplete.py:185
+ msgid "To start a newly installed application double click on it."
+ msgstr ""
+ "Per avviare un'applicazione appena installata, fare doppio clic su di essa."
+ 
+-#: ../AppInstall/DialogComplete.py:186
++#: ../AppInstall/DialogComplete.py:189
+ msgid "Software has been installed successfully"
+ msgstr "Il software è stato installato con successo"
+ 
+-#: ../AppInstall/DialogComplete.py:187
++#: ../AppInstall/DialogComplete.py:190
+ msgid "Do you want to install or remove further software?"
+ msgstr "Installare o rimuovere ulteriore software?"
+ 
+-#: ../AppInstall/DialogComplete.py:192
++#: ../AppInstall/DialogComplete.py:195
+ msgid "Applications have been removed successfully"
+ msgstr "Le applicazioni sono state rimosse con successo"
+ 
+-#: ../AppInstall/DialogComplete.py:193
++#: ../AppInstall/DialogComplete.py:196
+ msgid "Do you want to install or remove further applications?"
+ msgstr "Installare o rimuovere altre applicazioni?"
+ 
+@@ -689,32 +693,27 @@
+ msgid "Accept the license terms and install the software"
+ msgstr "Accetta i termini di licenza e installa il software"
+ 
+-#: ../AppInstall/Menu.py:100
++#: ../AppInstall/Menu.py:98
+ msgid "Loading cache..."
+ msgstr "Caricamento della cache..."
+ 
+-#: ../AppInstall/Menu.py:109
++#: ../AppInstall/Menu.py:107
+ msgid "Collecting application data..."
+ msgstr "Raccolta dei dati delle applicazioni..."
+ 
+-#: ../AppInstall/Menu.py:311
++#: ../AppInstall/Menu.py:309
+ msgid "Loading applications..."
+ msgstr "Caricamento delle applicazioni..."
+ 
+-#: ../AppInstall/Menu.py:315 ../AppInstall/Menu.py:318
++#: ../AppInstall/Menu.py:313 ../AppInstall/Menu.py:316
+ msgid "All"
+ msgstr "Tutte"
+ 
+-#: ../AppInstall/Menu.py:327
++#: ../AppInstall/Menu.py:325
+ #, python-format
+ msgid "Loading %s..."
+ msgstr "Caricamento di %s..."
+ 
+-#: ../AppInstall/distros/Debian.py:15 ../AppInstall/distros/Default.py:13
+-#: ../AppInstall/distros/Ubuntu.py:15
+-msgid "All available applications"
+-msgstr "Tutte le applicazioni disponibili"
+-
+ #: ../AppInstall/distros/Debian.py:16
+ msgid ""
+ "Show all applications including ones which are possibly restricted by law or "
+@@ -774,8 +773,8 @@
+ "%s is part of the Debian main distribution. Debian provides support and "
+ "security updates, which will be enabled too."
+ msgstr ""
+-"L'applicazione «%s» fa parte della distribuzione principale di Debian. "
+-"Debian fornisce il supporto e gli aggiornamenti di sicurezza, che verranno "
++"L'applicazione «%s» fa parte della distribuzione principale di Debian. Debian "
++"fornisce il supporto e gli aggiornamenti di sicurezza, che verranno "
+ "abilitati."
+ 
+ #: ../AppInstall/distros/Debian.py:48
+@@ -800,7 +799,7 @@
+ 
+ #. %s is the name of the application
+ #: ../AppInstall/distros/Debian.py:56 ../AppInstall/distros/Ubuntu.py:63
+-#: ../AppInstall/distros/Ubuntu.py:114
++#: ../AppInstall/distros/Ubuntu.py:119
+ #, python-format
+ msgid ""
+ "The use, modification and distribution of %s is restricted by copyright or "
+@@ -949,13 +948,18 @@
+ "restrizioni?"
+ 
+ #: ../AppInstall/distros/Ubuntu.py:96
++
++msgid ""
++"%s is provided by a third party vendor from the Canonical partner repository."
++msgstr ""
++"%s è fornito da terze parti del repository partner Canonical."
++#: ../AppInstall/distros/Ubuntu.py:101
+ #, python-format
+ msgid "Canonical Ltd. provides technical support and security updates for %s"
+ msgstr ""
+-"Canonical Ltd. fornisce supporto tecnico e aggiornamenti di sicurezza per «%"
+-"s»"
++"Canonical Ltd. fornisce supporto tecnico e aggiornamenti di sicurezza per «%s»"
+ 
+-#: ../AppInstall/distros/Ubuntu.py:109
++#: ../AppInstall/distros/Ubuntu.py:114
+ msgid "This application is provided by the Ubuntu community."
+ msgstr "Questa applicazione è fornita dalla comunità di Ubuntu."
+ 
+@@ -963,13 +967,13 @@
+ msgid "Description"
+ msgstr "Descrizione"
+ 
+-#: ../AppInstall/widgets/AppDescView.py:75
++#: ../AppInstall/widgets/AppDescView.py:87
+ #, python-format
+ msgid "%s cannot be installed"
+ msgstr "Impossibile installare «%s»"
+ 
+ #. warn that this app is not available on this plattform
+-#: ../AppInstall/widgets/AppDescView.py:84
++#: ../AppInstall/widgets/AppDescView.py:96
+ #, python-format
+ msgid ""
+ "%s cannot be installed on your computer type (%s). Either the application "
+@@ -980,11 +984,18 @@
+ "L'applicazione richiede delle particolari impostazioni hardware oppure il "
+ "produttore ha deciso di non supportare il tipo di computer in uso."
+ 
+-#: ../AppInstall/widgets/AppDescView.py:96
++#: ../AppInstall/widgets/AppDescView.py:108
+ msgid "This application is bundled with the following applications: "
+ msgstr "Questa applicazione è fornita assieme alle seguenti: "
+ 
+-#: ../AppInstall/widgets/AppDescView.py:196
++#: ../AppInstall/widgets/AppDescView.py:208
++#, python-format
++msgid ""
++"\n"
++"Homepage: %s\n"
++msgstr ""
++
++#: ../AppInstall/widgets/AppDescView.py:210
+ #, python-format
+ msgid "Version: %s (%s)"
+ msgstr "Versione: %s (%s)"
+@@ -998,6 +1009,10 @@
+ msgid "Application"
+ msgstr "Applicazione"
+ 
++#~ msgid "To perform advanced tasks use the Synaptic package manager."
++#~ msgstr ""
++#~ "Per svolgere attività avanzate utilizzare il «Gestore pacchetti Synaptic»."
++
+ #~ msgid "%s integrates well into the Kubuntu desktop"
+ #~ msgstr "«%s» si integra all'interno del dekstop Kubuntu"
+ 
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/ja.po gnome-app-install-0.5.2.8.new/po/ja.po
+--- gnome-app-install-0.5.2.8/po/ja.po	2008-06-10 05:39:55.000000000 -0400
++++ gnome-app-install-0.5.2.8.new/po/ja.po	2008-10-29 16:56:25.000000000 -0400
+@@ -6,10 +6,10 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: gnome-app-install\n"
+-"Report-Msgid-Bugs-To: Sebastian Heinlein <sebi@glatzor.de>\n"
+-"POT-Creation-Date: 2008-01-04 20:30+0100\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2008-10-03 13:54-0400\n"
+ "PO-Revision-Date: 2007-10-10 14:25+0000\n"
+-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
++"Last-Translator: LIOX <EMAIL@ADDRESS>\n"
+ "Language-Team: Japanese <ja@li.org>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -19,7 +19,8 @@
+ 
+ #: ../data/gnome-app-install.schemas.in.h:1
+ msgid "Components that have been confirmed to install applications from"
+-msgstr ""
++msgstr "アプリケーションのインストール元が確認されたコンポーネント"
++
+ 
+ #: ../data/gnome-app-install.schemas.in.h:2
+ msgid "If true, the main window is maximized."
+@@ -181,38 +182,38 @@
+ msgid "Package Manager"
+ msgstr "パッケージ・マネージャ"
+ 
+-#: ../AppInstall/activation.py:112
++#: ../AppInstall/activation.py:116
+ msgid "no suitable application"
+ msgstr "適合するアプリケーションがありません"
+ 
+-#: ../AppInstall/activation.py:113
++#: ../AppInstall/activation.py:117
+ msgid ""
+ "No application suitable for automatic installation is available for handling "
+ "this kind of file."
+ msgstr ""
+ "この種類のファイルには自動インストールできるアプリケーションがありません。"
+ 
+-#: ../AppInstall/activation.py:116
++#: ../AppInstall/activation.py:120
+ msgid "no application found"
+ msgstr "アプリケーションがみつかりません"
+ 
+-#: ../AppInstall/activation.py:117
++#: ../AppInstall/activation.py:121
+ msgid "No application is known for this kind of file."
+ msgstr "この種のファイルはありません。"
+ 
+-#: ../AppInstall/activation.py:131 ../AppInstall/activation.py:289
++#: ../AppInstall/activation.py:134 ../AppInstall/activation.py:296
+ msgid "Searching for appropriate applications"
+ msgstr "適切なアプリケーションを検索"
+ 
+-#: ../AppInstall/activation.py:133 ../AppInstall/activation.py:192
++#: ../AppInstall/activation.py:136 ../AppInstall/activation.py:195
+ msgid "Please wait. This might take a minute or two."
+ msgstr "しばらくお待ちください。この作業には数分かかることがあります。"
+ 
+-#: ../AppInstall/activation.py:161
++#: ../AppInstall/activation.py:164
+ msgid "Search for suitable codec?"
+ msgstr "適合するコーデックを検索しますか？"
+ 
+-#: ../AppInstall/activation.py:162
++#: ../AppInstall/activation.py:165
+ msgid ""
+ "The required software to play this file is not installed. You need to "
+ "install suitable codecs to play media files. Do you want to search for a "
+@@ -226,46 +227,46 @@
+ "\n"
+ "検索されたソフトウェアも公式にはサポートされていません。"
+ 
+-#: ../AppInstall/activation.py:173
++#: ../AppInstall/activation.py:176
+ msgid "Invalid commandline"
+ msgstr "不正なコマンドライン"
+ 
+-#: ../AppInstall/activation.py:174
++#: ../AppInstall/activation.py:177
+ #, python-format
+ msgid "'%s' does not understand the commandline argument '%s'"
+ msgstr "'%s' はコマンドラインの引数 '%s' を理解しません"
+ 
+-#: ../AppInstall/activation.py:190
++#: ../AppInstall/activation.py:193
+ msgid "Searching for appropriate codecs"
+ msgstr "適切なコーデックを検索中"
+ 
+-#: ../AppInstall/activation.py:195 ../AppInstall/activation.py:294
++#: ../AppInstall/activation.py:198 ../AppInstall/activation.py:301
+ msgid "_Install"
+ msgstr "インストール(_I)"
+ 
+-#: ../AppInstall/activation.py:196
++#: ../AppInstall/activation.py:199
+ msgid "Install multimedia codecs"
+ msgstr "マルチメディア・コーデックをインストール"
+ 
+-#: ../AppInstall/activation.py:200
++#: ../AppInstall/activation.py:203
+ msgid "Codec"
+ msgstr "コーデック"
+ 
+-#: ../AppInstall/activation.py:231
++#: ../AppInstall/activation.py:234
+ msgid "additional codec installation declined"
+ msgstr "追加コーデックのインストールは失敗しました"
+ 
+-#: ../AppInstall/activation.py:235
++#: ../AppInstall/activation.py:238
+ msgid "additional codec installation failed"
+ msgstr "追加コーデックのインストールに失敗"
+ 
+ #. TRANSLATORS: %s represents a file path
+-#: ../AppInstall/activation.py:256
++#: ../AppInstall/activation.py:263
+ #, python-format
+ msgid "\"%s\" cannot be opened"
+ msgstr "\"%s\" を開けませんでした。"
+ 
+-#: ../AppInstall/activation.py:291
++#: ../AppInstall/activation.py:298
+ #, python-format
+ msgid ""
+ "A list of applications that can handle documents of the type '%s' will be "
+@@ -273,36 +274,36 @@
+ msgstr "'%s' ドキュメントを処理できるアプリケーションのリストを作成します"
+ 
+ #. TRANSLATORS: %s represents a file path
+-#: ../AppInstall/activation.py:297
++#: ../AppInstall/activation.py:304
+ #, python-format
+ msgid "Install applications to open \"%s\""
+ msgstr "'%s' を開くためにアプリケーションをインストール"
+ 
+-#: ../AppInstall/activation.py:300
++#: ../AppInstall/activation.py:307
+ msgid "Install applications"
+ msgstr "アプリケーションのインストール"
+ 
+-#: ../AppInstall/activation.py:311
++#: ../AppInstall/activation.py:318
+ msgid "_Search"
+ msgstr "検索(_S)"
+ 
+-#: ../AppInstall/activation.py:345
++#: ../AppInstall/activation.py:352
+ msgid "Searching for extensions"
+ msgstr "拡張を検索中"
+ 
+-#: ../AppInstall/activation.py:346
++#: ../AppInstall/activation.py:353
+ msgid "Extensions allow you to add new features to your application."
+ msgstr "拡張はアプリケーションに新しい機能を追加します。"
+ 
+-#: ../AppInstall/activation.py:348
++#: ../AppInstall/activation.py:355
+ msgid "Install/Remove Extensions"
+ msgstr "拡張の追加と削除"
+ 
+-#: ../AppInstall/activation.py:350
++#: ../AppInstall/activation.py:357
+ msgid "Extension"
+ msgstr "拡張"
+ 
+-#: ../AppInstall/AppInstall.py:174
++#: ../AppInstall/AppInstall.py:173
+ msgid ""
+ "To install an application check the box next to the application. Uncheck the "
+ "box to remove the application."
+@@ -311,37 +312,41 @@
+ "ボックスをチェックしてください。アプリケーションを削除するにはチェックを外し"
+ "て下さい。"
+ 
+-#: ../AppInstall/AppInstall.py:177
+-msgid "To perform advanced tasks use the Synaptic package manager."
+-msgstr ""
+-"詳細なタスクを行うには、Synapticパッケージマネージャを使用してください。"
+-
+-#: ../AppInstall/AppInstall.py:179
++#: ../AppInstall/AppInstall.py:176
+ msgid "Quick Introduction"
+ msgstr "簡単な紹介"
+ 
+-#: ../AppInstall/AppInstall.py:225
+-#, fuzzy
++#. Just two filters needed, one to show all apps and one to show only installed apps
++#: ../AppInstall/AppInstall.py:200 ../AppInstall/distros/Debian.py:15
++#: ../AppInstall/distros/Default.py:13 ../AppInstall/distros/Ubuntu.py:15
++msgid "All available applications"
++msgstr "全ての利用可能なアプリケーション"
++
++#: ../AppInstall/AppInstall.py:201
++
++msgid "Show all applications that are available for your computer"
++msgstr "コンピュータにインストールされているアプリケーションのみ表示"
++#: ../AppInstall/AppInstall.py:206
++
+ msgid "Installed applications only"
+ msgstr "インストール済みのアプリケーション"
+-
+-#: ../AppInstall/AppInstall.py:226
++#: ../AppInstall/AppInstall.py:207
+ msgid "Show only applications that are installed on your computer"
+ msgstr "コンピュータにインストールされているアプリケーションのみ表示"
+ 
+-#: ../AppInstall/AppInstall.py:318
++#: ../AppInstall/AppInstall.py:299
+ msgid "Error reading the addon CD"
+ msgstr "アドオンCDの読み取りエラー"
+ 
+-#: ../AppInstall/AppInstall.py:319
++#: ../AppInstall/AppInstall.py:300
+ msgid "The addon CD may be corrupt "
+ msgstr "このアドオンCDはおそらく壊れています "
+ 
+-#: ../AppInstall/AppInstall.py:453
+-msgid "The list of applications is not availabe"
+-msgstr "アプリケーションのリストが取得できません"
++#: ../AppInstall/AppInstall.py:434
+ 
+-#: ../AppInstall/AppInstall.py:454
++msgid "The list of applications is not available"
++msgstr "アプリケーションのリストが取得できません"
++#: ../AppInstall/AppInstall.py:435
+ msgid ""
+ "Click on 'Reload' to load it. To reload the list you need a working internet "
+ "connection. "
+@@ -349,12 +354,12 @@
+ "'再読込' をクリックしてください。リストの再読み込みにはインターネットへの接続"
+ "が必要です。 "
+ 
+-#: ../AppInstall/AppInstall.py:473
++#: ../AppInstall/AppInstall.py:454
+ #, python-format
+ msgid "%s cannot be installed on your computer type (%s)"
+ msgstr "%s はあなたのコンピュータの種類 (%s) にはインストールできません"
+ 
+-#: ../AppInstall/AppInstall.py:476
++#: ../AppInstall/AppInstall.py:457
+ msgid ""
+ "Either the application requires special hardware features or the vendor "
+ "decided to not support your computer type."
+@@ -362,12 +367,12 @@
+ "アプリケーションが特別なハードウェア機能を必要としているか、ベンダがこの種類"
+ "のコンピュータをサポートしていません。"
+ 
+-#: ../AppInstall/AppInstall.py:517
++#: ../AppInstall/AppInstall.py:498
+ #, python-format
+ msgid "Cannot install '%s'"
+ msgstr "'%s' をインストールできません"
+ 
+-#: ../AppInstall/AppInstall.py:518
++#: ../AppInstall/AppInstall.py:499
+ #, python-format
+ msgid ""
+ "This application conflicts with other installed software. To install '%s' "
+@@ -381,12 +386,12 @@
+ "\n"
+ "この競合を解決するため、 'Synaptic' パッケージマネージャに切り替えます。"
+ 
+-#: ../AppInstall/AppInstall.py:579
++#: ../AppInstall/AppInstall.py:560
+ #, python-format
+ msgid "Cannot remove '%s'"
+ msgstr "'%s' を削除できません"
+ 
+-#: ../AppInstall/AppInstall.py:580
++#: ../AppInstall/AppInstall.py:561
+ #, python-format
+ msgid ""
+ "One or more applications depend on %s. To remove %s and the dependent "
+@@ -395,37 +400,36 @@
+ "１つ以上のアプリケーションが %s に依存しています。%s と依存したアプリケーショ"
+ "ンを削除するには、Synapticパッケージマネージャを使用してください。"
+ 
+-#: ../AppInstall/AppInstall.py:669
++#: ../AppInstall/AppInstall.py:650
+ msgid "Confirm installation of restricted software"
+ msgstr "制限付きソフトウェアの確認"
+ 
+-#: ../AppInstall/AppInstall.py:670
++#: ../AppInstall/AppInstall.py:651
++
+ msgid ""
+ "The use of this software may be restricted in some countries. You must "
+ "verify that one of the following is true:\n"
+ "\n"
+-"• These restrictions do not apply in your country of legal residence\n"
+-"• You have permission to use this software (for  example, a patent license)\n"
+-"• You are using this software for research purposes only"
++"* These restrictions do not apply in your country of legal residence\n"
++"* You have permission to use this software (for  example, a patent license)\n"
++"* You are using this software for research purposes only"
+ msgstr ""
+ "このソフトウェアの利用は、幾つかの国では制限されているかもしれません。次のい"
+-"ずれかに該当することを確認してください:\n"
++"ずれかに該当することを確認してください：\n"
+ "\n"
+-"• あなたの国の法律では、これらの制限は該当しない。\n"
+-"• このソフトウェアの利用許可を受けている（たとえば、特許のライセンスを受けて"
+-"いる）。\n"
+-"• 研究・調査のみを目的としてこれらのソフトウェアを利用する。"
+-
+-#: ../AppInstall/AppInstall.py:680
++"* あなたの国の法律では、これらの制限は該当しない\n"
++"* このソフトウェアの利用許可を受けている（たとえば、特許のライセンスを受けている）\n"
++"* 研究・調査のみを目的としてこれらのソフトウェアを利用する"
++#: ../AppInstall/AppInstall.py:661
+ msgid "_Confirm"
+ msgstr "確認(_C)"
+ 
+-#: ../AppInstall/AppInstall.py:719 ../AppInstall/DialogProprietary.py:23
++#: ../AppInstall/AppInstall.py:700 ../AppInstall/DialogProprietary.py:23
+ #, python-format
+ msgid "Enable the installation of software from %s?"
+ msgstr "%s からのインストールを有効にしますか？"
+ 
+-#: ../AppInstall/AppInstall.py:721
++#: ../AppInstall/AppInstall.py:702
+ #, python-format
+ msgid ""
+ "%s is provided by a third party vendor. The third party vendor is "
+@@ -434,22 +438,22 @@
+ "%s はサードパーティベンダ製です。サードパーティベンダに、サポートとセキュリ"
+ "ティアップデートの責任があります。"
+ 
+-#: ../AppInstall/AppInstall.py:725 ../AppInstall/DialogProprietary.py:26
++#: ../AppInstall/AppInstall.py:706 ../AppInstall/DialogProprietary.py:26
+ msgid "You need a working internet connection to continue."
+ msgstr "続行するにはインターネットに接続する必要があります。"
+ 
+-#: ../AppInstall/AppInstall.py:729 ../AppInstall/DialogProprietary.py:34
++#: ../AppInstall/AppInstall.py:710 ../AppInstall/DialogProprietary.py:34
+ msgid "_Enable"
+ msgstr "有効(_E)"
+ 
+ #. show an error dialog if something went wrong with the cache
+-#: ../AppInstall/AppInstall.py:953
++#: ../AppInstall/AppInstall.py:934
+ msgid "Failed to check for installed and available applications"
+ msgstr ""
+ "インストールした、ないしインストールできるアプリケーションのチェックに失敗し"
+ "ました。"
+ 
+-#: ../AppInstall/AppInstall.py:954
++#: ../AppInstall/AppInstall.py:935
+ msgid ""
+ "This is a major failure of your software management system. Please check for "
+ "broken packages with synaptic, check the file permissions and correctness of "
+@@ -462,25 +466,25 @@
+ "します。次のコマンドを使ってください。'sudo apt-get update' と 'sudo apt-get "
+ "install -f'"
+ 
+-#: ../AppInstall/AppInstall.py:1005
++#: ../AppInstall/AppInstall.py:986
+ msgid "Apply changes to installed applications before closing?"
+ msgstr "閉じる前にアプリケーションをインストールしますか？"
+ 
+-#: ../AppInstall/AppInstall.py:1006
++#: ../AppInstall/AppInstall.py:987
+ msgid "If you do not apply your changes they will be lost permanently."
+ msgstr "適用しなければ変更は破棄されます。"
+ 
+-#: ../AppInstall/AppInstall.py:1010
++#: ../AppInstall/AppInstall.py:991
+ msgid "_Close Without Applying"
+ msgstr "適用せずに閉じる(_C)"
+ 
+ #. FIXME: move this inside the dialog class, we show a different
+ #. text for a quit dialog and a approve dialog
+-#: ../AppInstall/AppInstall.py:1071
++#: ../AppInstall/AppInstall.py:1053
+ msgid "Apply the following changes?"
+ msgstr "以下の変更を適用しますか？"
+ 
+-#: ../AppInstall/AppInstall.py:1072
++#: ../AppInstall/AppInstall.py:1054
+ msgid ""
+ "Please take a final look through the list of applications that will be "
+ "installed or removed."
+@@ -488,29 +492,29 @@
+ "インストールもしくは削除されるアプリケーションのリストを、最終確認してくださ"
+ "い。"
+ 
+-#: ../AppInstall/AppInstall.py:1281
++#: ../AppInstall/AppInstall.py:1263
+ msgid "There is no matching application available."
+ msgstr "利用可能なアプリケーションにマッチしませんでした。"
+ 
+ #. TRANSLATORS: %s represents a filter name
+-#: ../AppInstall/AppInstall.py:1291
++#: ../AppInstall/AppInstall.py:1273
+ #, python-format
+ msgid "To broaden your search, choose \"%s\"."
+ msgstr "検索対象を広げるには、\"%s\" を選択してください。"
+ 
+ #. TRANSLATORS: %s represents a filter name
+-#: ../AppInstall/AppInstall.py:1295
++#: ../AppInstall/AppInstall.py:1277
+ #, python-format
+ msgid "To broaden your search, choose \"%s\" or \"%s\"."
+ msgstr "検索対象を広げるには、\"%s\" または \"%s\" を選択してください。"
+ 
+ #. TRANSLATORS: Show refers to the Show: combobox
+-#: ../AppInstall/AppInstall.py:1301
++#: ../AppInstall/AppInstall.py:1283
+ msgid "To broaden your search, choose a different \"Show\" item."
+ msgstr "検索対象を広げるには、異なった\"表示\" アイテムを選択してください。"
+ 
+ #. TRANSLATORS: All refers to the All category in the left list
+-#: ../AppInstall/AppInstall.py:1307
++#: ../AppInstall/AppInstall.py:1289
+ msgid "To broaden your search, choose 'All' categories."
+ msgstr "検索対象を広げるには、'全て'のカテゴリを選択してください。"
+ 
+@@ -519,59 +523,59 @@
+ msgid "Failed to open '%s'"
+ msgstr "'%s' を開くのに失敗しました"
+ 
+-#: ../AppInstall/CoreMenu.py:127
++#: ../AppInstall/CoreMenu.py:128
+ msgid "Applications"
+ msgstr "アプリケーション"
+ 
+-#: ../AppInstall/DialogComplete.py:128
++#: ../AppInstall/DialogComplete.py:131
+ msgid "Software installation failed"
+ msgstr "ソフトウェアのインストールに失敗しました"
+ 
+-#: ../AppInstall/DialogComplete.py:129
++#: ../AppInstall/DialogComplete.py:132
+ msgid ""
+ "There has been a problem during the installation of the following pieces of "
+ "software."
+ msgstr "以下のソフトウェアのインストール中に問題がありました。"
+ 
+-#: ../AppInstall/DialogComplete.py:131 ../AppInstall/DialogComplete.py:146
+-#: ../AppInstall/DialogComplete.py:162 ../AppInstall/DialogComplete.py:190
++#: ../AppInstall/DialogComplete.py:134 ../AppInstall/DialogComplete.py:149
++#: ../AppInstall/DialogComplete.py:165 ../AppInstall/DialogComplete.py:193
+ msgid "Add/Remove More Software"
+ msgstr "続ける"
+ 
+-#: ../AppInstall/DialogComplete.py:133
++#: ../AppInstall/DialogComplete.py:136
+ msgid "Application installation failed"
+ msgstr "アプリケーションのインストールに失敗しました"
+ 
+-#: ../AppInstall/DialogComplete.py:134
++#: ../AppInstall/DialogComplete.py:137
+ msgid ""
+ "There has been a problem during the installation of the following "
+ "applications."
+ msgstr "以下のアプリケーションのインストール中に問題がありました。"
+ 
+-#: ../AppInstall/DialogComplete.py:143
++#: ../AppInstall/DialogComplete.py:146
+ msgid "Software could not be removed"
+ msgstr "ソフトウェアを削除できません"
+ 
+-#: ../AppInstall/DialogComplete.py:144
++#: ../AppInstall/DialogComplete.py:147
+ msgid ""
+ "There has been a problem during the removal of the following pieces of "
+ "software."
+ msgstr "以下のソフトウェアのアンインストール中に問題がありました。"
+ 
+-#: ../AppInstall/DialogComplete.py:148
++#: ../AppInstall/DialogComplete.py:151
+ msgid "Not all applications could be removed"
+ msgstr "すべてのアプリケーションを削除で来ませんでした"
+ 
+-#: ../AppInstall/DialogComplete.py:149
++#: ../AppInstall/DialogComplete.py:152
+ msgid ""
+ "There has been a problem during the removal of the following applications."
+ msgstr "以下のアプリケーションのアンインストール中に問題がありました。"
+ 
+-#: ../AppInstall/DialogComplete.py:159
++#: ../AppInstall/DialogComplete.py:162
+ msgid "Installation and removal of software failed"
+ msgstr "ソフトウェアのインストールと削除に失敗しました"
+ 
+-#: ../AppInstall/DialogComplete.py:160
++#: ../AppInstall/DialogComplete.py:163
+ msgid ""
+ "There has been a problem during the installation or removal of the following "
+ "pieces of software."
+@@ -579,11 +583,11 @@
+ "以下のソフトウェアのインストール、もしくはアンインストール中に問題がありまし"
+ "た。"
+ 
+-#: ../AppInstall/DialogComplete.py:164
++#: ../AppInstall/DialogComplete.py:167
+ msgid "Installation and removal of applications failed"
+ msgstr "アプリケーションのインストールと削除に失敗しました"
+ 
+-#: ../AppInstall/DialogComplete.py:165
++#: ../AppInstall/DialogComplete.py:168
+ msgid ""
+ "There has been a problem during the installation or removal of the following "
+ "applications."
+@@ -591,40 +595,40 @@
+ "以下のアプリケーションのインストール、もしくはアンインストール中に問題があり"
+ "ました。"
+ 
+-#: ../AppInstall/DialogComplete.py:173
++#: ../AppInstall/DialogComplete.py:176
+ msgid "New application has been installed"
+ msgstr "新しいアプリケーションがインストールされました"
+ 
+-#: ../AppInstall/DialogComplete.py:174
++#: ../AppInstall/DialogComplete.py:177
+ msgid "New applications have been installed"
+ msgstr "新しいアプリケーションがインストールされました"
+ 
+-#: ../AppInstall/DialogComplete.py:179
++#: ../AppInstall/DialogComplete.py:182
+ msgid ""
+ "To start a newly installed application, choose it from the applications menu."
+ msgstr ""
+ "新しいアプリケーションを起動したい場合は、アプリケーションのメニューから選択"
+ "してください。"
+ 
+-#: ../AppInstall/DialogComplete.py:182
++#: ../AppInstall/DialogComplete.py:185
+ msgid "To start a newly installed application double click on it."
+ msgstr ""
+ "新しくインストールしたアプリケーションを起動するため、ここをダブルクリックし"
+ "てください。"
+ 
+-#: ../AppInstall/DialogComplete.py:186
++#: ../AppInstall/DialogComplete.py:189
+ msgid "Software has been installed successfully"
+ msgstr "ソフトウェアのインストールに成功しました。"
+ 
+-#: ../AppInstall/DialogComplete.py:187
++#: ../AppInstall/DialogComplete.py:190
+ msgid "Do you want to install or remove further software?"
+ msgstr "ほかのソフトウェアも削除しますか？"
+ 
+-#: ../AppInstall/DialogComplete.py:192
++#: ../AppInstall/DialogComplete.py:195
+ msgid "Applications have been removed successfully"
+ msgstr "アプリケーションの削除に成功しました"
+ 
+-#: ../AppInstall/DialogComplete.py:193
++#: ../AppInstall/DialogComplete.py:196
+ msgid "Do you want to install or remove further applications?"
+ msgstr "ほかのアプリケーションのインストールと削除もしますか？"
+ 
+@@ -681,32 +685,27 @@
+ msgid "Accept the license terms and install the software"
+ msgstr "利用条件に同意し、ソフトウェアをインストールする"
+ 
+-#: ../AppInstall/Menu.py:100
++#: ../AppInstall/Menu.py:98
+ msgid "Loading cache..."
+ msgstr "キャッシュを読み込んでいます..."
+ 
+-#: ../AppInstall/Menu.py:109
++#: ../AppInstall/Menu.py:107
+ msgid "Collecting application data..."
+ msgstr "アプリケーションのデータを集めています..."
+ 
+-#: ../AppInstall/Menu.py:311
++#: ../AppInstall/Menu.py:309
+ msgid "Loading applications..."
+ msgstr "アプリケーションを読み込んでいます..."
+ 
+-#: ../AppInstall/Menu.py:315 ../AppInstall/Menu.py:318
++#: ../AppInstall/Menu.py:313 ../AppInstall/Menu.py:316
+ msgid "All"
+ msgstr "すべて"
+ 
+-#: ../AppInstall/Menu.py:327
++#: ../AppInstall/Menu.py:325
+ #, python-format
+ msgid "Loading %s..."
+ msgstr "%s を読み込んでいます..."
+ 
+-#: ../AppInstall/distros/Debian.py:15 ../AppInstall/distros/Default.py:13
+-#: ../AppInstall/distros/Ubuntu.py:15
+-msgid "All available applications"
+-msgstr "全ての利用可能なアプリケーション"
+-
+ #: ../AppInstall/distros/Debian.py:16
+ msgid ""
+ "Show all applications including ones which are possibly restricted by law or "
+@@ -787,7 +786,7 @@
+ 
+ #. %s is the name of the application
+ #: ../AppInstall/distros/Debian.py:56 ../AppInstall/distros/Ubuntu.py:63
+-#: ../AppInstall/distros/Ubuntu.py:114
++#: ../AppInstall/distros/Ubuntu.py:119
+ #, python-format
+ msgid ""
+ "The use, modification and distribution of %s is restricted by copyright or "
+@@ -928,12 +927,18 @@
+ msgstr "サポートされず、制限のあるソフトウェアのインストールを有効にしますか？"
+ 
+ #: ../AppInstall/distros/Ubuntu.py:96
++
++msgid ""
++"%s is provided by a third party vendor from the Canonical partner repository."
++msgstr ""
++"%s はサードパーティベンダー製です。"
++#: ../AppInstall/distros/Ubuntu.py:101
+ #, python-format
+ msgid "Canonical Ltd. provides technical support and security updates for %s"
+ msgstr ""
+ "Canonical社が %s の技術サポートとセキュリティアップデートを提供しています"
+ 
+-#: ../AppInstall/distros/Ubuntu.py:109
++#: ../AppInstall/distros/Ubuntu.py:114
+ msgid "This application is provided by the Ubuntu community."
+ msgstr "このアプリケーションはUbuntuコミュニティによって提供されています。"
+ 
+@@ -941,13 +946,13 @@
+ msgid "Description"
+ msgstr "詳細"
+ 
+-#: ../AppInstall/widgets/AppDescView.py:75
++#: ../AppInstall/widgets/AppDescView.py:87
+ #, python-format
+ msgid "%s cannot be installed"
+ msgstr "%s をインストールすることはできません"
+ 
+ #. warn that this app is not available on this plattform
+-#: ../AppInstall/widgets/AppDescView.py:84
++#: ../AppInstall/widgets/AppDescView.py:96
+ #, python-format
+ msgid ""
+ "%s cannot be installed on your computer type (%s). Either the application "
+@@ -958,11 +963,18 @@
+ "が特別なハードウェア機能を必要としているか、ベンダがこの種類のコンピュータを"
+ "サポートしていません。"
+ 
+-#: ../AppInstall/widgets/AppDescView.py:96
++#: ../AppInstall/widgets/AppDescView.py:108
+ msgid "This application is bundled with the following applications: "
+ msgstr "このアプリケーションは以下のアプリケーションにまとめられています: "
+ 
+-#: ../AppInstall/widgets/AppDescView.py:196
++#: ../AppInstall/widgets/AppDescView.py:208
++#, python-format
++msgid ""
++"\n"
++"Homepage: %s\n"
++msgstr ""
++
++#: ../AppInstall/widgets/AppDescView.py:210
+ #, python-format
+ msgid "Version: %s (%s)"
+ msgstr "バージョン: %s (%s)"
+@@ -976,6 +988,10 @@
+ msgid "Application"
+ msgstr "アプリケーション"
+ 
++#~ msgid "To perform advanced tasks use the Synaptic package manager."
++#~ msgstr ""
++#~ "詳細なタスクを行うには、Synapticパッケージマネージャを使用してください。"
++
+ #~ msgid "%s integrates well into the Kubuntu desktop"
+ #~ msgstr "%s はKubuntuデスクトップに統合されています"
+ 
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/ko.po gnome-app-install-0.5.2.8.new/po/ko.po
+--- gnome-app-install-0.5.2.8/po/ko.po	2008-06-10 05:39:55.000000000 -0400
++++ gnome-app-install-0.5.2.8.new/po/ko.po	2008-10-29 16:56:25.000000000 -0400
+@@ -6,10 +6,10 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: gnome-app-install\n"
+-"Report-Msgid-Bugs-To: Sebastian Heinlein <sebi@glatzor.de>\n"
+-"POT-Creation-Date: 2008-01-04 20:30+0100\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2008-10-03 13:54-0400\n"
+ "PO-Revision-Date: 2007-11-01 12:50+0000\n"
+-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
++"Last-Translator: LIOX <EMAIL@ADDRESS>\n"
+ "Language-Team: Korean <ko@li.org>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -44,7 +44,7 @@
+ "party applications 5 : - 6 : show only installed applications"
+ msgstr ""
+ "가능한 값: 0 : 모든 이용가능한 프로그램 표시 1 : 자유 소프트웨어만 표시 2 : "
+-"- 3 : 지원되는 프로그램만 표시 4 : 써드파티 프로그램만 표시 5 : - 6 : 설치된 "
++"- 3 : 지원되는 프로그램만 표시 4 : 타사 프로그램만 표시 5 : - 6 : 설치된 "
+ "프로그램만 표시"
+ 
+ #: ../data/gnome-app-install.schemas.in.h:7
+@@ -96,7 +96,7 @@
+ msgstr ""
+ "<big><b>설치되어 이용할 수 있는 프로그램 체크</b></big>\n"
+ "\n"
+-"우분투와 써드 파티 업체들은 여러분의 시스템에 설치할 수 있는 방대한 양의 프로"
++"우분투와 타사 업체들은 여러분의 시스템에 설치할 수 있는 방대한 양의 프로"
+ "그램들을 제공합니다."
+ 
+ #: ../data/gnome-app-install.glade.h:6
+@@ -131,7 +131,7 @@
+ 
+ #: ../data/gnome-app-install.glade.h:14
+ msgid "Search:"
+-msgstr "찾기:"
++msgstr "검색:"
+ 
+ #: ../data/gnome-app-install.glade.h:15
+ msgid "Show:"
+@@ -180,37 +180,37 @@
+ msgid "Package Manager"
+ msgstr "꾸러미 관리자"
+ 
+-#: ../AppInstall/activation.py:112
++#: ../AppInstall/activation.py:116
+ msgid "no suitable application"
+ msgstr "적절한 프로그램 없음"
+ 
+-#: ../AppInstall/activation.py:113
++#: ../AppInstall/activation.py:117
+ msgid ""
+ "No application suitable for automatic installation is available for handling "
+ "this kind of file."
+ msgstr "이런 종류의 파일을 처리하도록 자동 설치할 프로그램이 없습니다."
+ 
+-#: ../AppInstall/activation.py:116
++#: ../AppInstall/activation.py:120
+ msgid "no application found"
+ msgstr "프로그램을 찾을 수 없음"
+ 
+-#: ../AppInstall/activation.py:117
++#: ../AppInstall/activation.py:121
+ msgid "No application is known for this kind of file."
+ msgstr "이런 종류의 파일에 대해 알려진 프로그램이 없습니다."
+ 
+-#: ../AppInstall/activation.py:131 ../AppInstall/activation.py:289
++#: ../AppInstall/activation.py:134 ../AppInstall/activation.py:296
+ msgid "Searching for appropriate applications"
+ msgstr "적절한 프로그램 찾기"
+ 
+-#: ../AppInstall/activation.py:133 ../AppInstall/activation.py:192
++#: ../AppInstall/activation.py:136 ../AppInstall/activation.py:195
+ msgid "Please wait. This might take a minute or two."
+ msgstr "잠시만 기다려 주십시오. 이 작업은 1~2분 정도 소요될 수 있습니다."
+ 
+-#: ../AppInstall/activation.py:161
++#: ../AppInstall/activation.py:164
+ msgid "Search for suitable codec?"
+ msgstr "적절한 코덱을 찾으십니까?"
+ 
+-#: ../AppInstall/activation.py:162
++#: ../AppInstall/activation.py:165
+ msgid ""
+ "The required software to play this file is not installed. You need to "
+ "install suitable codecs to play media files. Do you want to search for a "
+@@ -224,46 +224,46 @@
+ "\n"
+ "검색 과정은 공식적으로 지원하지 않는 소프트웨어들도 포함할 것입니다."
+ 
+-#: ../AppInstall/activation.py:173
++#: ../AppInstall/activation.py:176
+ msgid "Invalid commandline"
+ msgstr "올바르지 않은 명령행"
+ 
+-#: ../AppInstall/activation.py:174
++#: ../AppInstall/activation.py:177
+ #, python-format
+ msgid "'%s' does not understand the commandline argument '%s'"
+ msgstr "'%s' 는 명령행 인수 '%s' (을)를 알지 못합니다."
+ 
+-#: ../AppInstall/activation.py:190
++#: ../AppInstall/activation.py:193
+ msgid "Searching for appropriate codecs"
+ msgstr "적절한 코덱 찾기"
+ 
+-#: ../AppInstall/activation.py:195 ../AppInstall/activation.py:294
++#: ../AppInstall/activation.py:198 ../AppInstall/activation.py:301
+ msgid "_Install"
+ msgstr "설치(_I)"
+ 
+-#: ../AppInstall/activation.py:196
++#: ../AppInstall/activation.py:199
+ msgid "Install multimedia codecs"
+ msgstr "멀티미디어 코덱 설치"
+ 
+-#: ../AppInstall/activation.py:200
++#: ../AppInstall/activation.py:203
+ msgid "Codec"
+ msgstr "코덱"
+ 
+-#: ../AppInstall/activation.py:231
++#: ../AppInstall/activation.py:234
+ msgid "additional codec installation declined"
+ msgstr "추가 코덱 설치 거절됨"
+ 
+-#: ../AppInstall/activation.py:235
++#: ../AppInstall/activation.py:238
+ msgid "additional codec installation failed"
+ msgstr "추가 코덱 설치 실패"
+ 
+ #. TRANSLATORS: %s represents a file path
+-#: ../AppInstall/activation.py:256
++#: ../AppInstall/activation.py:263
+ #, python-format
+ msgid "\"%s\" cannot be opened"
+ msgstr "\"%s\" (을)를 열 수 없음"
+ 
+-#: ../AppInstall/activation.py:291
++#: ../AppInstall/activation.py:298
+ #, python-format
+ msgid ""
+ "A list of applications that can handle documents of the type '%s' will be "
+@@ -271,36 +271,36 @@
+ msgstr "'%s' 형식의 문서를 처리할 수 있는 프로그램의 목록이 생성될 것입니다."
+ 
+ #. TRANSLATORS: %s represents a file path
+-#: ../AppInstall/activation.py:297
++#: ../AppInstall/activation.py:304
+ #, python-format
+ msgid "Install applications to open \"%s\""
+ msgstr "\"%s\" (을)를 열기 위한 프로그램 설치"
+ 
+-#: ../AppInstall/activation.py:300
++#: ../AppInstall/activation.py:307
+ msgid "Install applications"
+ msgstr "프로그램 설치"
+ 
+-#: ../AppInstall/activation.py:311
++#: ../AppInstall/activation.py:318
+ msgid "_Search"
+-msgstr "찾기(_S)"
++msgstr "검색(_S)"
+ 
+-#: ../AppInstall/activation.py:345
++#: ../AppInstall/activation.py:352
+ msgid "Searching for extensions"
+ msgstr "확장 기능 찾기"
+ 
+-#: ../AppInstall/activation.py:346
++#: ../AppInstall/activation.py:353
+ msgid "Extensions allow you to add new features to your application."
+ msgstr "확장 기능은 프로그램에 새로운 기능을 추가해 줍니다."
+ 
+-#: ../AppInstall/activation.py:348
++#: ../AppInstall/activation.py:355
+ msgid "Install/Remove Extensions"
+ msgstr "확장 기능 설치/제거"
+ 
+-#: ../AppInstall/activation.py:350
++#: ../AppInstall/activation.py:357
+ msgid "Extension"
+ msgstr "확장 기능"
+ 
+-#: ../AppInstall/AppInstall.py:174
++#: ../AppInstall/AppInstall.py:173
+ msgid ""
+ "To install an application check the box next to the application. Uncheck the "
+ "box to remove the application."
+@@ -308,36 +308,41 @@
+ "프로그램을 설치하시려면 프로그램 다음의 상자에 체크하십시오. 프로그램을 제거"
+ "하시려면 상자의 체크를 해제하십시오."
+ 
+-#: ../AppInstall/AppInstall.py:177
+-msgid "To perform advanced tasks use the Synaptic package manager."
+-msgstr "전문적인 작업이 필요하다면 시냅틱 꾸러미 관리자를 이용하세요."
+-
+-#: ../AppInstall/AppInstall.py:179
++#: ../AppInstall/AppInstall.py:176
+ msgid "Quick Introduction"
+ msgstr "간단한 소개"
+ 
+-#: ../AppInstall/AppInstall.py:225
+-#, fuzzy
+-msgid "Installed applications only"
+-msgstr "설치된 프로그램"
++#. Just two filters needed, one to show all apps and one to show only installed apps
++#: ../AppInstall/AppInstall.py:200 ../AppInstall/distros/Debian.py:15
++#: ../AppInstall/distros/Default.py:13 ../AppInstall/distros/Ubuntu.py:15
++msgid "All available applications"
++msgstr "이용가능한 모든 프로그램"
++
++#: ../AppInstall/AppInstall.py:201
+ 
+-#: ../AppInstall/AppInstall.py:226
++msgid "Show all applications that are available for your computer"
++msgstr "컴퓨터에서 사용할 수 있는 응용프로그램을 모두 보여줍니다."
++#: ../AppInstall/AppInstall.py:206
++
++msgid "Installed applications only"
++msgstr "설치된 응용프로그램만"
++#: ../AppInstall/AppInstall.py:207
+ msgid "Show only applications that are installed on your computer"
+ msgstr "여러분의 컴퓨터에 이미 설치된 프로그램만을 보여줍니다"
+ 
+-#: ../AppInstall/AppInstall.py:318
++#: ../AppInstall/AppInstall.py:299
+ msgid "Error reading the addon CD"
+ msgstr "애드온 CD를 읽는 중 오류"
+ 
+-#: ../AppInstall/AppInstall.py:319
++#: ../AppInstall/AppInstall.py:300
+ msgid "The addon CD may be corrupt "
+ msgstr "애드온 CD가 손상된 것 같습니다 "
+ 
+-#: ../AppInstall/AppInstall.py:453
+-msgid "The list of applications is not availabe"
+-msgstr "프로그램 목록을 볼 수 없습니다"
++#: ../AppInstall/AppInstall.py:434
+ 
+-#: ../AppInstall/AppInstall.py:454
++msgid "The list of applications is not available"
++msgstr "응용프로그램 목록을 볼 수 없습니다."
++#: ../AppInstall/AppInstall.py:435
+ msgid ""
+ "Click on 'Reload' to load it. To reload the list you need a working internet "
+ "connection. "
+@@ -345,12 +350,12 @@
+ "'새로 고침'을 클릭하여 불러옵니다. 목록을 다시 읽으려면 인터넷에 연결되어 있"
+ "어야 합니다. "
+ 
+-#: ../AppInstall/AppInstall.py:473
++#: ../AppInstall/AppInstall.py:454
+ #, python-format
+ msgid "%s cannot be installed on your computer type (%s)"
+ msgstr "%s(은)는 여러분이 사용하는 컴퓨터 타입(%s)에 설치될 수 없습니다."
+ 
+-#: ../AppInstall/AppInstall.py:476
++#: ../AppInstall/AppInstall.py:457
+ msgid ""
+ "Either the application requires special hardware features or the vendor "
+ "decided to not support your computer type."
+@@ -358,12 +363,12 @@
+ "프로그램이 특별한 하드웨어 기능을 필요로 하거나, 제작사에서 여러분이 사용하"
+ "는 컴퓨터 타입을 지원하지 않도록 결정한 경우입니다."
+ 
+-#: ../AppInstall/AppInstall.py:517
++#: ../AppInstall/AppInstall.py:498
+ #, python-format
+ msgid "Cannot install '%s'"
+ msgstr "'%s' (을)를 설치할 수 없습니다"
+ 
+-#: ../AppInstall/AppInstall.py:518
++#: ../AppInstall/AppInstall.py:499
+ #, python-format
+ msgid ""
+ "This application conflicts with other installed software. To install '%s' "
+@@ -376,12 +381,12 @@
+ "\n"
+ "'시냅틱' 꾸러미 관리자로 전환하여 이 충돌을 해결하십시오."
+ 
+-#: ../AppInstall/AppInstall.py:579
++#: ../AppInstall/AppInstall.py:560
+ #, python-format
+ msgid "Cannot remove '%s'"
+ msgstr "'%s' (을)를 제거할 수 없습니다."
+ 
+-#: ../AppInstall/AppInstall.py:580
++#: ../AppInstall/AppInstall.py:561
+ #, python-format
+ msgid ""
+ "One or more applications depend on %s. To remove %s and the dependent "
+@@ -390,58 +395,58 @@
+ "하나 이상의 프로그램이 %s에 의존하고 있습니다. %s(와)과 의존적인 프로그램들"
+ "을 제거하려면 시냅틱 꾸러미 관리자를 사용하세요."
+ 
+-#: ../AppInstall/AppInstall.py:669
++#: ../AppInstall/AppInstall.py:650
+ msgid "Confirm installation of restricted software"
+ msgstr "제한된 소프트웨어의 설치 확인"
+ 
+-#: ../AppInstall/AppInstall.py:670
++#: ../AppInstall/AppInstall.py:651
++
+ msgid ""
+ "The use of this software may be restricted in some countries. You must "
+ "verify that one of the following is true:\n"
+ "\n"
+-"• These restrictions do not apply in your country of legal residence\n"
+-"• You have permission to use this software (for  example, a patent license)\n"
+-"• You are using this software for research purposes only"
+-msgstr ""
+-"몇몇 국가에서는 이 소프트웨어를 사용하는 것이 제한되어 있습니다. 여러분은 다"
+-"음 내용 중의 하나가 참인지 반드시 확인해야 합니다:\n"
+-"\n"
+-"• 이러한 제한 사항이 여러분의 국적에 해당하는 나라에서 적용되지 않음\n"
+-"• 이 소프트웨어를 사용할 수 있는 권한을 가지고 있음 (예를 들면 특허권)\n"
+-"• 이 소프트웨어를 연구 목적으로만 사용함"
+-
+-#: ../AppInstall/AppInstall.py:680
++"* These restrictions do not apply in your country of legal residence\n"
++"* You have permission to use this software (for  example, a patent license)\n"
++"* You are using this software for research purposes only"
++msgstr ""
++"몇몇 국가에서는 이 소프트웨어를 사용하는 것이 제한되어 있습니다. 여러분은 "
++"다음 내용 중 하나가 참인지 반드시 확인해야 합니다.\n"
++"\n"
++"* 이러한 제한 사항이 여러분의 국적에 해당되는 국가에 적용되지 않음\n"
++"* 이 소프트웨어를 사용할 수 있는 권한을 가지고 있음(예: 특허권)\n"
++"* 이 소프트웨어를 연구 목적으로만 사용함"
++#: ../AppInstall/AppInstall.py:661
+ msgid "_Confirm"
+ msgstr "확인(_C)"
+ 
+-#: ../AppInstall/AppInstall.py:719 ../AppInstall/DialogProprietary.py:23
++#: ../AppInstall/AppInstall.py:700 ../AppInstall/DialogProprietary.py:23
+ #, python-format
+ msgid "Enable the installation of software from %s?"
+ msgstr "%s 에서 소프트웨어를 설치하도록 하시겠습니까?"
+ 
+-#: ../AppInstall/AppInstall.py:721
++#: ../AppInstall/AppInstall.py:702
+ #, python-format
+ msgid ""
+ "%s is provided by a third party vendor. The third party vendor is "
+ "responsible for support and security updates."
+ msgstr ""
+-"%s(은)는 써드 파티 업체에서 제공합니다. 기술적인 지원 및 보안 업데이트는 이러"
++"%s(은)는 타사 업체에서 제공합니다. 기술적인 지원 및 보안 업데이트는 이러"
+ "한 업체들이 담당하고 있습니다."
+ 
+-#: ../AppInstall/AppInstall.py:725 ../AppInstall/DialogProprietary.py:26
++#: ../AppInstall/AppInstall.py:706 ../AppInstall/DialogProprietary.py:26
+ msgid "You need a working internet connection to continue."
+ msgstr "계속 진행하기 위해서는 인터넷 연결이 필요합니다."
+ 
+-#: ../AppInstall/AppInstall.py:729 ../AppInstall/DialogProprietary.py:34
++#: ../AppInstall/AppInstall.py:710 ../AppInstall/DialogProprietary.py:34
+ msgid "_Enable"
+ msgstr "활성화(_E)"
+ 
+ #. show an error dialog if something went wrong with the cache
+-#: ../AppInstall/AppInstall.py:953
++#: ../AppInstall/AppInstall.py:934
+ msgid "Failed to check for installed and available applications"
+ msgstr "설치되거나 이용 가능한 프로그램을 체크하는데 실패하였습니다."
+ 
+-#: ../AppInstall/AppInstall.py:954
++#: ../AppInstall/AppInstall.py:935
+ msgid ""
+ "This is a major failure of your software management system. Please check for "
+ "broken packages with synaptic, check the file permissions and correctness of "
+@@ -453,54 +458,54 @@
+ "을 점검한 뒤 다음을 실행하여 소프트웨어 정보를 갱신하십시오: 'sudo apt-get "
+ "update' 실행 후 'sudo apt-get install -f'"
+ 
+-#: ../AppInstall/AppInstall.py:1005
++#: ../AppInstall/AppInstall.py:986
+ msgid "Apply changes to installed applications before closing?"
+ msgstr "닫기 전에 설치된 프로그램에 변경 사항을 적용하시겠습니까?"
+ 
+-#: ../AppInstall/AppInstall.py:1006
++#: ../AppInstall/AppInstall.py:987
+ msgid "If you do not apply your changes they will be lost permanently."
+ msgstr "변경 사항을 적용하지 않으면 변경한 내용은 사라질 것입니다."
+ 
+-#: ../AppInstall/AppInstall.py:1010
++#: ../AppInstall/AppInstall.py:991
+ msgid "_Close Without Applying"
+ msgstr "적용하지 않고 닫기(_C)"
+ 
+ #. FIXME: move this inside the dialog class, we show a different
+ #. text for a quit dialog and a approve dialog
+-#: ../AppInstall/AppInstall.py:1071
++#: ../AppInstall/AppInstall.py:1053
+ msgid "Apply the following changes?"
+ msgstr "이 변경 사항을 적용하시겠습니까?"
+ 
+-#: ../AppInstall/AppInstall.py:1072
++#: ../AppInstall/AppInstall.py:1054
+ msgid ""
+ "Please take a final look through the list of applications that will be "
+ "installed or removed."
+ msgstr ""
+ "설치되거나 제거될 프로그램들의 목록을 최종적으로 점검해 주시기 바랍니다."
+ 
+-#: ../AppInstall/AppInstall.py:1281
++#: ../AppInstall/AppInstall.py:1263
+ msgid "There is no matching application available."
+ msgstr "일치하는 프로그램을 찾을 수 없습니다."
+ 
+ #. TRANSLATORS: %s represents a filter name
+-#: ../AppInstall/AppInstall.py:1291
++#: ../AppInstall/AppInstall.py:1273
+ #, python-format
+ msgid "To broaden your search, choose \"%s\"."
+ msgstr "검색 범위를 넓히려면 \"%s\" (을)를 선택하세요."
+ 
+ #. TRANSLATORS: %s represents a filter name
+-#: ../AppInstall/AppInstall.py:1295
++#: ../AppInstall/AppInstall.py:1277
+ #, python-format
+ msgid "To broaden your search, choose \"%s\" or \"%s\"."
+ msgstr "검색 범위를 넓히려면 \"%s\" 혹은 \"%s\" (을)를 선택하세요."
+ 
+ #. TRANSLATORS: Show refers to the Show: combobox
+-#: ../AppInstall/AppInstall.py:1301
++#: ../AppInstall/AppInstall.py:1283
+ msgid "To broaden your search, choose a different \"Show\" item."
+ msgstr "검색 범위를 넓히려면, 다른 \"보여주기\" 항목을 선택하세요."
+ 
+ #. TRANSLATORS: All refers to the All category in the left list
+-#: ../AppInstall/AppInstall.py:1307
++#: ../AppInstall/AppInstall.py:1289
+ msgid "To broaden your search, choose 'All' categories."
+ msgstr "검색 범위를 넓히려면, '모두' 분류를 선택하세요."
+ 
+@@ -509,104 +514,104 @@
+ msgid "Failed to open '%s'"
+ msgstr "'%s' (을)를 열 수 없음"
+ 
+-#: ../AppInstall/CoreMenu.py:127
++#: ../AppInstall/CoreMenu.py:128
+ msgid "Applications"
+ msgstr "프로그램"
+ 
+-#: ../AppInstall/DialogComplete.py:128
++#: ../AppInstall/DialogComplete.py:131
+ msgid "Software installation failed"
+ msgstr "소프트웨어 설치 실패"
+ 
+-#: ../AppInstall/DialogComplete.py:129
++#: ../AppInstall/DialogComplete.py:132
+ msgid ""
+ "There has been a problem during the installation of the following pieces of "
+ "software."
+ msgstr "다음 소프트웨어들을 설치하는 과정에서 문제가 발생하였습니다."
+ 
+-#: ../AppInstall/DialogComplete.py:131 ../AppInstall/DialogComplete.py:146
+-#: ../AppInstall/DialogComplete.py:162 ../AppInstall/DialogComplete.py:190
++#: ../AppInstall/DialogComplete.py:134 ../AppInstall/DialogComplete.py:149
++#: ../AppInstall/DialogComplete.py:165 ../AppInstall/DialogComplete.py:193
+ msgid "Add/Remove More Software"
+ msgstr "더 많은 소프트웨어 추가/제거"
+ 
+-#: ../AppInstall/DialogComplete.py:133
++#: ../AppInstall/DialogComplete.py:136
+ msgid "Application installation failed"
+ msgstr "프로그램 설치 실패"
+ 
+-#: ../AppInstall/DialogComplete.py:134
++#: ../AppInstall/DialogComplete.py:137
+ msgid ""
+ "There has been a problem during the installation of the following "
+ "applications."
+ msgstr "다음 프로그램들을 설치하는 과정에서 문제가 발생하였습니다."
+ 
+-#: ../AppInstall/DialogComplete.py:143
++#: ../AppInstall/DialogComplete.py:146
+ msgid "Software could not be removed"
+ msgstr "소프트웨어를 제거할 수 없음"
+ 
+-#: ../AppInstall/DialogComplete.py:144
++#: ../AppInstall/DialogComplete.py:147
+ msgid ""
+ "There has been a problem during the removal of the following pieces of "
+ "software."
+ msgstr "다음 소프트웨어들을 제거하는 과정에서 문제가 발생하였습니다."
+ 
+-#: ../AppInstall/DialogComplete.py:148
++#: ../AppInstall/DialogComplete.py:151
+ msgid "Not all applications could be removed"
+ msgstr "일부 프로그램을 제거할 수 없음"
+ 
+-#: ../AppInstall/DialogComplete.py:149
++#: ../AppInstall/DialogComplete.py:152
+ msgid ""
+ "There has been a problem during the removal of the following applications."
+ msgstr "다음 프로그램들을 제거하는 과정에서 문제가 발생하였습니다."
+ 
+-#: ../AppInstall/DialogComplete.py:159
++#: ../AppInstall/DialogComplete.py:162
+ msgid "Installation and removal of software failed"
+ msgstr "소프트웨어 설치/제거 실패"
+ 
+-#: ../AppInstall/DialogComplete.py:160
++#: ../AppInstall/DialogComplete.py:163
+ msgid ""
+ "There has been a problem during the installation or removal of the following "
+ "pieces of software."
+ msgstr "다음 소프트웨어들을 설치 혹은 제거하는 과정에서 문제가 발생하였습니다."
+ 
+-#: ../AppInstall/DialogComplete.py:164
++#: ../AppInstall/DialogComplete.py:167
+ msgid "Installation and removal of applications failed"
+ msgstr "프로그램 설치/제거 실패"
+ 
+-#: ../AppInstall/DialogComplete.py:165
++#: ../AppInstall/DialogComplete.py:168
+ msgid ""
+ "There has been a problem during the installation or removal of the following "
+ "applications."
+ msgstr "다음 프로그램들을 설치 혹은 제거하는 과정에서 문제가 발생하였습니다."
+ 
+-#: ../AppInstall/DialogComplete.py:173
++#: ../AppInstall/DialogComplete.py:176
+ msgid "New application has been installed"
+ msgstr "새 프로그램이 설치됨"
+ 
+-#: ../AppInstall/DialogComplete.py:174
++#: ../AppInstall/DialogComplete.py:177
+ msgid "New applications have been installed"
+ msgstr "새 프로그램이 설치됨"
+ 
+-#: ../AppInstall/DialogComplete.py:179
++#: ../AppInstall/DialogComplete.py:182
+ msgid ""
+ "To start a newly installed application, choose it from the applications menu."
+ msgstr "새로 설치된 프로그램을 실행하려면, 프로그램 메뉴에서 선택하세요."
+ 
+-#: ../AppInstall/DialogComplete.py:182
++#: ../AppInstall/DialogComplete.py:185
+ msgid "To start a newly installed application double click on it."
+ msgstr "새로 설치된 프로그램을 실행하려면, 더블클릭 하세요."
+ 
+-#: ../AppInstall/DialogComplete.py:186
++#: ../AppInstall/DialogComplete.py:189
+ msgid "Software has been installed successfully"
+ msgstr "소프트웨어가 성공적으로 설치됨"
+ 
+-#: ../AppInstall/DialogComplete.py:187
++#: ../AppInstall/DialogComplete.py:190
+ msgid "Do you want to install or remove further software?"
+ msgstr "다른 소프트웨어를 설치/제거 하시겠습니까?"
+ 
+-#: ../AppInstall/DialogComplete.py:192
++#: ../AppInstall/DialogComplete.py:195
+ msgid "Applications have been removed successfully"
+ msgstr "프로그램이 성공적으로 제거됨"
+ 
+-#: ../AppInstall/DialogComplete.py:193
++#: ../AppInstall/DialogComplete.py:196
+ msgid "Do you want to install or remove further applications?"
+ msgstr "다른 프로그램을 설치/제거 하시겠습니까?"
+ 
+@@ -649,7 +654,7 @@
+ #: ../AppInstall/DialogProprietary.py:25
+ #, python-format
+ msgid "%s is provided by a third party vendor."
+-msgstr "%s(은)는 써드 파티 업체에서 제공합니다."
++msgstr "%s(은)는 타사 업체에서 제공합니다."
+ 
+ #: ../AppInstall/DialogProprietary.py:40
+ msgid ""
+@@ -663,32 +668,27 @@
+ msgid "Accept the license terms and install the software"
+ msgstr "라이센스에 동의하며 소프트웨어를 설치"
+ 
+-#: ../AppInstall/Menu.py:100
++#: ../AppInstall/Menu.py:98
+ msgid "Loading cache..."
+ msgstr "캐시를 로드하는 중..."
+ 
+-#: ../AppInstall/Menu.py:109
++#: ../AppInstall/Menu.py:107
+ msgid "Collecting application data..."
+ msgstr "프로그램 데이터를 수집하는 중..."
+ 
+-#: ../AppInstall/Menu.py:311
++#: ../AppInstall/Menu.py:309
+ msgid "Loading applications..."
+ msgstr "프로그램을 로드하는 중..."
+ 
+-#: ../AppInstall/Menu.py:315 ../AppInstall/Menu.py:318
++#: ../AppInstall/Menu.py:313 ../AppInstall/Menu.py:316
+ msgid "All"
+ msgstr "모두"
+ 
+-#: ../AppInstall/Menu.py:327
++#: ../AppInstall/Menu.py:325
+ #, python-format
+ msgid "Loading %s..."
+ msgstr "%s (을)를 읽는 중..."
+ 
+-#: ../AppInstall/distros/Debian.py:15 ../AppInstall/distros/Default.py:13
+-#: ../AppInstall/distros/Ubuntu.py:15
+-msgid "All available applications"
+-msgstr "이용가능한 모든 프로그램"
+-
+ #: ../AppInstall/distros/Debian.py:16
+ msgid ""
+ "Show all applications including ones which are possibly restricted by law or "
+@@ -712,7 +712,7 @@
+ 
+ #: ../AppInstall/distros/Debian.py:25 ../AppInstall/distros/Ubuntu.py:31
+ msgid "Third party applications"
+-msgstr "써드 파티 프로그램"
++msgstr "타사 프로그램"
+ 
+ #: ../AppInstall/distros/Debian.py:26
+ msgid ""
+@@ -771,7 +771,7 @@
+ 
+ #. %s is the name of the application
+ #: ../AppInstall/distros/Debian.py:56 ../AppInstall/distros/Ubuntu.py:63
+-#: ../AppInstall/distros/Ubuntu.py:114
++#: ../AppInstall/distros/Ubuntu.py:119
+ #, python-format
+ msgid ""
+ "The use, modification and distribution of %s is restricted by copyright or "
+@@ -912,11 +912,17 @@
+ msgstr "지원되지 않고 제한된 소프트웨어의 설치를 허용하시겠습니까?ㄹ"
+ 
+ #: ../AppInstall/distros/Ubuntu.py:96
++
++msgid ""
++"%s is provided by a third party vendor from the Canonical partner repository."
++msgstr ""
++"%s(은)는 Canonical 파트너 리포지토리의 타사 업체에서 제공합니다."
++#: ../AppInstall/distros/Ubuntu.py:101
+ #, python-format
+ msgid "Canonical Ltd. provides technical support and security updates for %s"
+ msgstr "Canonical Ltd. 사는 %s의 기술적인 지원과 보안 업데이트를 제공합니다."
+ 
+-#: ../AppInstall/distros/Ubuntu.py:109
++#: ../AppInstall/distros/Ubuntu.py:114
+ msgid "This application is provided by the Ubuntu community."
+ msgstr "이 프로그램은 우분투 커뮤니티에서 제공합니다."
+ 
+@@ -924,13 +930,13 @@
+ msgid "Description"
+ msgstr "설명"
+ 
+-#: ../AppInstall/widgets/AppDescView.py:75
++#: ../AppInstall/widgets/AppDescView.py:87
+ #, python-format
+ msgid "%s cannot be installed"
+ msgstr "%s(은)는 설치될 수 없습니다."
+ 
+ #. warn that this app is not available on this plattform
+-#: ../AppInstall/widgets/AppDescView.py:84
++#: ../AppInstall/widgets/AppDescView.py:96
+ #, python-format
+ msgid ""
+ "%s cannot be installed on your computer type (%s). Either the application "
+@@ -941,11 +947,18 @@
+ "램이 특별한 하드웨어 기능을 필요로 하거나 제조사에서 여러분이 사용하고 있는 "
+ "컴퓨터 타입을 지원하지 않는 경우입니다."
+ 
+-#: ../AppInstall/widgets/AppDescView.py:96
++#: ../AppInstall/widgets/AppDescView.py:108
+ msgid "This application is bundled with the following applications: "
+ msgstr "이 프로그램은 다음 프로그램에 포함되어 있습니다: "
+ 
+-#: ../AppInstall/widgets/AppDescView.py:196
++#: ../AppInstall/widgets/AppDescView.py:208
++#, python-format
++msgid ""
++"\n"
++"Homepage: %s\n"
++msgstr ""
++
++#: ../AppInstall/widgets/AppDescView.py:210
+ #, python-format
+ msgid "Version: %s (%s)"
+ msgstr "버전: %s (%s)"
+@@ -959,6 +972,9 @@
+ msgid "Application"
+ msgstr "프로그램"
+ 
++#~ msgid "To perform advanced tasks use the Synaptic package manager."
++#~ msgstr "전문적인 작업이 필요하다면 시냅틱 꾸러미 관리자를 이용하세요."
++
+ #~ msgid "%s integrates well into the Kubuntu desktop"
+ #~ msgstr "%s(은)는 쿠분투 데스크탑에서 잘 동작합니다."
+ 
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/ru.po gnome-app-install-0.5.2.8.new/po/ru.po
+--- gnome-app-install-0.5.2.8/po/ru.po	2008-06-10 05:39:55.000000000 -0400
++++ gnome-app-install-0.5.2.8.new/po/ru.po	2008-10-29 16:56:25.000000000 -0400
+@@ -5,8 +5,8 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: gnome-app-install\n"
+-"Report-Msgid-Bugs-To: Sebastian Heinlein <sebi@glatzor.de>\n"
+-"POT-Creation-Date: 2008-01-04 20:30+0100\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2008-10-03 13:54-0400\n"
+ "PO-Revision-Date: 2007-10-01 08:10+0000\n"
+ "Last-Translator: Igor Zubarev <igor4u@gmail.com>\n"
+ "Language-Team: Russian <gnome-cyr@gnome.org>\n"
+@@ -182,11 +182,11 @@
+ msgid "Package Manager"
+ msgstr "Менеджер пакетов"
+ 
+-#: ../AppInstall/activation.py:112
++#: ../AppInstall/activation.py:116
+ msgid "no suitable application"
+ msgstr "нет подходящего приложения"
+ 
+-#: ../AppInstall/activation.py:113
++#: ../AppInstall/activation.py:117
+ msgid ""
+ "No application suitable for automatic installation is available for handling "
+ "this kind of file."
+@@ -194,27 +194,27 @@
+ "Для открытия этого типа файла не обнаружено подходящего приложения, которое "
+ "можно установить автоматически."
+ 
+-#: ../AppInstall/activation.py:116
++#: ../AppInstall/activation.py:120
+ msgid "no application found"
+ msgstr "приложение не найдено"
+ 
+-#: ../AppInstall/activation.py:117
++#: ../AppInstall/activation.py:121
+ msgid "No application is known for this kind of file."
+ msgstr "Приложение для открытия данного типа файла не известно."
+ 
+-#: ../AppInstall/activation.py:131 ../AppInstall/activation.py:289
++#: ../AppInstall/activation.py:134 ../AppInstall/activation.py:296
+ msgid "Searching for appropriate applications"
+ msgstr "Поиск подходящих приложений"
+ 
+-#: ../AppInstall/activation.py:133 ../AppInstall/activation.py:192
++#: ../AppInstall/activation.py:136 ../AppInstall/activation.py:195
+ msgid "Please wait. This might take a minute or two."
+ msgstr "Пожалуйста подождите. Этот процесс может занять одну-две минуты."
+ 
+-#: ../AppInstall/activation.py:161
++#: ../AppInstall/activation.py:164
+ msgid "Search for suitable codec?"
+ msgstr "Найти подходящий кодек?"
+ 
+-#: ../AppInstall/activation.py:162
++#: ../AppInstall/activation.py:165
+ msgid ""
+ "The required software to play this file is not installed. You need to "
+ "install suitable codecs to play media files. Do you want to search for a "
+@@ -228,46 +228,46 @@
+ "\n"
+ "Возможно, некоторые из кодеков не поддерживаются официально."
+ 
+-#: ../AppInstall/activation.py:173
++#: ../AppInstall/activation.py:176
+ msgid "Invalid commandline"
+ msgstr "Ошибка командной строки"
+ 
+-#: ../AppInstall/activation.py:174
++#: ../AppInstall/activation.py:177
+ #, python-format
+ msgid "'%s' does not understand the commandline argument '%s'"
+ msgstr "'%s' не понимает аргумент командной строки '%s'"
+ 
+-#: ../AppInstall/activation.py:190
++#: ../AppInstall/activation.py:193
+ msgid "Searching for appropriate codecs"
+ msgstr "Поиск подходящих кодеков"
+ 
+-#: ../AppInstall/activation.py:195 ../AppInstall/activation.py:294
++#: ../AppInstall/activation.py:198 ../AppInstall/activation.py:301
+ msgid "_Install"
+ msgstr "_Установить"
+ 
+-#: ../AppInstall/activation.py:196
++#: ../AppInstall/activation.py:199
+ msgid "Install multimedia codecs"
+ msgstr "Установить кодеки"
+ 
+-#: ../AppInstall/activation.py:200
++#: ../AppInstall/activation.py:203
+ msgid "Codec"
+ msgstr "Кодек"
+ 
+-#: ../AppInstall/activation.py:231
++#: ../AppInstall/activation.py:234
+ msgid "additional codec installation declined"
+ msgstr "установка дополнительных кодеков не произведена"
+ 
+-#: ../AppInstall/activation.py:235
++#: ../AppInstall/activation.py:238
+ msgid "additional codec installation failed"
+ msgstr "установка дополнительных кодеков не удалась"
+ 
+ #. TRANSLATORS: %s represents a file path
+-#: ../AppInstall/activation.py:256
++#: ../AppInstall/activation.py:263
+ #, python-format
+ msgid "\"%s\" cannot be opened"
+ msgstr "\"%s\" не может быть открыт"
+ 
+-#: ../AppInstall/activation.py:291
++#: ../AppInstall/activation.py:298
+ #, python-format
+ msgid ""
+ "A list of applications that can handle documents of the type '%s' will be "
+@@ -275,36 +275,36 @@
+ msgstr "Будет создан список приложений, умеющих обрабатывать тип %s"
+ 
+ #. TRANSLATORS: %s represents a file path
+-#: ../AppInstall/activation.py:297
++#: ../AppInstall/activation.py:304
+ #, python-format
+ msgid "Install applications to open \"%s\""
+ msgstr "Установить приложения, чтобы открыть «%s»"
+ 
+-#: ../AppInstall/activation.py:300
++#: ../AppInstall/activation.py:307
+ msgid "Install applications"
+ msgstr "Установить приложения"
+ 
+-#: ../AppInstall/activation.py:311
++#: ../AppInstall/activation.py:318
+ msgid "_Search"
+ msgstr "_Искать"
+ 
+-#: ../AppInstall/activation.py:345
++#: ../AppInstall/activation.py:352
+ msgid "Searching for extensions"
+ msgstr "Поиск расширений"
+ 
+-#: ../AppInstall/activation.py:346
++#: ../AppInstall/activation.py:353
+ msgid "Extensions allow you to add new features to your application."
+ msgstr "Дополнения расширяют функциональность приложения."
+ 
+-#: ../AppInstall/activation.py:348
++#: ../AppInstall/activation.py:355
+ msgid "Install/Remove Extensions"
+ msgstr "Добавить или удалить расширения"
+ 
+-#: ../AppInstall/activation.py:350
++#: ../AppInstall/activation.py:357
+ msgid "Extension"
+ msgstr "Расширение"
+ 
+-#: ../AppInstall/AppInstall.py:174
++#: ../AppInstall/AppInstall.py:173
+ msgid ""
+ "To install an application check the box next to the application. Uncheck the "
+ "box to remove the application."
+@@ -312,36 +312,41 @@
+ "Для установки приложения поставьте рядом с ним отметку. Уберите отметку для "
+ "того, чтобы удалить приложение."
+ 
+-#: ../AppInstall/AppInstall.py:177
+-msgid "To perform advanced tasks use the Synaptic package manager."
+-msgstr "Для более сложных операций используйте менеджер пакетов Synaptic."
+-
+-#: ../AppInstall/AppInstall.py:179
++#: ../AppInstall/AppInstall.py:176
+ msgid "Quick Introduction"
+ msgstr "Краткое вступление"
+ 
+-#: ../AppInstall/AppInstall.py:225
+-#, fuzzy
+-msgid "Installed applications only"
+-msgstr "Установленные приложения"
++#. Just two filters needed, one to show all apps and one to show only installed apps
++#: ../AppInstall/AppInstall.py:200 ../AppInstall/distros/Debian.py:15
++#: ../AppInstall/distros/Default.py:13 ../AppInstall/distros/Ubuntu.py:15
++msgid "All available applications"
++msgstr "Все доступные приложения"
++
++#: ../AppInstall/AppInstall.py:201
++
++msgid "Show all applications that are available for your computer"
++msgstr "Показать все приложения, доступные для компьютера"
++#: ../AppInstall/AppInstall.py:206
+ 
+-#: ../AppInstall/AppInstall.py:226
++msgid "Installed applications only"
++msgstr "Только установленные приложения"
++#: ../AppInstall/AppInstall.py:207
+ msgid "Show only applications that are installed on your computer"
+ msgstr "Показать только те приложения, которые установлены на вашем компьютере"
+ 
+-#: ../AppInstall/AppInstall.py:318
++#: ../AppInstall/AppInstall.py:299
+ msgid "Error reading the addon CD"
+ msgstr "Ошибка чтения CD с дополнениями"
+ 
+-#: ../AppInstall/AppInstall.py:319
++#: ../AppInstall/AppInstall.py:300
+ msgid "The addon CD may be corrupt "
+ msgstr "Диск с дополнениями может быть повреждён "
+ 
+-#: ../AppInstall/AppInstall.py:453
+-msgid "The list of applications is not availabe"
+-msgstr "Список приложений недоступен"
++#: ../AppInstall/AppInstall.py:434
+ 
+-#: ../AppInstall/AppInstall.py:454
++msgid "The list of applications is not available"
++msgstr "Список приложений недоступен"
++#: ../AppInstall/AppInstall.py:435
+ msgid ""
+ "Click on 'Reload' to load it. To reload the list you need a working internet "
+ "connection. "
+@@ -349,12 +354,12 @@
+ "Нажмите «Обновить», чтобы загрузить его. Для перезагрузки списка вам нужно "
+ "работающее интернет-соединение. "
+ 
+-#: ../AppInstall/AppInstall.py:473
++#: ../AppInstall/AppInstall.py:454
+ #, python-format
+ msgid "%s cannot be installed on your computer type (%s)"
+ msgstr "%s не может быть установлено на ваш тип компьютера (%s)"
+ 
+-#: ../AppInstall/AppInstall.py:476
++#: ../AppInstall/AppInstall.py:457
+ msgid ""
+ "Either the application requires special hardware features or the vendor "
+ "decided to not support your computer type."
+@@ -362,12 +367,12 @@
+ "Либо приложение требует специальной аппаратной конфигурации, либо вендор "
+ "решил не поддерживать компьютер такого типа."
+ 
+-#: ../AppInstall/AppInstall.py:517
++#: ../AppInstall/AppInstall.py:498
+ #, python-format
+ msgid "Cannot install '%s'"
+ msgstr "Невозможно установить '%s'"
+ 
+-#: ../AppInstall/AppInstall.py:518
++#: ../AppInstall/AppInstall.py:499
+ #, python-format
+ msgid ""
+ "This application conflicts with other installed software. To install '%s' "
+@@ -380,12 +385,12 @@
+ "\n"
+ "Переключитесь в менеджер пакетов 'synaptic' для разрешения этого конфликта."
+ 
+-#: ../AppInstall/AppInstall.py:579
++#: ../AppInstall/AppInstall.py:560
+ #, python-format
+ msgid "Cannot remove '%s'"
+ msgstr "Невозможно удалить '%s'"
+ 
+-#: ../AppInstall/AppInstall.py:580
++#: ../AppInstall/AppInstall.py:561
+ #, python-format
+ msgid ""
+ "One or more applications depend on %s. To remove %s and the dependent "
+@@ -394,38 +399,36 @@
+ "Одно или несколько приложений зависят от %s. Для удаления %s и зависимых "
+ "программ используйте менеджер пакетов Synaptic."
+ 
+-#: ../AppInstall/AppInstall.py:669
++#: ../AppInstall/AppInstall.py:650
+ msgid "Confirm installation of restricted software"
+ msgstr "Установить несвободную программу?"
+ 
+-#: ../AppInstall/AppInstall.py:670
++#: ../AppInstall/AppInstall.py:651
++
+ msgid ""
+ "The use of this software may be restricted in some countries. You must "
+ "verify that one of the following is true:\n"
+ "\n"
+-"• These restrictions do not apply in your country of legal residence\n"
+-"• You have permission to use this software (for  example, a patent license)\n"
+-"• You are using this software for research purposes only"
+-msgstr ""
+-"Использование этой программы в некоторых государствах может быть запрещено. "
+-"Проверьте, применимо ли для вас одно из следующих утверждений:\n"
+-"\n"
+-"• Эти ограничения не имеют законной силы в вашей стране или месте "
+-"проживания\n"
+-"• Вы имеете право использовать эту программу (например, лицензию на "
+-"изобретение)\n"
+-"• Вы используете эту программу только для исследовательских целей."
+-
+-#: ../AppInstall/AppInstall.py:680
++"* These restrictions do not apply in your country of legal residence\n"
++"* You have permission to use this software (for  example, a patent license)\n"
++"* You are using this software for research purposes only"
++msgstr ""
++"Использование этого программного обеспечения может быть запрещено в некоторых странах/регионах. Убедитесь, "
++"что выполняется одно из следующих условий.\n"
++"\n"
++"* Такие ограничения не применяются в вашей стране/регионе.\n"
++"* У вас есть разрешение на использование этого программного обеспечения (например патентная лицензия).\n"
++"* Программное обеспечение используется только с целью изучения."
++#: ../AppInstall/AppInstall.py:661
+ msgid "_Confirm"
+ msgstr "_Подтвердить"
+ 
+-#: ../AppInstall/AppInstall.py:719 ../AppInstall/DialogProprietary.py:23
++#: ../AppInstall/AppInstall.py:700 ../AppInstall/DialogProprietary.py:23
+ #, python-format
+ msgid "Enable the installation of software from %s?"
+ msgstr "Включить установку программ из %s?"
+ 
+-#: ../AppInstall/AppInstall.py:721
++#: ../AppInstall/AppInstall.py:702
+ #, python-format
+ msgid ""
+ "%s is provided by a third party vendor. The third party vendor is "
+@@ -434,20 +437,20 @@
+ "%s предоставляется сторонним разработчиком, которой отвечает за поддержку и "
+ "исправления уязвимостей."
+ 
+-#: ../AppInstall/AppInstall.py:725 ../AppInstall/DialogProprietary.py:26
++#: ../AppInstall/AppInstall.py:706 ../AppInstall/DialogProprietary.py:26
+ msgid "You need a working internet connection to continue."
+ msgstr "Для продолжения необходимо работающее Интернет-соединение."
+ 
+-#: ../AppInstall/AppInstall.py:729 ../AppInstall/DialogProprietary.py:34
++#: ../AppInstall/AppInstall.py:710 ../AppInstall/DialogProprietary.py:34
+ msgid "_Enable"
+ msgstr "_Включить"
+ 
+ #. show an error dialog if something went wrong with the cache
+-#: ../AppInstall/AppInstall.py:953
++#: ../AppInstall/AppInstall.py:934
+ msgid "Failed to check for installed and available applications"
+ msgstr "Ошибка проверки установленных и доступных приложений."
+ 
+-#: ../AppInstall/AppInstall.py:954
++#: ../AppInstall/AppInstall.py:935
+ msgid ""
+ "This is a major failure of your software management system. Please check for "
+ "broken packages with synaptic, check the file permissions and correctness of "
+@@ -460,25 +463,25 @@
+ "list' и обновите информацию о программном обеспечении при помощи: 'sudo apt-"
+ "get update' и 'sudo apt-get install -f'."
+ 
+-#: ../AppInstall/AppInstall.py:1005
++#: ../AppInstall/AppInstall.py:986
+ msgid "Apply changes to installed applications before closing?"
+ msgstr "Применить изменения установленных программ перед закрытием?"
+ 
+-#: ../AppInstall/AppInstall.py:1006
++#: ../AppInstall/AppInstall.py:987
+ msgid "If you do not apply your changes they will be lost permanently."
+ msgstr "Если вы не примените изменения, они будут потеряны."
+ 
+-#: ../AppInstall/AppInstall.py:1010
++#: ../AppInstall/AppInstall.py:991
+ msgid "_Close Without Applying"
+ msgstr "_Закрыть без применения"
+ 
+ #. FIXME: move this inside the dialog class, we show a different
+ #. text for a quit dialog and a approve dialog
+-#: ../AppInstall/AppInstall.py:1071
++#: ../AppInstall/AppInstall.py:1053
+ msgid "Apply the following changes?"
+ msgstr "Применить следующие изменения?"
+ 
+-#: ../AppInstall/AppInstall.py:1072
++#: ../AppInstall/AppInstall.py:1054
+ msgid ""
+ "Please take a final look through the list of applications that will be "
+ "installed or removed."
+@@ -486,29 +489,29 @@
+ "Пожалуйста, ещё раз проверьте список приложений, которые будут установлены "
+ "или удалены."
+ 
+-#: ../AppInstall/AppInstall.py:1281
++#: ../AppInstall/AppInstall.py:1263
+ msgid "There is no matching application available."
+ msgstr "Нет подходящего приложения."
+ 
+ #. TRANSLATORS: %s represents a filter name
+-#: ../AppInstall/AppInstall.py:1291
++#: ../AppInstall/AppInstall.py:1273
+ #, python-format
+ msgid "To broaden your search, choose \"%s\"."
+ msgstr "Для расширения поиска выберите \"%s\""
+ 
+ #. TRANSLATORS: %s represents a filter name
+-#: ../AppInstall/AppInstall.py:1295
++#: ../AppInstall/AppInstall.py:1277
+ #, python-format
+ msgid "To broaden your search, choose \"%s\" or \"%s\"."
+ msgstr "Для расширения поиска выберите \"%s\" или \"%s\""
+ 
+ #. TRANSLATORS: Show refers to the Show: combobox
+-#: ../AppInstall/AppInstall.py:1301
++#: ../AppInstall/AppInstall.py:1283
+ msgid "To broaden your search, choose a different \"Show\" item."
+ msgstr "Для расширения поиска выберите другой вариант из списка \"Показать\"."
+ 
+ #. TRANSLATORS: All refers to the All category in the left list
+-#: ../AppInstall/AppInstall.py:1307
++#: ../AppInstall/AppInstall.py:1289
+ msgid "To broaden your search, choose 'All' categories."
+ msgstr "Для расширения поиска выберите категорию \"Все\"."
+ 
+@@ -517,105 +520,105 @@
+ msgid "Failed to open '%s'"
+ msgstr "Невозможно открыть '%s'"
+ 
+-#: ../AppInstall/CoreMenu.py:127
++#: ../AppInstall/CoreMenu.py:128
+ msgid "Applications"
+ msgstr "Приложения"
+ 
+-#: ../AppInstall/DialogComplete.py:128
++#: ../AppInstall/DialogComplete.py:131
+ msgid "Software installation failed"
+ msgstr "Установка приложений не удалась"
+ 
+-#: ../AppInstall/DialogComplete.py:129
++#: ../AppInstall/DialogComplete.py:132
+ msgid ""
+ "There has been a problem during the installation of the following pieces of "
+ "software."
+ msgstr "В процессе установки следующих программ возникла проблема."
+ 
+-#: ../AppInstall/DialogComplete.py:131 ../AppInstall/DialogComplete.py:146
+-#: ../AppInstall/DialogComplete.py:162 ../AppInstall/DialogComplete.py:190
++#: ../AppInstall/DialogComplete.py:134 ../AppInstall/DialogComplete.py:149
++#: ../AppInstall/DialogComplete.py:165 ../AppInstall/DialogComplete.py:193
+ msgid "Add/Remove More Software"
+ msgstr "Добавить/удалить другие программы"
+ 
+-#: ../AppInstall/DialogComplete.py:133
++#: ../AppInstall/DialogComplete.py:136
+ msgid "Application installation failed"
+ msgstr "Не удалось установить приложение"
+ 
+-#: ../AppInstall/DialogComplete.py:134
++#: ../AppInstall/DialogComplete.py:137
+ msgid ""
+ "There has been a problem during the installation of the following "
+ "applications."
+ msgstr "При установке следующих приложений возникла проблема."
+ 
+-#: ../AppInstall/DialogComplete.py:143
++#: ../AppInstall/DialogComplete.py:146
+ msgid "Software could not be removed"
+ msgstr "Не удалось удалить программу"
+ 
+-#: ../AppInstall/DialogComplete.py:144
++#: ../AppInstall/DialogComplete.py:147
+ msgid ""
+ "There has been a problem during the removal of the following pieces of "
+ "software."
+ msgstr "В процессе удаления следующих программ возникла проблема."
+ 
+-#: ../AppInstall/DialogComplete.py:148
++#: ../AppInstall/DialogComplete.py:151
+ msgid "Not all applications could be removed"
+ msgstr "Не удалось удалить все приложения"
+ 
+-#: ../AppInstall/DialogComplete.py:149
++#: ../AppInstall/DialogComplete.py:152
+ msgid ""
+ "There has been a problem during the removal of the following applications."
+ msgstr "При удалении следующих приложений возникла проблема."
+ 
+-#: ../AppInstall/DialogComplete.py:159
++#: ../AppInstall/DialogComplete.py:162
+ msgid "Installation and removal of software failed"
+ msgstr "Не удалось выполнить установку и удаление программ"
+ 
+-#: ../AppInstall/DialogComplete.py:160
++#: ../AppInstall/DialogComplete.py:163
+ msgid ""
+ "There has been a problem during the installation or removal of the following "
+ "pieces of software."
+ msgstr ""
+ "В процессе установки или удаления следующих программ возникла проблема."
+ 
+-#: ../AppInstall/DialogComplete.py:164
++#: ../AppInstall/DialogComplete.py:167
+ msgid "Installation and removal of applications failed"
+ msgstr "Установка и удаление приложений не удались"
+ 
+-#: ../AppInstall/DialogComplete.py:165
++#: ../AppInstall/DialogComplete.py:168
+ msgid ""
+ "There has been a problem during the installation or removal of the following "
+ "applications."
+ msgstr "При установке или удалении следующих приложений возникла проблема."
+ 
+-#: ../AppInstall/DialogComplete.py:173
++#: ../AppInstall/DialogComplete.py:176
+ msgid "New application has been installed"
+ msgstr "Новое приложение установлено"
+ 
+-#: ../AppInstall/DialogComplete.py:174
++#: ../AppInstall/DialogComplete.py:177
+ msgid "New applications have been installed"
+ msgstr "Новые приложения установлены"
+ 
+-#: ../AppInstall/DialogComplete.py:179
++#: ../AppInstall/DialogComplete.py:182
+ msgid ""
+ "To start a newly installed application, choose it from the applications menu."
+ msgstr "Для запуска нового приложения выберите его в меню приложений."
+ 
+-#: ../AppInstall/DialogComplete.py:182
++#: ../AppInstall/DialogComplete.py:185
+ msgid "To start a newly installed application double click on it."
+ msgstr "Для запуска нового приложения дважды кликните на нём."
+ 
+-#: ../AppInstall/DialogComplete.py:186
++#: ../AppInstall/DialogComplete.py:189
+ msgid "Software has been installed successfully"
+ msgstr "Программа успешно установлена"
+ 
+-#: ../AppInstall/DialogComplete.py:187
++#: ../AppInstall/DialogComplete.py:190
+ msgid "Do you want to install or remove further software?"
+ msgstr "Установить или удалить ещё что-нибудь?"
+ 
+-#: ../AppInstall/DialogComplete.py:192
++#: ../AppInstall/DialogComplete.py:195
+ msgid "Applications have been removed successfully"
+ msgstr "Приложения были успешно удалены"
+ 
+-#: ../AppInstall/DialogComplete.py:193
++#: ../AppInstall/DialogComplete.py:196
+ msgid "Do you want to install or remove further applications?"
+ msgstr "Установить или удалить другие приложения?"
+ 
+@@ -672,32 +675,27 @@
+ msgid "Accept the license terms and install the software"
+ msgstr "Принять условия лицензии и установить приложение"
+ 
+-#: ../AppInstall/Menu.py:100
++#: ../AppInstall/Menu.py:98
+ msgid "Loading cache..."
+ msgstr "Загрузка кэша..."
+ 
+-#: ../AppInstall/Menu.py:109
++#: ../AppInstall/Menu.py:107
+ msgid "Collecting application data..."
+ msgstr "Сбор данных приложения..."
+ 
+-#: ../AppInstall/Menu.py:311
++#: ../AppInstall/Menu.py:309
+ msgid "Loading applications..."
+ msgstr "Загрузка приложений..."
+ 
+-#: ../AppInstall/Menu.py:315 ../AppInstall/Menu.py:318
++#: ../AppInstall/Menu.py:313 ../AppInstall/Menu.py:316
+ msgid "All"
+ msgstr "Все"
+ 
+-#: ../AppInstall/Menu.py:327
++#: ../AppInstall/Menu.py:325
+ #, python-format
+ msgid "Loading %s..."
+ msgstr "Загрузка %s..."
+ 
+-#: ../AppInstall/distros/Debian.py:15 ../AppInstall/distros/Default.py:13
+-#: ../AppInstall/distros/Ubuntu.py:15
+-msgid "All available applications"
+-msgstr "Все доступные приложения"
+-
+ #: ../AppInstall/distros/Debian.py:16
+ msgid ""
+ "Show all applications including ones which are possibly restricted by law or "
+@@ -781,7 +779,7 @@
+ 
+ #. %s is the name of the application
+ #: ../AppInstall/distros/Debian.py:56 ../AppInstall/distros/Ubuntu.py:63
+-#: ../AppInstall/distros/Ubuntu.py:114
++#: ../AppInstall/distros/Ubuntu.py:119
+ #, python-format
+ msgid ""
+ "The use, modification and distribution of %s is restricted by copyright or "
+@@ -926,13 +924,19 @@
+ msgstr "Разрешить установку неподдерживаемого и несвободного ПО?"
+ 
+ #: ../AppInstall/distros/Ubuntu.py:96
++
++msgid ""
++"%s is provided by a third party vendor from the Canonical partner repository."
++msgstr ""
++"%s предоставляется сторонним разработчиком из списка партнеров Canonical."
++#: ../AppInstall/distros/Ubuntu.py:101
+ #, python-format
+ msgid "Canonical Ltd. provides technical support and security updates for %s"
+ msgstr ""
+ "Canonical Ltd. предоставляет техническую поддержку и обновления безопасности "
+ "для %s."
+ 
+-#: ../AppInstall/distros/Ubuntu.py:109
++#: ../AppInstall/distros/Ubuntu.py:114
+ msgid "This application is provided by the Ubuntu community."
+ msgstr "Это приложение предоставляется сообществом Ubuntu."
+ 
+@@ -940,13 +944,13 @@
+ msgid "Description"
+ msgstr "Описание"
+ 
+-#: ../AppInstall/widgets/AppDescView.py:75
++#: ../AppInstall/widgets/AppDescView.py:87
+ #, python-format
+ msgid "%s cannot be installed"
+ msgstr "%s не может быть установлено"
+ 
+ #. warn that this app is not available on this plattform
+-#: ../AppInstall/widgets/AppDescView.py:84
++#: ../AppInstall/widgets/AppDescView.py:96
+ #, python-format
+ msgid ""
+ "%s cannot be installed on your computer type (%s). Either the application "
+@@ -957,11 +961,18 @@
+ "приложению требуется особое оборудование, либо его поставщик не поддерживает "
+ "ваш тип компьютера."
+ 
+-#: ../AppInstall/widgets/AppDescView.py:96
++#: ../AppInstall/widgets/AppDescView.py:108
+ msgid "This application is bundled with the following applications: "
+ msgstr "Это приложение идёт в комплекте со следующими программами: "
+ 
+-#: ../AppInstall/widgets/AppDescView.py:196
++#: ../AppInstall/widgets/AppDescView.py:208
++#, python-format
++msgid ""
++"\n"
++"Homepage: %s\n"
++msgstr ""
++
++#: ../AppInstall/widgets/AppDescView.py:210
+ #, python-format
+ msgid "Version: %s (%s)"
+ msgstr "Версия: %s (%s)"
+@@ -975,6 +986,9 @@
+ msgid "Application"
+ msgstr "Приложение"
+ 
++#~ msgid "To perform advanced tasks use the Synaptic package manager."
++#~ msgstr "Для более сложных операций используйте менеджер пакетов Synaptic."
++
+ #~ msgid "%s integrates well into the Kubuntu desktop"
+ #~ msgstr "%s хорошо интегрируется в рабочий стол Kubuntu"
+ 
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/zh_CN.po gnome-app-install-0.5.2.8.new/po/zh_CN.po
+--- gnome-app-install-0.5.2.8/po/zh_CN.po	2008-06-10 05:39:55.000000000 -0400
++++ gnome-app-install-0.5.2.8.new/po/zh_CN.po	2008-10-29 16:56:25.000000000 -0400
+@@ -6,8 +6,8 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: gnome-app-install\n"
+-"Report-Msgid-Bugs-To: Sebastian Heinlein <sebi@glatzor.de>\n"
+-"POT-Creation-Date: 2008-01-04 20:30+0100\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2008-10-03 13:54-0400\n"
+ "PO-Revision-Date: 2007-09-12 16:57+0000\n"
+ "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
+ "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+@@ -18,10 +18,9 @@
+ "X-Generator: Launchpad (build Unknown)\n"
+ 
+ #: ../data/gnome-app-install.schemas.in.h:1
+-#, fuzzy
+-msgid "Components that have been confirmed to install applications from"
+-msgstr "安装和删除程序"
+ 
++msgid "Components that have been confirmed to install applications from"
++msgstr "已经确认安装应用程序的组件"
+ #: ../data/gnome-app-install.schemas.in.h:2
+ msgid "If true, the main window is maximized."
+ msgstr "如果为真，主窗口将会最大化。"
+@@ -46,17 +45,18 @@
+ msgstr ""
+ 
+ #: ../data/gnome-app-install.schemas.in.h:7
+-#, fuzzy
+-msgid "Show only a subset of applications"
+-msgstr "安装和删除程序"
+ 
++msgid "Show only a subset of applications"
++msgstr "仅显示应用程序的子集"
+ #: ../data/gnome-app-install.schemas.in.h:8
+ msgid "Suggest application for MIME-type: approved components"
+-msgstr ""
++msgstr "为 MIME 类型推荐应用程序：已批准的组件"
++
+ 
+ #: ../data/gnome-app-install.schemas.in.h:9
+ msgid "Timeout for interactive search"
+-msgstr ""
++msgstr "交互搜索超时"
++
+ 
+ #: ../data/gnome-app-install.schemas.in.h:10
+ msgid ""
+@@ -66,7 +66,8 @@
+ 
+ #: ../data/gnome-app-install.schemas.in.h:11
+ msgid "Timestamp of the last cache refresh run"
+-msgstr ""
++msgstr "上次运行缓存刷新的时间戳"
++
+ 
+ #: ../data/gnome-app-install.schemas.in.h:12
+ msgid ""
+@@ -137,10 +138,9 @@
+ msgstr "类型表示应用程序菜单"
+ 
+ #: ../data/gnome-app-install.glade.h:17
+-#, fuzzy
+-msgid "_Add/Remove More Applications"
+-msgstr "应用程序"
+ 
++msgid "_Add/Remove More Applications"
++msgstr "添加/删除更多的应用程序(_A)"
+ #: ../data/gnome-app-install.glade.h:18
+ msgid "_Apply Changes"
+ msgstr "应用改变(_A)"
+@@ -176,40 +176,37 @@
+ msgid "Package Manager"
+ msgstr "软件包管理器"
+ 
+-#: ../AppInstall/activation.py:112
+-#, fuzzy
+-msgid "no suitable application"
+-msgstr "安装和删除程序"
++#: ../AppInstall/activation.py:116
+ 
+-#: ../AppInstall/activation.py:113
++msgid "no suitable application"
++msgstr "无合适的应用程序"
++#: ../AppInstall/activation.py:117
+ msgid ""
+ "No application suitable for automatic installation is available for handling "
+ "this kind of file."
+ msgstr ""
+ 
+-#: ../AppInstall/activation.py:116
+-#, fuzzy
+-msgid "no application found"
+-msgstr "应用程序"
++#: ../AppInstall/activation.py:120
+ 
+-#: ../AppInstall/activation.py:117
++msgid "no application found"
++msgstr "未发现应用程序"
++#: ../AppInstall/activation.py:121
+ msgid "No application is known for this kind of file."
+ msgstr "这个类型的文件没有对应的程序。"
+ 
+-#: ../AppInstall/activation.py:131 ../AppInstall/activation.py:289
++#: ../AppInstall/activation.py:134 ../AppInstall/activation.py:296
+ msgid "Searching for appropriate applications"
+ msgstr "查找适当的应用程序"
+ 
+-#: ../AppInstall/activation.py:133 ../AppInstall/activation.py:192
++#: ../AppInstall/activation.py:136 ../AppInstall/activation.py:195
+ msgid "Please wait. This might take a minute or two."
+ msgstr "请稍候。大约需要一到两分钟。"
+ 
+-#: ../AppInstall/activation.py:161
+-#, fuzzy
+-msgid "Search for suitable codec?"
+-msgstr "应用程序"
++#: ../AppInstall/activation.py:164
+ 
+-#: ../AppInstall/activation.py:162
++msgid "Search for suitable codec?"
++msgstr "是否搜索合适的编解码器？"
++#: ../AppInstall/activation.py:165
+ msgid ""
+ "The required software to play this file is not installed. You need to "
+ "install suitable codecs to play media files. Do you want to search for a "
+@@ -218,47 +215,49 @@
+ "The search will also include software which is not officially supported."
+ msgstr ""
+ 
+-#: ../AppInstall/activation.py:173
++#: ../AppInstall/activation.py:176
+ msgid "Invalid commandline"
+ msgstr "非法命令行"
+ 
+-#: ../AppInstall/activation.py:174
++#: ../AppInstall/activation.py:177
+ #, python-format
+ msgid "'%s' does not understand the commandline argument '%s'"
+ msgstr "'%s' 不能够理解命令行参数 '%s'"
+ 
+-#: ../AppInstall/activation.py:190
+-#, fuzzy
+-msgid "Searching for appropriate codecs"
+-msgstr "应用程序"
++#: ../AppInstall/activation.py:193
+ 
+-#: ../AppInstall/activation.py:195 ../AppInstall/activation.py:294
++msgid "Searching for appropriate codecs"
++msgstr "正在搜索适当的编解码器"
++#: ../AppInstall/activation.py:198 ../AppInstall/activation.py:301
+ msgid "_Install"
+ msgstr "安装(_I)"
+ 
+-#: ../AppInstall/activation.py:196
++#: ../AppInstall/activation.py:199
+ msgid "Install multimedia codecs"
+-msgstr ""
++msgstr "安装多媒体编解码器"
++
+ 
+-#: ../AppInstall/activation.py:200
++#: ../AppInstall/activation.py:203
+ msgid "Codec"
+ msgstr "编码器"
+ 
+-#: ../AppInstall/activation.py:231
++#: ../AppInstall/activation.py:234
+ msgid "additional codec installation declined"
+-msgstr ""
++msgstr "拒绝安装附加编解码器"
+ 
+-#: ../AppInstall/activation.py:235
++
++#: ../AppInstall/activation.py:238
+ msgid "additional codec installation failed"
+-msgstr ""
++msgstr "安装附加编解码器失败"
++
+ 
+ #. TRANSLATORS: %s represents a file path
+-#: ../AppInstall/activation.py:256
++#: ../AppInstall/activation.py:263
+ #, python-format
+ msgid "\"%s\" cannot be opened"
+ msgstr "\"%s\" 不能够被打开"
+ 
+-#: ../AppInstall/activation.py:291
++#: ../AppInstall/activation.py:298
+ #, python-format
+ msgid ""
+ "A list of applications that can handle documents of the type '%s' will be "
+@@ -266,96 +265,100 @@
+ msgstr ""
+ 
+ #. TRANSLATORS: %s represents a file path
+-#: ../AppInstall/activation.py:297
++#: ../AppInstall/activation.py:304
+ #, python-format
+ msgid "Install applications to open \"%s\""
+ msgstr "安装程序来打开 \"%s\""
+ 
+-#: ../AppInstall/activation.py:300
++#: ../AppInstall/activation.py:307
+ msgid "Install applications"
+ msgstr "安装程序"
+ 
+-#: ../AppInstall/activation.py:311
++#: ../AppInstall/activation.py:318
+ msgid "_Search"
+ msgstr "搜索(_S)"
+ 
+-#: ../AppInstall/activation.py:345
+-#, fuzzy
+-msgid "Searching for extensions"
+-msgstr "应用程序"
++#: ../AppInstall/activation.py:352
+ 
+-#: ../AppInstall/activation.py:346
++msgid "Searching for extensions"
++msgstr "正在搜索扩展插件"
++#: ../AppInstall/activation.py:353
+ msgid "Extensions allow you to add new features to your application."
+-msgstr ""
++msgstr "扩展插件允许您为应用程序添加新功能。"
+ 
+-#: ../AppInstall/activation.py:348
+-#, fuzzy
+-msgid "Install/Remove Extensions"
+-msgstr "安装和删除程序"
+ 
+-#: ../AppInstall/activation.py:350
++#: ../AppInstall/activation.py:355
++
++msgid "Install/Remove Extensions"
++msgstr "安装和删除扩展插件"
++#: ../AppInstall/activation.py:357
+ msgid "Extension"
+ msgstr "扩展"
+ 
+-#: ../AppInstall/AppInstall.py:174
++#: ../AppInstall/AppInstall.py:173
+ msgid ""
+ "To install an application check the box next to the application. Uncheck the "
+ "box to remove the application."
+ msgstr "选择软件旁边的方框来安装此软件.反选方框来删除此软件"
+ 
+-#: ../AppInstall/AppInstall.py:177
+-msgid "To perform advanced tasks use the Synaptic package manager."
+-msgstr "更高级任务请用新得立软件包管理器"
+-
+-#: ../AppInstall/AppInstall.py:179
++#: ../AppInstall/AppInstall.py:176
+ msgid "Quick Introduction"
+ msgstr "快速指南"
+ 
+-#: ../AppInstall/AppInstall.py:225
+-#, fuzzy
+-msgid "Installed applications only"
+-msgstr "已安装的程序"
++#. Just two filters needed, one to show all apps and one to show only installed apps
++#: ../AppInstall/AppInstall.py:200 ../AppInstall/distros/Debian.py:15
++#: ../AppInstall/distros/Default.py:13 ../AppInstall/distros/Ubuntu.py:15
++msgid "All available applications"
++msgstr "所有可安装应用程序"
++
++#: ../AppInstall/AppInstall.py:201
++
++msgid "Show all applications that are available for your computer"
++msgstr "显示计算机中所有可用的应用程序"
++#: ../AppInstall/AppInstall.py:206
+ 
+-#: ../AppInstall/AppInstall.py:226
++msgid "Installed applications only"
++msgstr "仅显示已安装的应用程序"
++#: ../AppInstall/AppInstall.py:207
+ msgid "Show only applications that are installed on your computer"
+-msgstr "仅显示电脑中安装的应用程序"
++msgstr "仅显示计算机中安装的应用程序"
+ 
+-#: ../AppInstall/AppInstall.py:318
++#: ../AppInstall/AppInstall.py:299
+ msgid "Error reading the addon CD"
+ msgstr "读取附加CD错误"
+ 
+-#: ../AppInstall/AppInstall.py:319
++#: ../AppInstall/AppInstall.py:300
+ msgid "The addon CD may be corrupt "
+-msgstr ""
++msgstr "Addon CD 可能损坏"
+ 
+-#: ../AppInstall/AppInstall.py:453
+-#, fuzzy
+-msgid "The list of applications is not availabe"
+-msgstr "应用程序安装器"
+ 
+-#: ../AppInstall/AppInstall.py:454
++#: ../AppInstall/AppInstall.py:434
++
++msgid "The list of applications is not available"
++msgstr "应用程序列表不可用"
++#: ../AppInstall/AppInstall.py:435
+ msgid ""
+ "Click on 'Reload' to load it. To reload the list you need a working internet "
+ "connection. "
+ msgstr ""
+ 
+-#: ../AppInstall/AppInstall.py:473
++#: ../AppInstall/AppInstall.py:454
+ #, python-format
+ msgid "%s cannot be installed on your computer type (%s)"
+ msgstr "%s不能安装于您的计算机类型(%s)"
+ 
+-#: ../AppInstall/AppInstall.py:476
++#: ../AppInstall/AppInstall.py:457
+ msgid ""
+ "Either the application requires special hardware features or the vendor "
+ "decided to not support your computer type."
+ msgstr "应用程序需要特殊的硬件或者提供者不再支持您的计算机类型。"
+ 
+-#: ../AppInstall/AppInstall.py:517
++#: ../AppInstall/AppInstall.py:498
+ #, python-format
+ msgid "Cannot install '%s'"
+ msgstr "无法安装 '%s'"
+ 
+-#: ../AppInstall/AppInstall.py:518
++#: ../AppInstall/AppInstall.py:499
+ #, python-format
+ msgid ""
+ "This application conflicts with other installed software. To install '%s' "
+@@ -364,12 +367,12 @@
+ "Switch to the 'synaptic' package manager to resolve this conflict."
+ msgstr ""
+ 
+-#: ../AppInstall/AppInstall.py:579
++#: ../AppInstall/AppInstall.py:560
+ #, python-format
+ msgid "Cannot remove '%s'"
+ msgstr "无法删除 '%s'"
+ 
+-#: ../AppInstall/AppInstall.py:580
++#: ../AppInstall/AppInstall.py:561
+ #, python-format
+ msgid ""
+ "One or more applications depend on %s. To remove %s and the dependent "
+@@ -377,50 +380,53 @@
+ msgstr ""
+ "一个或者多个应用程序依赖 %s。删除%s或者依赖应用程序，请用新得立软件包管理器。"
+ 
+-#: ../AppInstall/AppInstall.py:669
++#: ../AppInstall/AppInstall.py:650
+ msgid "Confirm installation of restricted software"
+-msgstr ""
++msgstr "确认安装受限制的软件"
+ 
+-#: ../AppInstall/AppInstall.py:670
++
++#: ../AppInstall/AppInstall.py:651
+ msgid ""
+ "The use of this software may be restricted in some countries. You must "
+ "verify that one of the following is true:\n"
+ "\n"
+-"• These restrictions do not apply in your country of legal residence\n"
+-"• You have permission to use this software (for  example, a patent license)\n"
+-"• You are using this software for research purposes only"
++"* These restrictions do not apply in your country of legal residence\n"
++"* You have permission to use this software (for  example, a patent license)\n"
++"* You are using this software for research purposes only"
+ msgstr ""
+ 
+-#: ../AppInstall/AppInstall.py:680
++#: ../AppInstall/AppInstall.py:661
+ msgid "_Confirm"
+-msgstr ""
++msgstr "确认(_C)"
+ 
+-#: ../AppInstall/AppInstall.py:719 ../AppInstall/DialogProprietary.py:23
++
++#: ../AppInstall/AppInstall.py:700 ../AppInstall/DialogProprietary.py:23
+ #, python-format
+ msgid "Enable the installation of software from %s?"
+-msgstr ""
++msgstr "是否启用安装 %s 的软件？"
+ 
+-#: ../AppInstall/AppInstall.py:721
++
++#: ../AppInstall/AppInstall.py:702
+ #, python-format
+ msgid ""
+ "%s is provided by a third party vendor. The third party vendor is "
+ "responsible for support and security updates."
+ msgstr "%s由第三方提供。第三方提供者承担支持和安全更新。"
+ 
+-#: ../AppInstall/AppInstall.py:725 ../AppInstall/DialogProprietary.py:26
++#: ../AppInstall/AppInstall.py:706 ../AppInstall/DialogProprietary.py:26
+ msgid "You need a working internet connection to continue."
+ msgstr "您需要因特网连接。"
+ 
+-#: ../AppInstall/AppInstall.py:729 ../AppInstall/DialogProprietary.py:34
++#: ../AppInstall/AppInstall.py:710 ../AppInstall/DialogProprietary.py:34
+ msgid "_Enable"
+ msgstr "启用(_E)"
+ 
+ #. show an error dialog if something went wrong with the cache
+-#: ../AppInstall/AppInstall.py:953
++#: ../AppInstall/AppInstall.py:934
+ msgid "Failed to check for installed and available applications"
+ msgstr "检查已安装的和可用的应用程序失败"
+ 
+-#: ../AppInstall/AppInstall.py:954
++#: ../AppInstall/AppInstall.py:935
+ msgid ""
+ "This is a major failure of your software management system. Please check for "
+ "broken packages with synaptic, check the file permissions and correctness of "
+@@ -431,53 +437,56 @@
+ "sources.list'的权限和正确性，并用命令: 'sudo apt-get update' 和 'sudo apt-"
+ "get install -f'重新载入软件包信息."
+ 
+-#: ../AppInstall/AppInstall.py:1005
++#: ../AppInstall/AppInstall.py:986
+ msgid "Apply changes to installed applications before closing?"
+ msgstr "在关闭之前应用更改到已安装软件?"
+ 
+-#: ../AppInstall/AppInstall.py:1006
++#: ../AppInstall/AppInstall.py:987
+ msgid "If you do not apply your changes they will be lost permanently."
+ msgstr "如果你不应用更改所有更改将丢失"
+ 
+-#: ../AppInstall/AppInstall.py:1010
++#: ../AppInstall/AppInstall.py:991
+ msgid "_Close Without Applying"
+ msgstr "不应用就关闭(_C)"
+ 
+ #. FIXME: move this inside the dialog class, we show a different
+ #. text for a quit dialog and a approve dialog
+-#: ../AppInstall/AppInstall.py:1071
++#: ../AppInstall/AppInstall.py:1053
+ msgid "Apply the following changes?"
+ msgstr "应用以下更改?"
+ 
+-#: ../AppInstall/AppInstall.py:1072
++#: ../AppInstall/AppInstall.py:1054
+ msgid ""
+ "Please take a final look through the list of applications that will be "
+ "installed or removed."
+ msgstr "请最后检查一遍将要被安装或删除的软件列表"
+ 
+-#: ../AppInstall/AppInstall.py:1281
++#: ../AppInstall/AppInstall.py:1263
+ msgid "There is no matching application available."
+ msgstr "无匹配软件。"
+ 
+ #. TRANSLATORS: %s represents a filter name
+-#: ../AppInstall/AppInstall.py:1291
++#: ../AppInstall/AppInstall.py:1273
+ #, python-format
+ msgid "To broaden your search, choose \"%s\"."
+-msgstr ""
++msgstr "要放宽搜索条件，请选择\"%s\"。"
++
+ 
+ #. TRANSLATORS: %s represents a filter name
+-#: ../AppInstall/AppInstall.py:1295
++#: ../AppInstall/AppInstall.py:1277
+ #, python-format
+ msgid "To broaden your search, choose \"%s\" or \"%s\"."
+-msgstr ""
++msgstr "要放宽搜索条件，请选择\"%s\"或\"%s\"。"
++
+ 
+ #. TRANSLATORS: Show refers to the Show: combobox
+-#: ../AppInstall/AppInstall.py:1301
++#: ../AppInstall/AppInstall.py:1283
+ msgid "To broaden your search, choose a different \"Show\" item."
+-msgstr ""
++msgstr "要放宽搜索条件，请选择不同的\"显示\"项。"
++
+ 
+ #. TRANSLATORS: All refers to the All category in the left list
+-#: ../AppInstall/AppInstall.py:1307
++#: ../AppInstall/AppInstall.py:1289
+ msgid "To broaden your search, choose 'All' categories."
+ msgstr "要放宽搜索条件，请选择所有类别。"
+ 
+@@ -486,115 +495,110 @@
+ msgid "Failed to open '%s'"
+ msgstr "打开 '%s' 失败"
+ 
+-#: ../AppInstall/CoreMenu.py:127
++#: ../AppInstall/CoreMenu.py:128
+ msgid "Applications"
+ msgstr "应用程序"
+ 
+-#: ../AppInstall/DialogComplete.py:128
++#: ../AppInstall/DialogComplete.py:131
+ msgid "Software installation failed"
+ msgstr "软件安装失败"
+ 
+-#: ../AppInstall/DialogComplete.py:129
+-#, fuzzy
++#: ../AppInstall/DialogComplete.py:132
++
+ msgid ""
+ "There has been a problem during the installation of the following pieces of "
+ "software."
+-msgstr "安装和删除程序"
+-
+-#: ../AppInstall/DialogComplete.py:131 ../AppInstall/DialogComplete.py:146
+-#: ../AppInstall/DialogComplete.py:162 ../AppInstall/DialogComplete.py:190
++msgstr ""
++"在下列程序的安装过程中出现"
++"问题。"
++#: ../AppInstall/DialogComplete.py:134 ../AppInstall/DialogComplete.py:149
++#: ../AppInstall/DialogComplete.py:165 ../AppInstall/DialogComplete.py:193
+ msgid "Add/Remove More Software"
+ msgstr "添加/删除更多程序"
+ 
+-#: ../AppInstall/DialogComplete.py:133
++#: ../AppInstall/DialogComplete.py:136
+ msgid "Application installation failed"
+ msgstr "程序安装失败"
+ 
+-#: ../AppInstall/DialogComplete.py:134
++#: ../AppInstall/DialogComplete.py:137
+ msgid ""
+ "There has been a problem during the installation of the following "
+ "applications."
+ msgstr "在下列程序的安装过程中出现了问题。"
+ 
+-#: ../AppInstall/DialogComplete.py:143
+-#, fuzzy
+-msgid "Software could not be removed"
+-msgstr "应用程序"
++#: ../AppInstall/DialogComplete.py:146
+ 
+-#: ../AppInstall/DialogComplete.py:144
++msgid "Software could not be removed"
++msgstr "无法删除软件"
++#: ../AppInstall/DialogComplete.py:147
+ msgid ""
+ "There has been a problem during the removal of the following pieces of "
+ "software."
+ msgstr "在移除下列软件时出现了问题。"
+ 
+-#: ../AppInstall/DialogComplete.py:148
++#: ../AppInstall/DialogComplete.py:151
+ msgid "Not all applications could be removed"
+ msgstr "不是所有程序都能够被移除"
+ 
+-#: ../AppInstall/DialogComplete.py:149
++#: ../AppInstall/DialogComplete.py:152
+ msgid ""
+ "There has been a problem during the removal of the following applications."
+ msgstr "在移除下列程序时出现了问题"
+ 
+-#: ../AppInstall/DialogComplete.py:159
++#: ../AppInstall/DialogComplete.py:162
+ msgid "Installation and removal of software failed"
+ msgstr "安装和移除软件失败"
+ 
+-#: ../AppInstall/DialogComplete.py:160
++#: ../AppInstall/DialogComplete.py:163
+ msgid ""
+ "There has been a problem during the installation or removal of the following "
+ "pieces of software."
+ msgstr ""
+ 
+-#: ../AppInstall/DialogComplete.py:164
+-#, fuzzy
+-msgid "Installation and removal of applications failed"
+-msgstr "安装和删除程序"
++#: ../AppInstall/DialogComplete.py:167
+ 
+-#: ../AppInstall/DialogComplete.py:165
++msgid "Installation and removal of applications failed"
++msgstr "安装和删除应用程序失败"
++#: ../AppInstall/DialogComplete.py:168
+ msgid ""
+ "There has been a problem during the installation or removal of the following "
+ "applications."
+ msgstr ""
+ 
+-#: ../AppInstall/DialogComplete.py:173
+-#, fuzzy
++#: ../AppInstall/DialogComplete.py:176
++
+ msgid "New application has been installed"
+-msgstr "应用程序"
++msgstr "已安装新应用程序"
++#: ../AppInstall/DialogComplete.py:177
+ 
+-#: ../AppInstall/DialogComplete.py:174
+-#, fuzzy
+ msgid "New applications have been installed"
+-msgstr "应用程序"
+-
+-#: ../AppInstall/DialogComplete.py:179
++msgstr "已安装新应用程序"
++#: ../AppInstall/DialogComplete.py:182
+ msgid ""
+ "To start a newly installed application, choose it from the applications menu."
+ msgstr ""
+ 
+-#: ../AppInstall/DialogComplete.py:182
++#: ../AppInstall/DialogComplete.py:185
+ msgid "To start a newly installed application double click on it."
+-msgstr ""
++msgstr "要启动新安装的应用程序，请双击该程序。"
++
+ 
+-#: ../AppInstall/DialogComplete.py:186
++#: ../AppInstall/DialogComplete.py:189
+ msgid "Software has been installed successfully"
+ msgstr "软件已经成功地被安装了"
+ 
+-#: ../AppInstall/DialogComplete.py:187
+-#, fuzzy
++#: ../AppInstall/DialogComplete.py:190
++
+ msgid "Do you want to install or remove further software?"
+-msgstr "安装和删除程序"
++msgstr "是否还要安装或删除其他软件？"
++#: ../AppInstall/DialogComplete.py:195
+ 
+-#: ../AppInstall/DialogComplete.py:192
+-#, fuzzy
+ msgid "Applications have been removed successfully"
+-msgstr "应用程序"
++msgstr "已成功删除应用程序"
++#: ../AppInstall/DialogComplete.py:196
+ 
+-#: ../AppInstall/DialogComplete.py:193
+-#, fuzzy
+ msgid "Do you want to install or remove further applications?"
+-msgstr "安装和删除程序"
+-
++msgstr "是否还要安装或删除其他软件？"
+ #: ../AppInstall/DialogMultipleApps.py:33
+ #, python-format
+ msgid "Remove %s and bundled applications?"
+@@ -642,32 +646,27 @@
+ msgid "Accept the license terms and install the software"
+ msgstr "接受许可并安装软件"
+ 
+-#: ../AppInstall/Menu.py:100
++#: ../AppInstall/Menu.py:98
+ msgid "Loading cache..."
+ msgstr "正在载入缓存..."
+ 
+-#: ../AppInstall/Menu.py:109
++#: ../AppInstall/Menu.py:107
+ msgid "Collecting application data..."
+ msgstr "正在收集程序数据..."
+ 
+-#: ../AppInstall/Menu.py:311
++#: ../AppInstall/Menu.py:309
+ msgid "Loading applications..."
+ msgstr "载入程序"
+ 
+-#: ../AppInstall/Menu.py:315 ../AppInstall/Menu.py:318
++#: ../AppInstall/Menu.py:313 ../AppInstall/Menu.py:316
+ msgid "All"
+ msgstr "全部"
+ 
+-#: ../AppInstall/Menu.py:327
++#: ../AppInstall/Menu.py:325
+ #, python-format
+ msgid "Loading %s..."
+ msgstr "正在载入 %s..."
+ 
+-#: ../AppInstall/distros/Debian.py:15 ../AppInstall/distros/Default.py:13
+-#: ../AppInstall/distros/Ubuntu.py:15
+-msgid "All available applications"
+-msgstr "所有可安装应用程序"
+-
+ #: ../AppInstall/distros/Debian.py:16
+ msgid ""
+ "Show all applications including ones which are possibly restricted by law or "
+@@ -699,7 +698,8 @@
+ #: ../AppInstall/distros/Debian.py:37
+ #, python-format
+ msgid "Enable the installation of software from the %s component of Debian?"
+-msgstr ""
++msgstr "是否启用安装 Debian 的 %s 组件的软件？"
++
+ 
+ #. %s is the name of the component
+ #: ../AppInstall/distros/Debian.py:40 ../AppInstall/distros/Default.py:27
+@@ -710,7 +710,8 @@
+ 
+ #: ../AppInstall/distros/Debian.py:42
+ msgid "Enable the installaion of officially supported Debian software?"
+-msgstr ""
++msgstr "是否启用安装官方支持的 Debian 软件？"
++
+ 
+ #. %s is the name of the application
+ #: ../AppInstall/distros/Debian.py:45
+@@ -721,10 +722,9 @@
+ msgstr ""
+ 
+ #: ../AppInstall/distros/Debian.py:48
+-#, fuzzy
+-msgid "Enable the installation of partial free software?"
+-msgstr "安装和删除程序"
+ 
++msgid "Enable the installation of partial free software?"
++msgstr "是否启用安装半免费软件？"
+ #. %s is the name of the application
+ #: ../AppInstall/distros/Debian.py:50
+ #, python-format
+@@ -735,13 +735,12 @@
+ msgstr ""
+ 
+ #: ../AppInstall/distros/Debian.py:54
+-#, fuzzy
+-msgid "Enable the installation of non-free software?"
+-msgstr "安装和删除程序"
+ 
++msgid "Enable the installation of non-free software?"
++msgstr "是否启用安装非免费软件？"
+ #. %s is the name of the application
+ #: ../AppInstall/distros/Debian.py:56 ../AppInstall/distros/Ubuntu.py:63
+-#: ../AppInstall/distros/Ubuntu.py:114
++#: ../AppInstall/distros/Ubuntu.py:119
+ #, python-format
+ msgid ""
+ "The use, modification and distribution of %s is restricted by copyright or "
+@@ -752,13 +751,15 @@
+ #: ../AppInstall/distros/Debian.py:65
+ #, python-format
+ msgid "%s integrates well into the KDE desktop"
+-msgstr ""
++msgstr "%s 集成到 KDE 桌面"
++
+ 
+ #. %s is the name of an application
+ #: ../AppInstall/distros/Debian.py:70
+ #, python-format
+ msgid "%s integrates well into the GNOME desktop"
+-msgstr ""
++msgstr "%s 集成到 GNOME 桌面"
++
+ 
+ #. %s is the name of an application
+ #: ../AppInstall/distros/Debian.py:75
+@@ -770,12 +771,14 @@
+ #: ../AppInstall/distros/Debian.py:80
+ #, python-format
+ msgid "%s integrates well into the XFCE desktop"
+-msgstr ""
++msgstr "%s 集成到 XFCE 桌面"
++
+ 
+ #: ../AppInstall/distros/Debian.py:103
+ #, python-format
+ msgid "Debian provides support and security updates for %s"
+-msgstr ""
++msgstr "Debian 为 %s 提供支持和安全更新"
++
+ 
+ #: ../AppInstall/distros/Debian.py:108
+ #, python-format
+@@ -802,7 +805,8 @@
+ #: ../AppInstall/distros/Default.py:25 ../AppInstall/distros/Ubuntu.py:43
+ #, python-format
+ msgid "Enable the installation of software from the %s component of Ubuntu?"
+-msgstr ""
++msgstr "是否启用安装 Ubuntu 的 %s 组件的软件？"
++
+ 
+ #: ../AppInstall/distros/Ubuntu.py:16
+ msgid ""
+@@ -835,7 +839,8 @@
+ 
+ #: ../AppInstall/distros/Ubuntu.py:48
+ msgid "Enable the installaion of officially supported Ubuntu software?"
+-msgstr ""
++msgstr "是否启用安装官方支持的 Ubuntu 软件？"
++
+ 
+ #. %s is the name of the application
+ #: ../AppInstall/distros/Ubuntu.py:51
+@@ -847,7 +852,8 @@
+ 
+ #: ../AppInstall/distros/Ubuntu.py:54
+ msgid "Enable the installation of community maintained software?"
+-msgstr ""
++msgstr "是否启用安装社区维护的软件？"
++
+ 
+ #. %s is the name of the application
+ #: ../AppInstall/distros/Ubuntu.py:57
+@@ -859,14 +865,21 @@
+ 
+ #: ../AppInstall/distros/Ubuntu.py:60
+ msgid "Enable the installation of unsupported and restricted software?"
+-msgstr ""
++msgstr "是否启用安装不受支持和受限制的软件？"
++
+ 
+ #: ../AppInstall/distros/Ubuntu.py:96
++
++msgid ""
++"%s is provided by a third party vendor from the Canonical partner repository."
++msgstr ""
++"%s 由第三方供应商通过 Canonical 合作伙伴存储库提供。"
++#: ../AppInstall/distros/Ubuntu.py:101
+ #, python-format
+ msgid "Canonical Ltd. provides technical support and security updates for %s"
+ msgstr "Canonical有限公司为%s提供技术支持和安全更新"
+ 
+-#: ../AppInstall/distros/Ubuntu.py:109
++#: ../AppInstall/distros/Ubuntu.py:114
+ msgid "This application is provided by the Ubuntu community."
+ msgstr "此程序由Ubuntu社区提供"
+ 
+@@ -874,13 +887,13 @@
+ msgid "Description"
+ msgstr "描述"
+ 
+-#: ../AppInstall/widgets/AppDescView.py:75
++#: ../AppInstall/widgets/AppDescView.py:87
+ #, python-format
+ msgid "%s cannot be installed"
+ msgstr "无法安装 %s"
+ 
+ #. warn that this app is not available on this plattform
+-#: ../AppInstall/widgets/AppDescView.py:84
++#: ../AppInstall/widgets/AppDescView.py:96
+ #, python-format
+ msgid ""
+ "%s cannot be installed on your computer type (%s). Either the application "
+@@ -890,11 +903,18 @@
+ "无法将%s安装到您的计算机类型(%s)。应用程序需要特殊的硬件或者提供者不再支持您"
+ "的计算机类型。"
+ 
+-#: ../AppInstall/widgets/AppDescView.py:96
++#: ../AppInstall/widgets/AppDescView.py:108
+ msgid "This application is bundled with the following applications: "
+ msgstr "这个软件与下列软件绑定: "
+ 
+-#: ../AppInstall/widgets/AppDescView.py:196
++#: ../AppInstall/widgets/AppDescView.py:208
++#, python-format
++msgid ""
++"\n"
++"Homepage: %s\n"
++msgstr ""
++
++#: ../AppInstall/widgets/AppDescView.py:210
+ #, python-format
+ msgid "Version: %s (%s)"
+ msgstr "版本：%s (%s)"
+@@ -908,6 +928,9 @@
+ msgid "Application"
+ msgstr "应用程序"
+ 
++#~ msgid "To perform advanced tasks use the Synaptic package manager."
++#~ msgstr "更高级任务请用新得立软件包管理器"
++
+ #~ msgid "%s integrates well into the Kubuntu desktop"
+ #~ msgstr "%s 集成到Kubuntu桌面"
+ 
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/zh_TW.po gnome-app-install-0.5.2.8.new/po/zh_TW.po
+--- gnome-app-install-0.5.2.8/po/zh_TW.po	2008-06-10 05:39:55.000000000 -0400
++++ gnome-app-install-0.5.2.8.new/po/zh_TW.po	2008-10-29 16:56:25.000000000 -0400
+@@ -6,10 +6,10 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: gnome-app-install\n"
+-"Report-Msgid-Bugs-To: Sebastian Heinlein <sebi@glatzor.de>\n"
+-"POT-Creation-Date: 2008-01-04 20:30+0100\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2008-10-03 13:54-0400\n"
+ "PO-Revision-Date: 2007-09-24 09:39+0000\n"
+-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
++"Last-Translator: LIOX <EMAIL@ADDRESS>\n"
+ "Language-Team: Chinese (Taiwan) <zh_TW@li.org>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -18,10 +18,9 @@
+ "X-Generator: Launchpad (build Unknown)\n"
+ 
+ #: ../data/gnome-app-install.schemas.in.h:1
+-#, fuzzy
++
+ msgid "Components that have been confirmed to install applications from"
+ msgstr "已確認要安裝應用程式的來源元件"
+-
+ #: ../data/gnome-app-install.schemas.in.h:2
+ msgid "If true, the main window is maximized."
+ msgstr "如果值是 true，主視窗會被最大化。"
+@@ -120,10 +119,9 @@
+ msgstr "取消待辦的更改並關閉視窗"
+ 
+ #: ../data/gnome-app-install.glade.h:12
+-#, fuzzy
++
+ msgid "Categories"
+ msgstr "分類"
+-
+ #: ../data/gnome-app-install.glade.h:13
+ msgid "Licence"
+ msgstr "授權"
+@@ -179,37 +177,37 @@
+ msgid "Package Manager"
+ msgstr "套件管理程式"
+ 
+-#: ../AppInstall/activation.py:112
++#: ../AppInstall/activation.py:116
+ msgid "no suitable application"
+ msgstr "無合適的應用程式"
+ 
+-#: ../AppInstall/activation.py:113
++#: ../AppInstall/activation.py:117
+ msgid ""
+ "No application suitable for automatic installation is available for handling "
+ "this kind of file."
+ msgstr "沒有可以處理此類型檔案的應用程式供自動安裝。"
+ 
+-#: ../AppInstall/activation.py:116
++#: ../AppInstall/activation.py:120
+ msgid "no application found"
+ msgstr "找不到應用程式"
+ 
+-#: ../AppInstall/activation.py:117
++#: ../AppInstall/activation.py:121
+ msgid "No application is known for this kind of file."
+ msgstr "無應用程式可處理此類型檔案。"
+ 
+-#: ../AppInstall/activation.py:131 ../AppInstall/activation.py:289
++#: ../AppInstall/activation.py:134 ../AppInstall/activation.py:296
+ msgid "Searching for appropriate applications"
+ msgstr "搜尋合適的應用程式"
+ 
+-#: ../AppInstall/activation.py:133 ../AppInstall/activation.py:192
++#: ../AppInstall/activation.py:136 ../AppInstall/activation.py:195
+ msgid "Please wait. This might take a minute or two."
+ msgstr "這可能要花一、兩分鐘的時間，請耐心等待。"
+ 
+-#: ../AppInstall/activation.py:161
++#: ../AppInstall/activation.py:164
+ msgid "Search for suitable codec?"
+ msgstr "搜尋合適的解碼器 (codec) ?"
+ 
+-#: ../AppInstall/activation.py:162
++#: ../AppInstall/activation.py:165
+ msgid ""
+ "The required software to play this file is not installed. You need to "
+ "install suitable codecs to play media files. Do you want to search for a "
+@@ -223,46 +221,46 @@
+ "\n"
+ "這個搜尋也會包含官方不支援的軟體。"
+ 
+-#: ../AppInstall/activation.py:173
++#: ../AppInstall/activation.py:176
+ msgid "Invalid commandline"
+ msgstr "無效的命令列"
+ 
+-#: ../AppInstall/activation.py:174
++#: ../AppInstall/activation.py:177
+ #, python-format
+ msgid "'%s' does not understand the commandline argument '%s'"
+ msgstr "‘%s’ 並不明白命令列參數 ‘%s’"
+ 
+-#: ../AppInstall/activation.py:190
++#: ../AppInstall/activation.py:193
+ msgid "Searching for appropriate codecs"
+ msgstr "搜尋合適的 codecs"
+ 
+-#: ../AppInstall/activation.py:195 ../AppInstall/activation.py:294
++#: ../AppInstall/activation.py:198 ../AppInstall/activation.py:301
+ msgid "_Install"
+ msgstr "安裝(_I)"
+ 
+-#: ../AppInstall/activation.py:196
++#: ../AppInstall/activation.py:199
+ msgid "Install multimedia codecs"
+ msgstr "安裝多媒體 codecs"
+ 
+-#: ../AppInstall/activation.py:200
++#: ../AppInstall/activation.py:203
+ msgid "Codec"
+ msgstr "解碼器 (Codec)"
+ 
+-#: ../AppInstall/activation.py:231
++#: ../AppInstall/activation.py:234
+ msgid "additional codec installation declined"
+ msgstr "附加 codec 安裝被拒絕"
+ 
+-#: ../AppInstall/activation.py:235
++#: ../AppInstall/activation.py:238
+ msgid "additional codec installation failed"
+ msgstr "附加 codec 安裝失敗"
+ 
+ #. TRANSLATORS: %s represents a file path
+-#: ../AppInstall/activation.py:256
++#: ../AppInstall/activation.py:263
+ #, python-format
+ msgid "\"%s\" cannot be opened"
+ msgstr "“%s” 未能被開啟"
+ 
+-#: ../AppInstall/activation.py:291
++#: ../AppInstall/activation.py:298
+ #, python-format
+ msgid ""
+ "A list of applications that can handle documents of the type '%s' will be "
+@@ -270,94 +268,99 @@
+ msgstr "一個可以處理 ‘%s’ 類型文件的應用程式列表將被建立"
+ 
+ #. TRANSLATORS: %s represents a file path
+-#: ../AppInstall/activation.py:297
++#: ../AppInstall/activation.py:304
+ #, python-format
+ msgid "Install applications to open \"%s\""
+ msgstr "安裝應用程式以開啟 “%s”"
+ 
+-#: ../AppInstall/activation.py:300
++#: ../AppInstall/activation.py:307
+ msgid "Install applications"
+ msgstr "安裝應用程式"
+ 
+-#: ../AppInstall/activation.py:311
++#: ../AppInstall/activation.py:318
+ msgid "_Search"
+ msgstr "搜尋 (_S)"
+ 
+-#: ../AppInstall/activation.py:345
++#: ../AppInstall/activation.py:352
+ msgid "Searching for extensions"
+ msgstr "搜尋附加元件"
+ 
+-#: ../AppInstall/activation.py:346
++#: ../AppInstall/activation.py:353
+ msgid "Extensions allow you to add new features to your application."
+ msgstr "附加元件讓您為您的應用程式增加新功能。"
+ 
+-#: ../AppInstall/activation.py:348
++#: ../AppInstall/activation.py:355
+ msgid "Install/Remove Extensions"
+ msgstr "添加/刪除附加元件"
+ 
+-#: ../AppInstall/activation.py:350
++#: ../AppInstall/activation.py:357
+ msgid "Extension"
+ msgstr "附加元件"
+ 
+-#: ../AppInstall/AppInstall.py:174
++#: ../AppInstall/AppInstall.py:173
+ msgid ""
+ "To install an application check the box next to the application. Uncheck the "
+ "box to remove the application."
+ msgstr "勾選應用程式旁的方框來安裝此應用程式，除消勾選則刪除此應用程式。"
+ 
+-#: ../AppInstall/AppInstall.py:177
+-msgid "To perform advanced tasks use the Synaptic package manager."
+-msgstr "要處理更高階的任務，請使用 Synaptic 套件管理程式。"
+-
+-#: ../AppInstall/AppInstall.py:179
++#: ../AppInstall/AppInstall.py:176
+ msgid "Quick Introduction"
+ msgstr "簡要說明"
+ 
+-#: ../AppInstall/AppInstall.py:225
+-#, fuzzy
+-msgid "Installed applications only"
+-msgstr "已安裝的應用程式"
++#. Just two filters needed, one to show all apps and one to show only installed apps
++#: ../AppInstall/AppInstall.py:200 ../AppInstall/distros/Debian.py:15
++#: ../AppInstall/distros/Default.py:13 ../AppInstall/distros/Ubuntu.py:15
++msgid "All available applications"
++msgstr "所有可安裝應用程式"
++
++#: ../AppInstall/AppInstall.py:201
+ 
+-#: ../AppInstall/AppInstall.py:226
++msgid "Show all applications that are available for your computer"
++msgstr "顯示可安裝於您電腦的所有應用程式"
++#: ../AppInstall/AppInstall.py:206
++
++msgid "Installed applications only"
++msgstr "僅限已安裝的應用程式"
++#: ../AppInstall/AppInstall.py:207
+ msgid "Show only applications that are installed on your computer"
+ msgstr "只顯示已安裝在您電腦中的應用程式"
+ 
+-#: ../AppInstall/AppInstall.py:318
++#: ../AppInstall/AppInstall.py:299
+ msgid "Error reading the addon CD"
+ msgstr "讀取附加軟體光碟錯誤"
+ 
+-#: ../AppInstall/AppInstall.py:319
++#: ../AppInstall/AppInstall.py:300
+ msgid "The addon CD may be corrupt "
+ msgstr "這片加值光碟可能已損壞 "
+ 
+-#: ../AppInstall/AppInstall.py:453
+-msgid "The list of applications is not availabe"
+-msgstr "無法取得應用程式清單"
++#: ../AppInstall/AppInstall.py:434
+ 
+-#: ../AppInstall/AppInstall.py:454
++msgid "The list of applications is not available"
++msgstr "無法取得應用程式清單"
++#: ../AppInstall/AppInstall.py:435
+ msgid ""
+ "Click on 'Reload' to load it. To reload the list you need a working internet "
+ "connection. "
+ msgstr ""
+ "按下 '重新整理' 按鈕來載入它。 要重新載入清單，你需要有可作用的網路連線。 "
+ 
+-#: ../AppInstall/AppInstall.py:473
++#: ../AppInstall/AppInstall.py:454
+ #, python-format
+ msgid "%s cannot be installed on your computer type (%s)"
+ msgstr "%s 不能安裝在您的電腦類型 (%s)"
+ 
+-#: ../AppInstall/AppInstall.py:476
++#: ../AppInstall/AppInstall.py:457
+ msgid ""
+ "Either the application requires special hardware features or the vendor "
+ "decided to not support your computer type."
+ msgstr "應用程式可能需要特別的硬體功能或者生產商決定不支援您的電腦類型。"
+ 
+-#: ../AppInstall/AppInstall.py:517
++#: ../AppInstall/AppInstall.py:498
+ #, python-format
+ msgid "Cannot install '%s'"
+ msgstr "無法安裝 '%s'"
+ 
+-#: ../AppInstall/AppInstall.py:518
++#: ../AppInstall/AppInstall.py:499
+ #, python-format
+ msgid ""
+ "This application conflicts with other installed software. To install '%s' "
+@@ -369,12 +372,12 @@
+ "\n"
+ "請切換至 ‘Synaptic’ 套件管理程式去解決此衝突。"
+ 
+-#: ../AppInstall/AppInstall.py:579
++#: ../AppInstall/AppInstall.py:560
+ #, python-format
+ msgid "Cannot remove '%s'"
+ msgstr "無法刪除‘%s’"
+ 
+-#: ../AppInstall/AppInstall.py:580
++#: ../AppInstall/AppInstall.py:561
+ #, python-format
+ msgid ""
+ "One or more applications depend on %s. To remove %s and the dependent "
+@@ -383,55 +386,56 @@
+ "一個或多個應用程式依靠 %s。請使用 Synaptic 套件管理程式刪除 %s 及其相依應用程"
+ "式。"
+ 
+-#: ../AppInstall/AppInstall.py:669
++#: ../AppInstall/AppInstall.py:650
+ msgid "Confirm installation of restricted software"
+ msgstr "確定安裝受限制軟體"
+ 
+-#: ../AppInstall/AppInstall.py:670
++#: ../AppInstall/AppInstall.py:651
++
+ msgid ""
+ "The use of this software may be restricted in some countries. You must "
+ "verify that one of the following is true:\n"
+ "\n"
+-"• These restrictions do not apply in your country of legal residence\n"
+-"• You have permission to use this software (for  example, a patent license)\n"
+-"• You are using this software for research purposes only"
++"* These restrictions do not apply in your country of legal residence\n"
++"* You have permission to use this software (for  example, a patent license)\n"
++"* You are using this software for research purposes only"
+ msgstr ""
+-"在一些國家使用此軟體可能會受到限制。您一定要確定以下任何一個條件正確：\n"
++"此軟體僅限於在某些國家/地區使用。您必須"
++"確認下列其中一項為真：\n"
+ "\n"
+-"• 您的合法居住國家沒有這些限制\n"
+-"• 您有授權使用此軟體 (例如，有專利授權)\n"
+-"• 您只使用此軟體作研究用途"
+-
+-#: ../AppInstall/AppInstall.py:680
++"* 這些限制不適用於您合法居住的國家/地區\n"
++"* 您有使用此軟體的權限（例如專利授權）\n"
++"* 您只能在研究範圍內使用此軟體"
++#: ../AppInstall/AppInstall.py:661
+ msgid "_Confirm"
+ msgstr "確定(_C)"
+ 
+-#: ../AppInstall/AppInstall.py:719 ../AppInstall/DialogProprietary.py:23
++#: ../AppInstall/AppInstall.py:700 ../AppInstall/DialogProprietary.py:23
+ #, python-format
+ msgid "Enable the installation of software from %s?"
+ msgstr "啟用由 %s 安裝軟體？"
+ 
+-#: ../AppInstall/AppInstall.py:721
++#: ../AppInstall/AppInstall.py:702
+ #, python-format
+ msgid ""
+ "%s is provided by a third party vendor. The third party vendor is "
+ "responsible for support and security updates."
+ msgstr "%s 是由第三方生產商提供的。由第三方生產商承担支援和安全更新。"
+ 
+-#: ../AppInstall/AppInstall.py:725 ../AppInstall/DialogProprietary.py:26
++#: ../AppInstall/AppInstall.py:706 ../AppInstall/DialogProprietary.py:26
+ msgid "You need a working internet connection to continue."
+ msgstr "您需要連接網際網路才可以繼續。"
+ 
+-#: ../AppInstall/AppInstall.py:729 ../AppInstall/DialogProprietary.py:34
++#: ../AppInstall/AppInstall.py:710 ../AppInstall/DialogProprietary.py:34
+ msgid "_Enable"
+ msgstr "啟用(_E)"
+ 
+ #. show an error dialog if something went wrong with the cache
+-#: ../AppInstall/AppInstall.py:953
++#: ../AppInstall/AppInstall.py:934
+ msgid "Failed to check for installed and available applications"
+ msgstr "檢查已安裝和可安裝的應用程式失敗"
+ 
+-#: ../AppInstall/AppInstall.py:954
++#: ../AppInstall/AppInstall.py:935
+ msgid ""
+ "This is a major failure of your software management system. Please check for "
+ "broken packages with synaptic, check the file permissions and correctness of "
+@@ -442,53 +446,53 @@
+ "‘/etc/apt/sources.list’ 的權限和內容是否正確，然後使用命令 ‘sudo apt-get "
+ "update’ 和 ‘sudo apt-get install -f’ 重新載入軟體資訊。"
+ 
+-#: ../AppInstall/AppInstall.py:1005
++#: ../AppInstall/AppInstall.py:986
+ msgid "Apply changes to installed applications before closing?"
+ msgstr "關閉之前套用更改到已安裝的應用程式嗎?"
+ 
+-#: ../AppInstall/AppInstall.py:1006
++#: ../AppInstall/AppInstall.py:987
+ msgid "If you do not apply your changes they will be lost permanently."
+ msgstr "如果您不套用更改，此更改內容將會永遠丟失。"
+ 
+-#: ../AppInstall/AppInstall.py:1010
++#: ../AppInstall/AppInstall.py:991
+ msgid "_Close Without Applying"
+ msgstr "關閉而不套用更改(_C)"
+ 
+ #. FIXME: move this inside the dialog class, we show a different
+ #. text for a quit dialog and a approve dialog
+-#: ../AppInstall/AppInstall.py:1071
++#: ../AppInstall/AppInstall.py:1053
+ msgid "Apply the following changes?"
+ msgstr "套用以下更改嗎?"
+ 
+-#: ../AppInstall/AppInstall.py:1072
++#: ../AppInstall/AppInstall.py:1054
+ msgid ""
+ "Please take a final look through the list of applications that will be "
+ "installed or removed."
+ msgstr "請對要安裝和刪除的應用程式列表作最後的確認。"
+ 
+-#: ../AppInstall/AppInstall.py:1281
++#: ../AppInstall/AppInstall.py:1263
+ msgid "There is no matching application available."
+ msgstr "沒有符合的應用程式。"
+ 
+ #. TRANSLATORS: %s represents a filter name
+-#: ../AppInstall/AppInstall.py:1291
++#: ../AppInstall/AppInstall.py:1273
+ #, python-format
+ msgid "To broaden your search, choose \"%s\"."
+ msgstr "選擇 “%s” 以擴大您的搜尋。"
+ 
+ #. TRANSLATORS: %s represents a filter name
+-#: ../AppInstall/AppInstall.py:1295
++#: ../AppInstall/AppInstall.py:1277
+ #, python-format
+ msgid "To broaden your search, choose \"%s\" or \"%s\"."
+ msgstr "選擇 “%s” 或 “%s” 以擴大您的搜尋。"
+ 
+ #. TRANSLATORS: Show refers to the Show: combobox
+-#: ../AppInstall/AppInstall.py:1301
++#: ../AppInstall/AppInstall.py:1283
+ msgid "To broaden your search, choose a different \"Show\" item."
+ msgstr "選擇不同的 “顯示” 項目以擴大您的搜尋。"
+ 
+ #. TRANSLATORS: All refers to the All category in the left list
+-#: ../AppInstall/AppInstall.py:1307
++#: ../AppInstall/AppInstall.py:1289
+ msgid "To broaden your search, choose 'All' categories."
+ msgstr "請選擇 ‘全部’ 分類去擴大您的搜尋。"
+ 
+@@ -497,104 +501,104 @@
+ msgid "Failed to open '%s'"
+ msgstr "開啟 ‘%s’ 失敗"
+ 
+-#: ../AppInstall/CoreMenu.py:127
++#: ../AppInstall/CoreMenu.py:128
+ msgid "Applications"
+ msgstr "應用程式"
+ 
+-#: ../AppInstall/DialogComplete.py:128
++#: ../AppInstall/DialogComplete.py:131
+ msgid "Software installation failed"
+ msgstr "軟體安裝失敗"
+ 
+-#: ../AppInstall/DialogComplete.py:129
++#: ../AppInstall/DialogComplete.py:132
+ msgid ""
+ "There has been a problem during the installation of the following pieces of "
+ "software."
+ msgstr "安裝下列軟體的過程中發生問題。"
+ 
+-#: ../AppInstall/DialogComplete.py:131 ../AppInstall/DialogComplete.py:146
+-#: ../AppInstall/DialogComplete.py:162 ../AppInstall/DialogComplete.py:190
++#: ../AppInstall/DialogComplete.py:134 ../AppInstall/DialogComplete.py:149
++#: ../AppInstall/DialogComplete.py:165 ../AppInstall/DialogComplete.py:193
+ msgid "Add/Remove More Software"
+ msgstr "新增/移除更多軟體"
+ 
+-#: ../AppInstall/DialogComplete.py:133
++#: ../AppInstall/DialogComplete.py:136
+ msgid "Application installation failed"
+ msgstr "應用程式安裝失敗"
+ 
+-#: ../AppInstall/DialogComplete.py:134
++#: ../AppInstall/DialogComplete.py:137
+ msgid ""
+ "There has been a problem during the installation of the following "
+ "applications."
+ msgstr "安裝下列應用程式時發生一些問題。"
+ 
+-#: ../AppInstall/DialogComplete.py:143
++#: ../AppInstall/DialogComplete.py:146
+ msgid "Software could not be removed"
+ msgstr "無法移除軟體"
+ 
+-#: ../AppInstall/DialogComplete.py:144
++#: ../AppInstall/DialogComplete.py:147
+ msgid ""
+ "There has been a problem during the removal of the following pieces of "
+ "software."
+ msgstr "移除下列軟體的過程中發生問題。"
+ 
+-#: ../AppInstall/DialogComplete.py:148
++#: ../AppInstall/DialogComplete.py:151
+ msgid "Not all applications could be removed"
+ msgstr "不是所有應用程式可以被刪除"
+ 
+-#: ../AppInstall/DialogComplete.py:149
++#: ../AppInstall/DialogComplete.py:152
+ msgid ""
+ "There has been a problem during the removal of the following applications."
+ msgstr "刪除下列應用程式時發生一些問題。"
+ 
+-#: ../AppInstall/DialogComplete.py:159
++#: ../AppInstall/DialogComplete.py:162
+ msgid "Installation and removal of software failed"
+ msgstr "安裝及移除軟體失敗"
+ 
+-#: ../AppInstall/DialogComplete.py:160
++#: ../AppInstall/DialogComplete.py:163
+ msgid ""
+ "There has been a problem during the installation or removal of the following "
+ "pieces of software."
+ msgstr "在安裝或移除下列軟體的過程當中發生問題。"
+ 
+-#: ../AppInstall/DialogComplete.py:164
++#: ../AppInstall/DialogComplete.py:167
+ msgid "Installation and removal of applications failed"
+ msgstr "安裝移除應用程式失敗"
+ 
+-#: ../AppInstall/DialogComplete.py:165
++#: ../AppInstall/DialogComplete.py:168
+ msgid ""
+ "There has been a problem during the installation or removal of the following "
+ "applications."
+ msgstr "安裝或刪除下列應用程式時發生一些問題。"
+ 
+-#: ../AppInstall/DialogComplete.py:173
++#: ../AppInstall/DialogComplete.py:176
+ msgid "New application has been installed"
+ msgstr "新的應用程式已經安裝"
+ 
+-#: ../AppInstall/DialogComplete.py:174
++#: ../AppInstall/DialogComplete.py:177
+ msgid "New applications have been installed"
+ msgstr "新的應用程式已經安裝"
+ 
+-#: ../AppInstall/DialogComplete.py:179
++#: ../AppInstall/DialogComplete.py:182
+ msgid ""
+ "To start a newly installed application, choose it from the applications menu."
+ msgstr "要啟動新安裝的應用程式，在應用程式選單選取它。"
+ 
+-#: ../AppInstall/DialogComplete.py:182
++#: ../AppInstall/DialogComplete.py:185
+ msgid "To start a newly installed application double click on it."
+ msgstr "要啟動新安裝的應用程式，雙擊它。"
+ 
+-#: ../AppInstall/DialogComplete.py:186
++#: ../AppInstall/DialogComplete.py:189
+ msgid "Software has been installed successfully"
+ msgstr "軟體已經成功安裝"
+ 
+-#: ../AppInstall/DialogComplete.py:187
++#: ../AppInstall/DialogComplete.py:190
+ msgid "Do you want to install or remove further software?"
+ msgstr "你是否要安裝或移除更多軟體？"
+ 
+-#: ../AppInstall/DialogComplete.py:192
++#: ../AppInstall/DialogComplete.py:195
+ msgid "Applications have been removed successfully"
+ msgstr "應用程式已經成功移除"
+ 
+-#: ../AppInstall/DialogComplete.py:193
++#: ../AppInstall/DialogComplete.py:196
+ msgid "Do you want to install or remove further applications?"
+ msgstr "你是否要安裝或移除更多應用程式？"
+ 
+@@ -645,32 +649,27 @@
+ msgid "Accept the license terms and install the software"
+ msgstr "同意授權證款項並安裝軟體"
+ 
+-#: ../AppInstall/Menu.py:100
++#: ../AppInstall/Menu.py:98
+ msgid "Loading cache..."
+ msgstr "載入快取..."
+ 
+-#: ../AppInstall/Menu.py:109
++#: ../AppInstall/Menu.py:107
+ msgid "Collecting application data..."
+ msgstr "收集應用程式資料..."
+ 
+-#: ../AppInstall/Menu.py:311
++#: ../AppInstall/Menu.py:309
+ msgid "Loading applications..."
+ msgstr "載入應用程式..."
+ 
+-#: ../AppInstall/Menu.py:315 ../AppInstall/Menu.py:318
++#: ../AppInstall/Menu.py:313 ../AppInstall/Menu.py:316
+ msgid "All"
+ msgstr "全部"
+ 
+-#: ../AppInstall/Menu.py:327
++#: ../AppInstall/Menu.py:325
+ #, python-format
+ msgid "Loading %s..."
+ msgstr "載入%s 中..."
+ 
+-#: ../AppInstall/distros/Debian.py:15 ../AppInstall/distros/Default.py:13
+-#: ../AppInstall/distros/Ubuntu.py:15
+-msgid "All available applications"
+-msgstr "所有可安裝應用程式"
+-
+ #: ../AppInstall/distros/Debian.py:16
+ msgid ""
+ "Show all applications including ones which are possibly restricted by law or "
+@@ -747,7 +746,7 @@
+ 
+ #. %s is the name of the application
+ #: ../AppInstall/distros/Debian.py:56 ../AppInstall/distros/Ubuntu.py:63
+-#: ../AppInstall/distros/Ubuntu.py:114
++#: ../AppInstall/distros/Ubuntu.py:119
+ #, python-format
+ msgid ""
+ "The use, modification and distribution of %s is restricted by copyright or "
+@@ -878,11 +877,17 @@
+ msgstr "啟用安裝不受支援和受限制的軟體？"
+ 
+ #: ../AppInstall/distros/Ubuntu.py:96
++
++msgid ""
++"%s is provided by a third party vendor from the Canonical partner repository."
++msgstr ""
++"%s 是由 Canonical 合作夥伴套件庫協力廠商所提供。"
++#: ../AppInstall/distros/Ubuntu.py:101
+ #, python-format
+ msgid "Canonical Ltd. provides technical support and security updates for %s"
+ msgstr "Canonical 有限公司提供 %s 的技術支援和安全更新"
+ 
+-#: ../AppInstall/distros/Ubuntu.py:109
++#: ../AppInstall/distros/Ubuntu.py:114
+ msgid "This application is provided by the Ubuntu community."
+ msgstr "此應用程式是由 Ubuntu 社群提供的。"
+ 
+@@ -890,13 +895,13 @@
+ msgid "Description"
+ msgstr "描述"
+ 
+-#: ../AppInstall/widgets/AppDescView.py:75
++#: ../AppInstall/widgets/AppDescView.py:87
+ #, python-format
+ msgid "%s cannot be installed"
+ msgstr "不能安裝 %s"
+ 
+ #. warn that this app is not available on this plattform
+-#: ../AppInstall/widgets/AppDescView.py:84
++#: ../AppInstall/widgets/AppDescView.py:96
+ #, python-format
+ msgid ""
+ "%s cannot be installed on your computer type (%s). Either the application "
+@@ -906,11 +911,18 @@
+ "%s 不能安裝在您的電腦類型 (%s)。這可能是因為應用程式需要特殊的硬體功能，或者"
+ "生產商不支援您的電腦類型。"
+ 
+-#: ../AppInstall/widgets/AppDescView.py:96
++#: ../AppInstall/widgets/AppDescView.py:108
+ msgid "This application is bundled with the following applications: "
+ msgstr "此應用程式和以下應用程式綑綁： "
+ 
+-#: ../AppInstall/widgets/AppDescView.py:196
++#: ../AppInstall/widgets/AppDescView.py:208
++#, python-format
++msgid ""
++"\n"
++"Homepage: %s\n"
++msgstr ""
++
++#: ../AppInstall/widgets/AppDescView.py:210
+ #, python-format
+ msgid "Version: %s (%s)"
+ msgstr "版本：%s (%s)"
+@@ -924,6 +936,9 @@
+ msgid "Application"
+ msgstr "應用程式"
+ 
++#~ msgid "To perform advanced tasks use the Synaptic package manager."
++#~ msgstr "要處理更高階的任務，請使用 Synaptic 套件管理程式。"
++
+ #~ msgid "%s integrates well into the Kubuntu desktop"
+ #~ msgstr "%s 已整合到 Kubuntu 桌面"
+ 
--- gnome-app-install-0.5.2.8.orig/debian/patches/18_drop_ubuntu.patch
+++ gnome-app-install-0.5.2.8/debian/patches/18_drop_ubuntu.patch
@@ -0,0 +1,602 @@
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/data/gnome-app-install.glade gnome-app-install-0.5.2.8.new/data/gnome-app-install.glade
+--- gnome-app-install-0.5.2.8/data/gnome-app-install.glade	2008-06-10 05:39:55.000000000 -0400
++++ gnome-app-install-0.5.2.8.new/data/gnome-app-install.glade	2008-11-20 10:34:57.000000000 -0500
+@@ -1294,9 +1294,7 @@
+       <child>
+ 	<widget class="GtkLabel" id="label_progress">
+ 	  <property name="visible">True</property>
+-	  <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;Checking installed and available applications&lt;/b&gt;&lt;/big&gt;
+-
+-Ubuntu and third party vendors offer you a large variety of applications that you can install on your system.</property>
++	  <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;Checking installed and available applications&lt;/b&gt;&lt;/big&gt;</property>
+ 	  <property name="use_underline">False</property>
+ 	  <property name="use_markup">True</property>
+ 	  <property name="justify">GTK_JUSTIFY_LEFT</property>
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/bg.po gnome-app-install-0.5.2.8.new/po/bg.po
+--- gnome-app-install-0.5.2.8/po/bg.po	2008-06-10 05:39:55.000000000 -0400
++++ gnome-app-install-0.5.2.8.new/po/bg.po	2008-11-20 10:36:17.000000000 -0500
+@@ -86,15 +86,9 @@
+ 
+ #: ../data/gnome-app-install.glade.h:3
+ msgid ""
+-"<big><b>Checking installed and available applications</b></big>\n"
+-"\n"
+-"Ubuntu and third party vendors offer you a large variety of applications "
+-"that you can install on your system."
++"<big><b>Checking installed and available applications</b></big>"
+ msgstr ""
+-"<big><b>Проверка на инсталираните и предлаганите приложения</b></big>\n"
+-"\n"
+-"Убунту и трети страни доставчици предлагат широко разнообразие от "
+-"приложения, които можете да инсталирате на системата си."
++"<big><b>Проверка на инсталираните и предлаганите приложения</b></big>"
+ 
+ #: ../data/gnome-app-install.glade.h:6
+ msgid ""
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/ca.po gnome-app-install-0.5.2.8.new/po/ca.po
+--- gnome-app-install-0.5.2.8/po/ca.po	2008-06-10 05:39:55.000000000 -0400
++++ gnome-app-install-0.5.2.8.new/po/ca.po	2008-11-20 10:36:33.000000000 -0500
+@@ -96,16 +96,10 @@
+ 
+ #: ../data/gnome-app-install.glade.h:3
+ msgid ""
+-"<big><b>Checking installed and available applications</b></big>\n"
+-"\n"
+-"Ubuntu and third party vendors offer you a large variety of applications "
+-"that you can install on your system."
++"<big><b>Checking installed and available applications</b></big>"
+ msgstr ""
+ "<big><b>S'estan comprovant les aplicacions instal·lades i disponibles</b></"
+-"big>\n"
+-"\n"
+-"Ubuntu i els proveïdors externs us ofereixen una amplia varietat "
+-"d'aplicacions que podeu instal·lar al vostre sistema."
++"big>"
+ 
+ #: ../data/gnome-app-install.glade.h:6
+ msgid ""
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/cs.po gnome-app-install-0.5.2.8.new/po/cs.po
+--- gnome-app-install-0.5.2.8/po/cs.po	2008-06-10 05:39:55.000000000 -0400
++++ gnome-app-install-0.5.2.8.new/po/cs.po	2008-11-20 10:36:51.000000000 -0500
+@@ -83,15 +83,9 @@
+ 
+ #: ../data/gnome-app-install.glade.h:3
+ msgid ""
+-"<big><b>Checking installed and available applications</b></big>\n"
+-"\n"
+-"Ubuntu and third party vendors offer you a large variety of applications "
+-"that you can install on your system."
++"<big><b>Checking installed and available applications</b></big>"
+ msgstr ""
+-"<big><b>Kontroluji nainstalované a dostupné aplikace</b></big>\n"
+-"\n"
+-"Ubuntu a výrobci třetích stran nabízejí širokou škálu aplikací, které můžete "
+-"do vašeho systému nainstalovat."
++"<big><b>Kontroluji nainstalované a dostupné aplikace</b></big>"
+ 
+ #: ../data/gnome-app-install.glade.h:6
+ msgid ""
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/de.po gnome-app-install-0.5.2.8.new/po/de.po
+--- gnome-app-install-0.5.2.8/po/de.po	2008-11-20 10:34:18.000000000 -0500
++++ gnome-app-install-0.5.2.8.new/po/de.po	2008-11-20 10:37:03.000000000 -0500
+@@ -95,15 +95,9 @@
+ 
+ #: ../data/gnome-app-install.glade.h:3
+ msgid ""
+-"<big><b>Checking installed and available applications</b></big>\n"
+-"\n"
+-"Ubuntu and third party vendors offer you a large variety of applications "
+-"that you can install on your system."
++"<big><b>Checking installed and available applications</b></big>"
+ msgstr ""
+-"<big><b>Installierte und verfügbare Anwendungen werden überprüft</b></big>\n"
+-"\n"
+-"Ubuntu und Drittanbieter bieten Ihnen eine große Vielfalt an Anwendungen, "
+-"die Sie auf Ihrem System installieren können."
++"<big><b>Installierte und verfügbare Anwendungen werden überprüft</b></big>"
+ 
+ #: ../data/gnome-app-install.glade.h:6
+ msgid ""
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/el.po gnome-app-install-0.5.2.8.new/po/el.po
+--- gnome-app-install-0.5.2.8/po/el.po	2008-06-10 05:39:55.000000000 -0400
++++ gnome-app-install-0.5.2.8.new/po/el.po	2008-11-20 10:37:11.000000000 -0500
+@@ -83,15 +83,9 @@
+ 
+ #: ../data/gnome-app-install.glade.h:3
+ msgid ""
+-"<big><b>Checking installed and available applications</b></big>\n"
+-"\n"
+-"Ubuntu and third party vendors offer you a large variety of applications "
+-"that you can install on your system."
++"<big><b>Checking installed and available applications</b></big>"
+ msgstr ""
+-"<big><b>Έλεγχος για εγκατεστημένες και διαθέσιμες εφαρμογές</b></big>\n"
+-"\n"
+-"Το Ubuntu και τρίτοι παροχείς σας προσφέρουν μια πληθώρα εφαρμογών που "
+-"μπορείτε να εγκαταστήσετε στο σύστημά  σας."
++"<big><b>Έλεγχος για εγκατεστημένες και διαθέσιμες εφαρμογές</b></big>"
+ 
+ #: ../data/gnome-app-install.glade.h:6
+ msgid ""
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/eo.po gnome-app-install-0.5.2.8.new/po/eo.po
+--- gnome-app-install-0.5.2.8/po/eo.po	2008-06-10 05:39:55.000000000 -0400
++++ gnome-app-install-0.5.2.8.new/po/eo.po	2008-11-20 10:37:30.000000000 -0500
+@@ -83,15 +83,9 @@
+ 
+ #: ../data/gnome-app-install.glade.h:3
+ msgid ""
+-"<big><b>Checking installed and available applications</b></big>\n"
+-"\n"
+-"Ubuntu and third party vendors offer you a large variety of applications "
+-"that you can install on your system."
++"<big><b>Checking installed and available applications</b></big>"
+ msgstr ""
+-"<big><b>Kontrolante instalitajn kaj haveblajn aplikaĵojn</b></big>\n"
+-"\n"
+-"Ubuntu kaj alipartiaj vendistoj ofertas grandan variecon da aplikaĵoj kiujn "
+-"vi povas instali en via sistemo."
++"<big><b>Kontrolante instalitajn kaj haveblajn aplikaĵojn</b></big>"
+ 
+ #: ../data/gnome-app-install.glade.h:6
+ msgid ""
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/es.po gnome-app-install-0.5.2.8.new/po/es.po
+--- gnome-app-install-0.5.2.8/po/es.po	2008-11-20 10:34:18.000000000 -0500
++++ gnome-app-install-0.5.2.8.new/po/es.po	2008-11-20 10:37:38.000000000 -0500
+@@ -95,15 +95,9 @@
+ 
+ #: ../data/gnome-app-install.glade.h:3
+ msgid ""
+-"<big><b>Checking installed and available applications</b></big>\n"
+-"\n"
+-"Ubuntu and third party vendors offer you a large variety of applications "
+-"that you can install on your system."
++"<big><b>Checking installed and available applications</b></big>"
+ msgstr ""
+-"<big><b>Comprobando aplicaciones instaladas y disponibles</b></big>\n"
+-"\n"
+-"Ubuntu y otros proveedores le ofrecen una amplia variedad de aplicaciones "
+-"que puede instalar en su sistema."
++"<big><b>Comprobando aplicaciones instaladas y disponibles</b></big>"
+ 
+ #: ../data/gnome-app-install.glade.h:6
+ msgid ""
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/eu.po gnome-app-install-0.5.2.8.new/po/eu.po
+--- gnome-app-install-0.5.2.8/po/eu.po	2008-06-10 05:39:55.000000000 -0400
++++ gnome-app-install-0.5.2.8.new/po/eu.po	2008-11-20 10:37:52.000000000 -0500
+@@ -93,16 +93,10 @@
+ 
+ #: ../data/gnome-app-install.glade.h:3
+ msgid ""
+-"<big><b>Checking installed and available applications</b></big>\n"
+-"\n"
+-"Ubuntu and third party vendors offer you a large variety of applications "
+-"that you can install on your system."
++"<big><b>Checking installed and available applications</b></big>"
+ msgstr ""
+ "<big><b>Instalatuta dauden edo eskuragarri diren aplikazioak bilatzen</b></"
+-"big>\n"
+-"\n"
+-"Ubuntu eta 'Third Party' saltzaileek aplikazio ugari eskaintzen dituzte zure "
+-"sisteman instalatu ahal ditzazun."
++"big>"
+ 
+ #: ../data/gnome-app-install.glade.h:6
+ msgid ""
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/fi.po gnome-app-install-0.5.2.8.new/po/fi.po
+--- gnome-app-install-0.5.2.8/po/fi.po	2008-06-10 05:39:55.000000000 -0400
++++ gnome-app-install-0.5.2.8.new/po/fi.po	2008-11-20 10:38:03.000000000 -0500
+@@ -92,15 +92,9 @@
+ 
+ #: ../data/gnome-app-install.glade.h:3
+ msgid ""
+-"<big><b>Checking installed and available applications</b></big>\n"
+-"\n"
+-"Ubuntu and third party vendors offer you a large variety of applications "
+-"that you can install on your system."
++"<big><b>Checking installed and available applications</b></big>"
+ msgstr ""
+-"<big><b>Tarkistetaan asennettuja ja saatavilla olevia sovelluksia</b></big>\n"
+-"\n"
+-"Ubuntu ja kolmannet osapuolet tarjoavat suuren valikoiman järjestelmään "
+-"asennettavia sovelluksia."
++"<big><b>Tarkistetaan asennettuja ja saatavilla olevia sovelluksia</b></big>"
+ 
+ #: ../data/gnome-app-install.glade.h:6
+ msgid ""
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/fr.po gnome-app-install-0.5.2.8.new/po/fr.po
+--- gnome-app-install-0.5.2.8/po/fr.po	2008-11-20 10:34:18.000000000 -0500
++++ gnome-app-install-0.5.2.8.new/po/fr.po	2008-11-20 10:38:11.000000000 -0500
+@@ -94,15 +94,9 @@
+ 
+ #: ../data/gnome-app-install.glade.h:3
+ msgid ""
+-"<big><b>Checking installed and available applications</b></big>\n"
+-"\n"
+-"Ubuntu and third party vendors offer you a large variety of applications "
+-"that you can install on your system."
++"<big><b>Checking installed and available applications</b></big>"
+ msgstr ""
+-"<big><b>Vérification des applications disponibles et installées</b></big>\n"
+-"\n"
+-"Ubuntu et les fournisseurs tierce-partie mettent à votre disposition une "
+-"large gamme d'applications que vous pouvez installer sur votre ordinateur."
++"<big><b>Vérification des applications disponibles et installées</b></big>"
+ 
+ #: ../data/gnome-app-install.glade.h:6
+ msgid ""
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/he.po gnome-app-install-0.5.2.8.new/po/he.po
+--- gnome-app-install-0.5.2.8/po/he.po	2008-06-10 05:39:55.000000000 -0400
++++ gnome-app-install-0.5.2.8.new/po/he.po	2008-11-20 10:38:30.000000000 -0500
+@@ -84,14 +84,9 @@
+ 
+ #: ../data/gnome-app-install.glade.h:3
+ msgid ""
+-"<big><b>Checking installed and available applications</b></big>\n"
+-"\n"
+-"Ubuntu and third party vendors offer you a large variety of applications "
+-"that you can install on your system."
++"<big><b>Checking installed and available applications</b></big>"
+ msgstr ""
+-"<big><b>בדיקת היישומים המותקנים והיישומים הזמינים להתקנה</b></big>\n"
+-"\n"
+-"אובונטו ויצרני צד-שלישי מציעים מבחר רחב של תכנות להתקנה על מחשבך."
++"<big><b>בדיקת היישומים המותקנים והיישומים הזמינים להתקנה</b></big>"
+ 
+ #: ../data/gnome-app-install.glade.h:6
+ msgid ""
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/hu.po gnome-app-install-0.5.2.8.new/po/hu.po
+--- gnome-app-install-0.5.2.8/po/hu.po	2008-06-10 05:39:55.000000000 -0400
++++ gnome-app-install-0.5.2.8.new/po/hu.po	2008-11-20 10:38:42.000000000 -0500
+@@ -92,15 +92,9 @@
+ 
+ #: ../data/gnome-app-install.glade.h:3
+ msgid ""
+-"<big><b>Checking installed and available applications</b></big>\n"
+-"\n"
+-"Ubuntu and third party vendors offer you a large variety of applications "
+-"that you can install on your system."
++"<big><b>Checking installed and available applications</b></big>"
+ msgstr ""
+-"<big><b>Telepített és elérhető alkalmazások ellenőrzése</b></big>\n"
+-"\n"
+-"Az Ubuntu és más szállítók a rendszerre telepíthető alkalmazások széles "
+-"választékát biztosítják."
++"<big><b>Telepített és elérhető alkalmazások ellenőrzése</b></big>"
+ 
+ #: ../data/gnome-app-install.glade.h:6
+ msgid ""
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/id.po gnome-app-install-0.5.2.8.new/po/id.po
+--- gnome-app-install-0.5.2.8/po/id.po	2008-06-10 05:39:55.000000000 -0400
++++ gnome-app-install-0.5.2.8.new/po/id.po	2008-11-20 10:38:50.000000000 -0500
+@@ -93,16 +93,10 @@
+ 
+ #: ../data/gnome-app-install.glade.h:3
+ msgid ""
+-"<big><b>Checking installed and available applications</b></big>\n"
+-"\n"
+-"Ubuntu and third party vendors offer you a large variety of applications "
+-"that you can install on your system."
++"<big><b>Checking installed and available applications</b></big>"
+ msgstr ""
+ "<big><b>Memeriksa aplikasi-aplikasi yang telah terpasang dan tersedia</b></"
+-"big>\n"
+-"\n"
+-"Ubuntu dan para penyedia pihak ketiga menawarkan pada Anda banyak ragam "
+-"aplikasi yang dapat Anda pasang pada sistem Anda."
++"big>"
+ 
+ #: ../data/gnome-app-install.glade.h:6
+ msgid ""
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/it.po gnome-app-install-0.5.2.8.new/po/it.po
+--- gnome-app-install-0.5.2.8/po/it.po	2008-11-20 10:34:18.000000000 -0500
++++ gnome-app-install-0.5.2.8.new/po/it.po	2008-11-20 10:39:00.000000000 -0500
+@@ -94,15 +94,9 @@
+ 
+ #: ../data/gnome-app-install.glade.h:3
+ msgid ""
+-"<big><b>Checking installed and available applications</b></big>\n"
+-"\n"
+-"Ubuntu and third party vendors offer you a large variety of applications "
+-"that you can install on your system."
++"<big><b>Checking installed and available applications</b></big>"
+ msgstr ""
+-"<big><b>Controllo applicazioni installate e disponibili</b></big>\n"
+-"\n"
+-"Ubuntu e i vendor di terze parti offrono una variegata disponibilità di "
+-"applicazioni che è possibile installare sul proprio sistema."
++"<big><b>Controllo applicazioni installate e disponibili</b></big>"
+ 
+ #: ../data/gnome-app-install.glade.h:6
+ msgid ""
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/ja.po gnome-app-install-0.5.2.8.new/po/ja.po
+--- gnome-app-install-0.5.2.8/po/ja.po	2008-11-20 10:34:18.000000000 -0500
++++ gnome-app-install-0.5.2.8.new/po/ja.po	2008-11-20 10:39:09.000000000 -0500
+@@ -90,16 +90,10 @@
+ 
+ #: ../data/gnome-app-install.glade.h:3
+ msgid ""
+-"<big><b>Checking installed and available applications</b></big>\n"
+-"\n"
+-"Ubuntu and third party vendors offer you a large variety of applications "
+-"that you can install on your system."
++"<big><b>Checking installed and available applications</b></big>"
+ msgstr ""
+ "<big><b>インストールされているないし利用できるアプリケーションを確認中</b></"
+-"big>\n"
+-"\n"
+-"Ubuntuとサードパーティベンダーは、ご利用のシステムにインストールできる多くの"
+-"種類のアプリケーションを提案します。"
++"big>"
+ 
+ #: ../data/gnome-app-install.glade.h:6
+ msgid ""
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/ko.po gnome-app-install-0.5.2.8.new/po/ko.po
+--- gnome-app-install-0.5.2.8/po/ko.po	2008-11-20 10:34:18.000000000 -0500
++++ gnome-app-install-0.5.2.8.new/po/ko.po	2008-11-20 10:39:21.000000000 -0500
+@@ -89,15 +89,9 @@
+ 
+ #: ../data/gnome-app-install.glade.h:3
+ msgid ""
+-"<big><b>Checking installed and available applications</b></big>\n"
+-"\n"
+-"Ubuntu and third party vendors offer you a large variety of applications "
+-"that you can install on your system."
++"<big><b>Checking installed and available applications</b></big>"
+ msgstr ""
+-"<big><b>설치되어 이용할 수 있는 프로그램 체크</b></big>\n"
+-"\n"
+-"우분투와 타사 업체들은 여러분의 시스템에 설치할 수 있는 방대한 양의 프로"
+-"그램들을 제공합니다."
++"<big><b>설치되어 이용할 수 있는 프로그램 체크</b></big>"
+ 
+ #: ../data/gnome-app-install.glade.h:6
+ msgid ""
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/mk.po gnome-app-install-0.5.2.8.new/po/mk.po
+--- gnome-app-install-0.5.2.8/po/mk.po	2008-06-10 05:39:55.000000000 -0400
++++ gnome-app-install-0.5.2.8.new/po/mk.po	2008-11-20 10:39:39.000000000 -0500
+@@ -93,15 +93,9 @@
+ 
+ #: ../data/gnome-app-install.glade.h:3
+ msgid ""
+-"<big><b>Checking installed and available applications</b></big>\n"
+-"\n"
+-"Ubuntu and third party vendors offer you a large variety of applications "
+-"that you can install on your system."
++"<big><b>Checking installed and available applications</b></big>"
+ msgstr ""
+-"<big><b>Проверувам инсталирани и достапни апликации</b></big>\n"
+-"\n"
+-"Ubuntu и други дилери Ви нудат голема разновидност на апликации кои можете "
+-"да ги инсталирате на Вашиот систем."
++"<big><b>Проверувам инсталирани и достапни апликации</b></big>"
+ 
+ #: ../data/gnome-app-install.glade.h:6
+ msgid ""
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/nl.po gnome-app-install-0.5.2.8.new/po/nl.po
+--- gnome-app-install-0.5.2.8/po/nl.po	2008-06-10 05:39:55.000000000 -0400
++++ gnome-app-install-0.5.2.8.new/po/nl.po	2008-11-20 10:39:54.000000000 -0500
+@@ -92,15 +92,9 @@
+ 
+ #: ../data/gnome-app-install.glade.h:3
+ msgid ""
+-"<big><b>Checking installed and available applications</b></big>\n"
+-"\n"
+-"Ubuntu and third party vendors offer you a large variety of applications "
+-"that you can install on your system."
++"<big><b>Checking installed and available applications</b></big>"
+ msgstr ""
+-"<big><b>Controle van geïnstalleerde en beschikbare programma's</b></big>\n"
+-"\n"
+-"Ubuntu en derden bieden u een breed scala van programma's aan die u op uw "
+-"systeem kunt installeren."
++"<big><b>Controle van geïnstalleerde en beschikbare programma's</b></big>"
+ 
+ #: ../data/gnome-app-install.glade.h:6
+ msgid ""
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/pl.po gnome-app-install-0.5.2.8.new/po/pl.po
+--- gnome-app-install-0.5.2.8/po/pl.po	2008-06-10 05:39:55.000000000 -0400
++++ gnome-app-install-0.5.2.8.new/po/pl.po	2008-11-20 10:40:09.000000000 -0500
+@@ -97,15 +97,9 @@
+ 
+ #: ../data/gnome-app-install.glade.h:3
+ msgid ""
+-"<big><b>Checking installed and available applications</b></big>\n"
+-"\n"
+-"Ubuntu and third party vendors offer you a large variety of applications "
+-"that you can install on your system."
++"<big><b>Checking installed and available applications</b></big>"
+ msgstr ""
+-"<big><b>Sprawdzanie zainstalowanych i dostępnych aplikacji</b></big>\n"
+-"\n"
+-"Ubuntu i inni dostawcy oprogramowania oferują dużą różnorodność aplikacji do "
+-"zainstalowania w twoim systemie."
++"<big><b>Sprawdzanie zainstalowanych i dostępnych aplikacji</b></big>"
+ 
+ #: ../data/gnome-app-install.glade.h:6
+ msgid ""
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/pt_BR.po gnome-app-install-0.5.2.8.new/po/pt_BR.po
+--- gnome-app-install-0.5.2.8/po/pt_BR.po	2008-06-10 05:39:55.000000000 -0400
++++ gnome-app-install-0.5.2.8.new/po/pt_BR.po	2008-11-20 10:40:18.000000000 -0500
+@@ -93,15 +93,9 @@
+ 
+ #: ../data/gnome-app-install.glade.h:3
+ msgid ""
+-"<big><b>Checking installed and available applications</b></big>\n"
+-"\n"
+-"Ubuntu and third party vendors offer you a large variety of applications "
+-"that you can install on your system."
++"<big><b>Checking installed and available applications</b></big>"
+ msgstr ""
+-"<big><b>Checar aplicações disponíveis e instaladas</b></big>\n"
+-"\n"
+-"Ubuntu e terceiros oferecem uma grande variedade de softwares que você pode "
+-"instalar no seu sistema."
++"<big><b>Checar aplicações disponíveis e instaladas</b></big>"
+ 
+ #: ../data/gnome-app-install.glade.h:6
+ msgid ""
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/pt.po gnome-app-install-0.5.2.8.new/po/pt.po
+--- gnome-app-install-0.5.2.8/po/pt.po	2008-06-10 05:39:55.000000000 -0400
++++ gnome-app-install-0.5.2.8.new/po/pt.po	2008-11-20 10:40:26.000000000 -0500
+@@ -93,15 +93,9 @@
+ 
+ #: ../data/gnome-app-install.glade.h:3
+ msgid ""
+-"<big><b>Checking installed and available applications</b></big>\n"
+-"\n"
+-"Ubuntu and third party vendors offer you a large variety of applications "
+-"that you can install on your system."
++"<big><b>Checking installed and available applications</b></big>"
+ msgstr ""
+-"<big><b>A verificar aplicações instaladas e disponíveis</b></big>\n"
+-"\n"
+-"O Ubuntu e outros fornecedores disponibilizam-lhe uma grande variedade de "
+-"aplicações que pode instalar no seu sistema."
++"<big><b>A verificar aplicações instaladas e disponíveis</b></big>"
+ 
+ #: ../data/gnome-app-install.glade.h:6
+ msgid ""
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/ro.po gnome-app-install-0.5.2.8.new/po/ro.po
+--- gnome-app-install-0.5.2.8/po/ro.po	2008-06-10 05:39:55.000000000 -0400
++++ gnome-app-install-0.5.2.8.new/po/ro.po	2008-11-20 10:40:32.000000000 -0500
+@@ -95,15 +95,9 @@
+ 
+ #: ../data/gnome-app-install.glade.h:3
+ msgid ""
+-"<big><b>Checking installed and available applications</b></big>\n"
+-"\n"
+-"Ubuntu and third party vendors offer you a large variety of applications "
+-"that you can install on your system."
++"<big><b>Checking installed and available applications</b></big>"
+ msgstr ""
+-"<big><b>Se verifică aplicaţiile instalate şi cele disponibile</b></big>\n"
+-"\n"
+-"Ubuntu, precum şi surse terţe oferă o gama largă de aplicaţii ce pot fi "
+-"instalate pe sistemul dumneavoastră."
++"<big><b>Se verifică aplicaţiile instalate şi cele disponibile</b></big>"
+ 
+ #: ../data/gnome-app-install.glade.h:6
+ msgid ""
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/ru.po gnome-app-install-0.5.2.8.new/po/ru.po
+--- gnome-app-install-0.5.2.8/po/ru.po	2008-11-20 10:34:18.000000000 -0500
++++ gnome-app-install-0.5.2.8.new/po/ru.po	2008-11-20 10:40:39.000000000 -0500
+@@ -91,15 +91,9 @@
+ 
+ #: ../data/gnome-app-install.glade.h:3
+ msgid ""
+-"<big><b>Checking installed and available applications</b></big>\n"
+-"\n"
+-"Ubuntu and third party vendors offer you a large variety of applications "
+-"that you can install on your system."
++"<big><b>Checking installed and available applications</b></big>"
+ msgstr ""
+-"<big><b>Проверка установленных и доступных приложений</b></big>\n"
+-"\n"
+-"Ubuntu и сторонние вендоры предоставляют вам большое количество приложений, "
+-"которые вы можете установить в вашу систему."
++"<big><b>Проверка установленных и доступных приложений</b></big>"
+ 
+ #: ../data/gnome-app-install.glade.h:6
+ msgid ""
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/sv.po gnome-app-install-0.5.2.8.new/po/sv.po
+--- gnome-app-install-0.5.2.8/po/sv.po	2008-06-10 05:39:55.000000000 -0400
++++ gnome-app-install-0.5.2.8.new/po/sv.po	2008-11-20 10:40:55.000000000 -0500
+@@ -92,15 +92,9 @@
+ 
+ #: ../data/gnome-app-install.glade.h:3
+ msgid ""
+-"<big><b>Checking installed and available applications</b></big>\n"
+-"\n"
+-"Ubuntu and third party vendors offer you a large variety of applications "
+-"that you can install on your system."
++"<big><b>Checking installed and available applications</b></big>"
+ msgstr ""
+-"<big><b>Kontrollerar installerade och tillgängliga program</b></big>\n"
+-"\n"
+-"Ubuntu och tredjepartsleverantörer erbjuder dig en mängd olika program som "
+-"du kan installera på ditt system."
++"<big><b>Kontrollerar installerade och tillgängliga program</b></big>"
+ 
+ #: ../data/gnome-app-install.glade.h:6
+ msgid ""
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/tr.po gnome-app-install-0.5.2.8.new/po/tr.po
+--- gnome-app-install-0.5.2.8/po/tr.po	2008-06-10 05:39:55.000000000 -0400
++++ gnome-app-install-0.5.2.8.new/po/tr.po	2008-11-20 10:41:06.000000000 -0500
+@@ -83,15 +83,9 @@
+ 
+ #: ../data/gnome-app-install.glade.h:3
+ msgid ""
+-"<big><b>Checking installed and available applications</b></big>\n"
+-"\n"
+-"Ubuntu and third party vendors offer you a large variety of applications "
+-"that you can install on your system."
++"<big><b>Checking installed and available applications</b></big>"
+ msgstr ""
+-"<big><b>Kurulu ve mevcut uygulamalar denetleniyor</b></big>\n"
+-"\n"
+-"Ubuntu ve üçüncü taraf satıcılar size sisteminize kurabileceğiniz çok "
+-"çeşitli uygulamalar sunmaktalar."
++"<big><b>Kurulu ve mevcut uygulamalar denetleniyor</b></big>"
+ 
+ #: ../data/gnome-app-install.glade.h:6
+ msgid ""
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/zh_CN.po gnome-app-install-0.5.2.8.new/po/zh_CN.po
+--- gnome-app-install-0.5.2.8/po/zh_CN.po	2008-11-20 10:34:18.000000000 -0500
++++ gnome-app-install-0.5.2.8.new/po/zh_CN.po	2008-11-20 10:41:21.000000000 -0500
+@@ -86,14 +86,9 @@
+ 
+ #: ../data/gnome-app-install.glade.h:3
+ msgid ""
+-"<big><b>Checking installed and available applications</b></big>\n"
+-"\n"
+-"Ubuntu and third party vendors offer you a large variety of applications "
+-"that you can install on your system."
++"<big><b>Checking installed and available applications</b></big>"
+ msgstr ""
+-"<big><b>检查已安装和可用程序</b></big>\n"
+-"\n"
+-"Ubuntu 和第三方公司提供了大量应用程序供您安装使用。"
++"<big><b>检查已安装和可用程序</b></big>"
+ 
+ #: ../data/gnome-app-install.glade.h:6
+ msgid ""
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/zh_HK.po gnome-app-install-0.5.2.8.new/po/zh_HK.po
+--- gnome-app-install-0.5.2.8/po/zh_HK.po	2008-06-10 05:39:55.000000000 -0400
++++ gnome-app-install-0.5.2.8.new/po/zh_HK.po	2008-11-20 10:41:29.000000000 -0500
+@@ -88,14 +88,9 @@
+ 
+ #: ../data/gnome-app-install.glade.h:3
+ msgid ""
+-"<big><b>Checking installed and available applications</b></big>\n"
+-"\n"
+-"Ubuntu and third party vendors offer you a large variety of applications "
+-"that you can install on your system."
++"<big><b>Checking installed and available applications</b></big>"
+ msgstr ""
+-"<big><b>檢查已安裝和可安裝應用程式</b></big>\n"
+-"\n"
+-"Ubuntu 和第三方生產商提供了大量應用程式讓您安裝使用。"
++"<big><b>檢查已安裝和可安裝應用程式</b></big>"
+ 
+ #: ../data/gnome-app-install.glade.h:6
+ msgid ""
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/po/zh_TW.po gnome-app-install-0.5.2.8.new/po/zh_TW.po
+--- gnome-app-install-0.5.2.8/po/zh_TW.po	2008-11-20 10:34:18.000000000 -0500
++++ gnome-app-install-0.5.2.8.new/po/zh_TW.po	2008-11-20 10:41:36.000000000 -0500
+@@ -87,14 +87,9 @@
+ 
+ #: ../data/gnome-app-install.glade.h:3
+ msgid ""
+-"<big><b>Checking installed and available applications</b></big>\n"
+-"\n"
+-"Ubuntu and third party vendors offer you a large variety of applications "
+-"that you can install on your system."
++"<big><b>Checking installed and available applications</b></big>"
+ msgstr ""
+-"<big><b>檢查已安裝和可安裝應用程式</b></big>\n"
+-"\n"
+-"Ubuntu 和第三方生產商提供了大量應用程式讓您安裝使用。"
++"<big><b>檢查已安裝和可安裝應用程式</b></big>"
+ 
+ #: ../data/gnome-app-install.glade.h:6
+ msgid ""
--- gnome-app-install-0.5.2.8.orig/debian/patches/10_app_filter_combo.patch
+++ gnome-app-install-0.5.2.8/debian/patches/10_app_filter_combo.patch
@@ -0,0 +1,82 @@
+diff -Nur -x '*.orig' -x '*~' gnome-app-install-0.5.2.8/AppInstall/AppInstall.py gnome-app-install-0.5.2.8.new/AppInstall/AppInstall.py
+--- gnome-app-install-0.5.2.8/AppInstall/AppInstall.py	2008-07-31 17:34:39.000000000 +0000
++++ gnome-app-install-0.5.2.8.new/AppInstall/AppInstall.py	2008-07-31 17:37:24.000000000 +0000
+@@ -90,7 +90,7 @@
+ from Util import *
+ from Cache import MyCache
+ 
+-from Menu import SHOW_ALL, SHOW_ONLY_SUPPORTED, SHOW_ONLY_FREE, SHOW_ONLY_MAIN, SHOW_ONLY_PROPRIETARY, SHOW_ONLY_THIRD_PARTY, SHOW_ONLY_INSTALLED
++from Menu import SHOW_ALL, SHOW_ONLY_INSTALLED
+ 
+ 
+ 
+@@ -173,8 +173,6 @@
+         msg = _("To install an application check the box next to the "
+                 "application. Uncheck the box to remove "
+                 "the application.") + "\n"
+-        msg += _("To perform advanced tasks use the "
+-                 "Synaptic package manager.")
+         header = _("Quick Introduction")
+         self.textview_description.show_message(header, msg)
+         self.textview_description.show()
+@@ -187,9 +185,8 @@
+         self.components_seen = self.config.get_list("/apps/gnome-app-install/components_seen", "string")
+ 
+         # combobx with filters for the application list
+-        filter_to_restore = self.config.get_int("/apps/gnome-app-install/filter_applications")
+-        if filter_to_restore not in range(7):
+-            filter_to_restore = 0
++        # always default to showing all applications
++        filter_to_restore = 0
+         list_filters = gtk.ListStore(gobject.TYPE_STRING,
+                                      gobject.TYPE_BOOLEAN,
+                                      gobject.TYPE_STRING,
+@@ -199,32 +196,17 @@
+         self.combobox_filter.pack_start(filter_renderer)
+         # Prepare a set of filters
+         filters = []
+-        # Load the primary filters of the distro
+-        sorted_keys = self.distro.filters_primary.keys()
+-        sorted_keys.sort()
+-        for filter in sorted_keys:
+-            filters.append((self.distro.filters_primary[filter][0],
+-                            False,
+-                            self.distro.filters_primary[filter][1],
+-                            filter))
+-        # Load the secondary filters of the distro if available and add
+-        # a separator
+-        if self.distro.filters_secondary:
+-            filters.append(("separator", True, "separator", -1))
+-            sorted_keys = self.distro.filters_secondary.keys()
+-            sorted_keys.sort()
+-            for filter in sorted_keys:
+-                filters.append((self.distro.filters_secondary[filter][0],
+-                                False,
+-                                self.distro.filters_secondary[filter][1],
+-                                filter))
++        # Just two filters needed, one to show all apps and one to show only installed apps
++        filters.append((_("All available applications"), False, 
++                        _("Show all applications that are available "\
++                          "for your computer"), 
++                          SHOW_ALL))
+         # Do not show the installed applications filter in installer only mode
+         if not self.activation_style.isInstallerOnly:
+-            filters.extend([("separator", True, "separator", -1),
+-                            (_("Installed applications only"), False, 
++            filters.append((_("Installed applications only"), False,
+                              _("Show only applications "\
+                                "that are installed on your computer"), 
+-                             SHOW_ONLY_INSTALLED)])
++                             SHOW_ONLY_INSTALLED))
+         for (desc, sep, tooltip, filter) in filters:
+             list_filters.append((desc, sep, tooltip, filter))
+             self.combobox_filter.set_row_separator_func(self.separator_filter)
+@@ -932,7 +914,7 @@
+         # redraw the treeview so that all check buttons are updated
+         self.treeview_packages.queue_draw()
+ 
+-    def updateCache(self, filter=SHOW_ONLY_SUPPORTED):
++    def updateCache(self, filter=SHOW_ALL):
+         self.window_main.set_sensitive(False)
+         self.setBusy(True)
+ 
