[conduit/gsoc09_alexandre: 24/24] Merge branch 'master' into gsoc09_alexandre

[Alexandre Rosenfeld <arosenfeld src gnome org>]

commit 5287758a08f0f6099cf3044a19bf6b4372fe5253
Merge: 093d9c3... ae44cc6...
Author: Alexandre Rosenfeld <airmind gmail com>
Date:   Thu Aug 13 01:10:48 2009 -0300

    Merge branch 'master' into gsoc09_alexandre
    
    Conflicts:
    	conduit/Main.py
    	conduit/Module.py
    	conduit/dataproviders/__init__.py
    	conduit/modules/SynceModule.py

 ChangeLog                                          |   22 +
 NEWS                                               |    4 +
 conduit/Knowledge.py                               |   20 +-
 conduit/Main.py                                    |   25 +-
 conduit/Module.py                                  |    4 +-
 conduit/__init__.py                                |    2 +-
 conduit/conduit.real                               |    2 +-
 conduit/dataproviders/DataProvider.py              |   26 +-
 conduit/dataproviders/Image.py                     |    6 +-
 conduit/dataproviders/__init__.py                  |   21 +-
 conduit/gtkui/Canvas.py                            |    6 +-
 conduit/gtkui/Database.py                          |    6 +-
 conduit/gtkui/Tree.py                              |   10 +-
 conduit/gtkui/UI.py                                |   33 +-
 conduit/modules/BackpackModule/BackpackModule.py   |   10 +-
 conduit/modules/BansheeModule/BansheeModule.py     |    4 +-
 conduit/modules/BoxDotNetModule/BoxDotNetModule.py |    6 +-
 conduit/modules/ConverterModule.py                 |  102 ++-
 conduit/modules/DesktopWallpaperModule.py          |   49 +-
 conduit/modules/EvolutionModule/EvolutionModule.py |    2 +-
 conduit/modules/FacebookModule/FacebookModule.py   |    8 +-
 conduit/modules/FeedModule/FeedModule.py           |   20 +-
 conduit/modules/FileModule/FileConfiguration.py    |    7 +-
 conduit/modules/FileModule/FileModule.py           |   14 -
 conduit/modules/Firefox3Module/Firefox3Module.py   |   25 +-
 conduit/modules/FlickrModule/FlickrModule.py       |    4 +-
 conduit/modules/FspotModule/FspotModule.py         |   14 +-
 conduit/modules/GConfModule/GConfModule.py         |   12 +-
 conduit/modules/GoogleBookmarksModule.py           |   12 +-
 conduit/modules/NautilusBookmarksModule.py         |   10 +-
 conduit/modules/NetworkModule/XMLRPCUtils.py       |    8 +-
 conduit/modules/RhythmboxModule/RhythmboxModule.py |    4 +-
 conduit/modules/SynceModule.py                     |   12 +-
 conduit/modules/TomboyModule.py                    |    6 +-
 conduit/modules/ZotoModule/ZotoModule.py           |   10 +-
 conduit/modules/iPodModule/iPodModule.py           |   42 +-
 configure.ac                                       |    2 +-
 po/POTFILES.in                                     |   13 +-
 po/es.po                                           |  774 ++++++++++---
 po/hu.po                                           | 1025 +++++++++++------
 po/nb.po                                           | 1217 ++++++++++++--------
 scripts/maintainer.py                              | 1113 ------------------
 scripts/release.sh                                 |   14 -
 43 files changed, 2407 insertions(+), 2319 deletions(-)
---
diff --cc conduit/Main.py
index beaaee1,39c1d81..0f27343
--- a/conduit/Main.py
+++ b/conduit/Main.py
@@@ -4,7 -4,7 +4,8 @@@ import sy
  import dbus, dbus.service, dbus.mainloop.glib
  import gobject
  import logging
 +import traceback
+ from gettext import gettext as _
  
  dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
  dbus.mainloop.glib.threads_init()
diff --cc conduit/Module.py
index 7275a50,ba632f6..1619dfc
--- a/conduit/Module.py
+++ b/conduit/Module.py
@@@ -21,8 -17,7 +21,10 @@@ import conduit.ModuleWrapper as ModuleW
  import conduit.Knowledge as Knowledge
  import conduit.Vfs as Vfs
  
 +class Error(Exception):
 +    pass
++    
+ from gettext import gettext as _
  
  class ModuleManager(gobject.GObject):
      """
diff --cc conduit/dataproviders/__init__.py
index 6496bb5,37c3ed2..c401aef
--- a/conduit/dataproviders/__init__.py
+++ b/conduit/dataproviders/__init__.py
@@@ -1,25 -1,14 +1,26 @@@
  import DataProviderCategory
  
- #Default Categories for the DataProviders
+ def N_(message): return message
  
+ #Default Categories for the DataProviders
 -CATEGORY_FILES = DataProviderCategory.DataProviderCategory(N_("Files and Folders"), "computer")
 -CATEGORY_NOTES = DataProviderCategory.DataProviderCategory(N_("Notes"), "tomboy")
 -CATEGORY_PHOTOS = DataProviderCategory.DataProviderCategory(N_("Photos"), "image-x-generic")
 -CATEGORY_OFFICE = DataProviderCategory.DataProviderCategory(N_("Office"), "applications-office")
 -CATEGORY_SETTINGS = DataProviderCategory.DataProviderCategory(N_("Settings"), "applications-system")
 -CATEGORY_MISC = DataProviderCategory.DataProviderCategory(N_("Miscellaneous"), "applications-accessories")
 -CATEGORY_MEDIA = DataProviderCategory.DataProviderCategory(N_("Media"), "applications-multimedia")
 -CATEGORY_BOOKMARKS = DataProviderCategory.DataProviderCategory(N_("Bookmarks"), "user-bookmarks")
 -CATEGORY_TEST = DataProviderCategory.DataProviderCategory(N_("Test"))
 +CATEGORY_FILES = 'CATEGORY_FILES'
 +CATEGORY_NOTES = 'CATEGORY_NOTES'
 +CATEGORY_PHOTOS = 'CATEGORY_PHOTOS'
 +CATEGORY_OFFICE = 'CATEGORY_OFFICE'
 +CATEGORY_SETTINGS = 'CATEGORY_SETTINGS'
 +CATEGORY_MISC = 'CATEGORY_MISC'
 +CATEGORY_MEDIA = 'CATEGORY_MEDIA'
 +CATEGORY_BOOKMARKS = 'CATEGORY_BOOKMARKS'
 +CATEGORY_TEST = 'CATEGORY_TEST'
 +
 +CATEGORIES = {
-     CATEGORY_FILES : DataProviderCategory.DataProviderCategory("Files and Folders", "computer"),
-     CATEGORY_NOTES : DataProviderCategory.DataProviderCategory("Notes", "tomboy"),
-     CATEGORY_PHOTOS : DataProviderCategory.DataProviderCategory("Photos", "image-x-generic"),
-     CATEGORY_OFFICE : DataProviderCategory.DataProviderCategory("Office", "applications-office"),
-     CATEGORY_SETTINGS : DataProviderCategory.DataProviderCategory("Settings", "applications-system"),
-     CATEGORY_MISC : DataProviderCategory.DataProviderCategory("Miscellaneous", "applications-accessories"),
-     CATEGORY_MEDIA : DataProviderCategory.DataProviderCategory("Media", "applications-multimedia"),
-     CATEGORY_BOOKMARKS : DataProviderCategory.DataProviderCategory("Bookmarks", "user-bookmarks"),
-     CATEGORY_TEST : DataProviderCategory.DataProviderCategory("Test")
++    CATEGORY_FILES = DataProviderCategory.DataProviderCategory(N_("Files and Folders"), "computer")
++    CATEGORY_NOTES = DataProviderCategory.DataProviderCategory(N_("Notes"), "tomboy")
++    CATEGORY_PHOTOS = DataProviderCategory.DataProviderCategory(N_("Photos"), "image-x-generic")
++    CATEGORY_OFFICE = DataProviderCategory.DataProviderCategory(N_("Office"), "applications-office")
++    CATEGORY_SETTINGS = DataProviderCategory.DataProviderCategory(N_("Settings"), "applications-system")
++    CATEGORY_MISC = DataProviderCategory.DataProviderCategory(N_("Miscellaneous"), "applications-accessories")
++    CATEGORY_MEDIA = DataProviderCategory.DataProviderCategory(N_("Media"), "applications-multimedia")
++    CATEGORY_BOOKMARKS = DataProviderCategory.DataProviderCategory(N_("Bookmarks"), "user-bookmarks")
++    CATEGORY_TEST = DataProviderCategory.DataProviderCategory(N_("Test"))
 +}