conduit r1754 - in trunk: . conduit conduit/modules conduit/modules/AmazonS3Module conduit/modules/BansheeModule conduit/modules/BoxDotNetModule conduit/modules/EvolutionModule conduit/modules/FacebookModule conduit/modules/FeedModule conduit/modules/FlickrModule conduit/modules/FspotModule conduit/modules/GConfModule conduit/modules/GoogleModule conduit/modules/PicasaDesktopModule conduit/modules/RTMModule conduit/modules/RhythmboxDBusModule conduit/modules/RhythmboxModule conduit/modules/ShutterflyModule conduit/modules/SmugMugModule conduit/modules/ZotoModule conduit/modules/iPodModule

[jstowers svn gnome org]

Author: jstowers
Date: Tue Oct  7 20:53:31 2008
New Revision: 1754
URL: http://svn.gnome.org/viewvc/conduit?rev=1754&view=rev

Log:
2008-10-07  John Stowers  <john stowers gmail com>

	* conduit/Exceptions.py:
	* conduit/modules/AmazonS3Module/AmazonS3Module.py:
	* conduit/modules/BansheeModule/BansheeModule.py:
	* conduit/modules/BoxDotNetModule/BoxDotNetModule.py:
	* conduit/modules/EvolutionModule/EvolutionModule.py:
	* conduit/modules/FacebookModule/FacebookModule.py:
	* conduit/modules/FeedModule/FeedModule.py:
	* conduit/modules/FlickrModule/FlickrModule.py:
	* conduit/modules/FspotModule/FspotModule.py:
	* conduit/modules/GConfModule/GConfModule.py:
	* conduit/modules/GoogleModule/GoogleModule.py:
	* conduit/modules/PicasaDesktopModule/PicasaDesktopModule.py:
	* conduit/modules/RTMModule/RTMModule.py:
	* conduit/modules/RhythmboxDBusModule/RhythmboxDBusModule.py:
	* conduit/modules/RhythmboxModule/RhythmboxModule.py:
	* conduit/modules/ShutterflyModule/ShutterflyModule.py:
	* conduit/modules/SmugMugModule/SmugMugModule.py:
	* conduit/modules/TomboyModule.py:
	* conduit/modules/ZotoModule/ZotoModule.py:
	* conduit/modules/iPodModule/iPodModule.py: Remove informal use of the
	word Sync. Fixes #529328



Modified:
   trunk/ChangeLog
   trunk/conduit/Exceptions.py
   trunk/conduit/modules/AmazonS3Module/AmazonS3Module.py
   trunk/conduit/modules/BansheeModule/BansheeModule.py
   trunk/conduit/modules/BoxDotNetModule/BoxDotNetModule.py
   trunk/conduit/modules/EvolutionModule/EvolutionModule.py
   trunk/conduit/modules/FacebookModule/FacebookModule.py
   trunk/conduit/modules/FeedModule/FeedModule.py
   trunk/conduit/modules/FlickrModule/FlickrModule.py
   trunk/conduit/modules/FspotModule/FspotModule.py
   trunk/conduit/modules/GConfModule/GConfModule.py
   trunk/conduit/modules/GoogleModule/GoogleModule.py
   trunk/conduit/modules/PicasaDesktopModule/PicasaDesktopModule.py
   trunk/conduit/modules/RTMModule/RTMModule.py
   trunk/conduit/modules/RhythmboxDBusModule/RhythmboxDBusModule.py
   trunk/conduit/modules/RhythmboxModule/RhythmboxModule.py
   trunk/conduit/modules/ShutterflyModule/ShutterflyModule.py
   trunk/conduit/modules/SmugMugModule/SmugMugModule.py
   trunk/conduit/modules/TomboyModule.py
   trunk/conduit/modules/ZotoModule/ZotoModule.py
   trunk/conduit/modules/iPodModule/iPodModule.py

Modified: trunk/conduit/Exceptions.py
==============================================================================
--- trunk/conduit/Exceptions.py	(original)
+++ trunk/conduit/Exceptions.py	Tue Oct  7 20:53:31 2008
@@ -73,6 +73,6 @@
     def __init__(self, step=0):    
         self.step = step
         Exception.__init__(self,
-            "Sync aborted at step %s" % self.step
+            "Synchronization aborted at step %s" % self.step
             )
 

Modified: trunk/conduit/modules/AmazonS3Module/AmazonS3Module.py
==============================================================================
--- trunk/conduit/modules/AmazonS3Module/AmazonS3Module.py	(original)
+++ trunk/conduit/modules/AmazonS3Module/AmazonS3Module.py	Tue Oct  7 20:53:31 2008
@@ -25,7 +25,7 @@
     """
 
     _name_ = "Amazon S3"
-    _description_ = "Sync with Amazon S3"
+    _description_ = "Synchronize with Amazon S3"
     _category_ = conduit.dataproviders.CATEGORY_FILES
     _module_type_ = "twoway"
     _in_type_ = "file"

Modified: trunk/conduit/modules/BansheeModule/BansheeModule.py
==============================================================================
--- trunk/conduit/modules/BansheeModule/BansheeModule.py	(original)
+++ trunk/conduit/modules/BansheeModule/BansheeModule.py	Tue Oct  7 20:53:31 2008
@@ -31,7 +31,7 @@
 class BansheeSource(DataProvider.DataSource):
 
     _name_ = _("Banshee Playlists")
-    _description_ = _("Sync your Banshee playlists")
+    _description_ = _("Synchronize your Banshee playlists")
     _category_ = conduit.dataproviders.CATEGORY_MEDIA
     _module_type_ = "source"
     _in_type_ = "file/audio"

Modified: trunk/conduit/modules/BoxDotNetModule/BoxDotNetModule.py
==============================================================================
--- trunk/conduit/modules/BoxDotNetModule/BoxDotNetModule.py	(original)
+++ trunk/conduit/modules/BoxDotNetModule/BoxDotNetModule.py	Tue Oct  7 20:53:31 2008
@@ -27,7 +27,7 @@
 class BoxDotNetTwoWay(DataProvider.TwoWay):
 
     _name_ = _("Box.net")
-    _description_ = _("Sync your Box.net files")
+    _description_ = _("Synchronize your Box.net files")
     _category_ = conduit.dataproviders.CATEGORY_FILES
     _module_type_ = "twoway"
     _in_type_ = "file"

Modified: trunk/conduit/modules/EvolutionModule/EvolutionModule.py
==============================================================================
--- trunk/conduit/modules/EvolutionModule/EvolutionModule.py	(original)
+++ trunk/conduit/modules/EvolutionModule/EvolutionModule.py	Tue Oct  7 20:53:31 2008
@@ -145,7 +145,7 @@
     DEFAULT_ADDRESSBOOK_URI = "default"
 
     _name_ = _("Evolution Contacts")
-    _description_ = _("Sync your contacts")
+    _description_ = _("Synchronize your contacts")
     _category_ = conduit.dataproviders.CATEGORY_OFFICE
     _module_type_ = "twoway"
     _in_type_ = "contact"
@@ -196,7 +196,7 @@
     DEFAULT_CALENDAR_URI = "default"
 
     _name_ = _("Evolution Calendar")
-    _description_ = _("Sync your calendar")
+    _description_ = _("Synchronize your calendar")
     _category_ = conduit.dataproviders.CATEGORY_OFFICE
     _module_type_ = "twoway"
     _in_type_ = "event"
@@ -254,7 +254,7 @@
     DEFAULT_TASK_URI = "default"
 
     _name_ = _("Evolution Tasks")
-    _description_ = _("Sync your tasks")
+    _description_ = _("Synchronize your tasks")
     _category_ = conduit.dataproviders.CATEGORY_OFFICE
     _module_type_ = "twoway"
     _in_type_ = "event"
@@ -311,7 +311,7 @@
     DEFAULT_MEMO_URI = ""
 
     _name_ = _("Evolution Memos")
-    _description_ = _("Sync your memos")
+    _description_ = _("Synchronize your memos")
     _category_ = conduit.dataproviders.CATEGORY_OFFICE
     _module_type_ = "twoway"
     _in_type_ = "note"

Modified: trunk/conduit/modules/FacebookModule/FacebookModule.py
==============================================================================
--- trunk/conduit/modules/FacebookModule/FacebookModule.py	(original)
+++ trunk/conduit/modules/FacebookModule/FacebookModule.py	Tue Oct  7 20:53:31 2008
@@ -35,7 +35,7 @@
 class FacebookSink(Image.ImageSink):
 
     _name_ = _("Facebook")
-    _description_ = _("Sync your Facebook photos")
+    _description_ = _("Synchronize your Facebook photos")
     _module_type_ = "sink"
     _icon_ = "facebook"
     _configurable_ = True

Modified: trunk/conduit/modules/FeedModule/FeedModule.py
==============================================================================
--- trunk/conduit/modules/FeedModule/FeedModule.py	(original)
+++ trunk/conduit/modules/FeedModule/FeedModule.py	Tue Oct  7 20:53:31 2008
@@ -55,7 +55,7 @@
 class RSSSource(DataProvider.DataSource):
 
     _name_ = _("RSS Feed")
-    _description_ = _("Sync data from RSS enclosures")
+    _description_ = _("Synchronize data from RSS enclosures")
     _category_ = conduit.dataproviders.CATEGORY_MISC
     _module_type_ = "source"
     _in_type_ = ""

Modified: trunk/conduit/modules/FlickrModule/FlickrModule.py
==============================================================================
--- trunk/conduit/modules/FlickrModule/FlickrModule.py	(original)
+++ trunk/conduit/modules/FlickrModule/FlickrModule.py	Tue Oct  7 20:53:31 2008
@@ -74,7 +74,7 @@
 class FlickrTwoWay(Image.ImageTwoWay):
 
     _name_ = _("Flickr")
-    _description_ = _("Sync your Flickr.com photos")
+    _description_ = _("Synchronize your Flickr.com photos")
     _module_type_ = "twoway"
     _icon_ = "flickr"
     _configurable_ = True

Modified: trunk/conduit/modules/FspotModule/FspotModule.py
==============================================================================
--- trunk/conduit/modules/FspotModule/FspotModule.py	(original)
+++ trunk/conduit/modules/FspotModule/FspotModule.py	Tue Oct  7 20:53:31 2008
@@ -23,7 +23,7 @@
 
 class FSpotDbusTwoWay(Image.ImageTwoWay):
     _name_ = _("F-Spot")
-    _description_ = _("Sync your F-Spot photos")
+    _description_ = _("Synchronize your F-Spot photos")
     _category_ = conduit.dataproviders.CATEGORY_PHOTOS
     _icon_ = "f-spot"
     _configurable_ = True

Modified: trunk/conduit/modules/GConfModule/GConfModule.py
==============================================================================
--- trunk/conduit/modules/GConfModule/GConfModule.py	(original)
+++ trunk/conduit/modules/GConfModule/GConfModule.py	Tue Oct  7 20:53:31 2008
@@ -19,7 +19,7 @@
 
 class GConfTwoWay(DataProvider.TwoWay, AutoSync.AutoSync):
     _name_ = _("GConf Settings")
-    _description_ = _("Sync your desktop preferences")
+    _description_ = _("Synchronize your desktop preferences")
     _category_ = conduit.dataproviders.CATEGORY_MISC
     _module_type_ = "twoway"
     _in_type_ = "setting"

Modified: trunk/conduit/modules/GoogleModule/GoogleModule.py
==============================================================================
--- trunk/conduit/modules/GoogleModule/GoogleModule.py	(original)
+++ trunk/conduit/modules/GoogleModule/GoogleModule.py	Tue Oct  7 20:53:31 2008
@@ -367,7 +367,7 @@
 class GoogleCalendarTwoWay(_GoogleBase, DataProvider.TwoWay):
 
     _name_ = _("Google Calendar")
-    _description_ = _("Sync your Google Calendar")
+    _description_ = _("Synchronize your Google Calendar")
     _category_ = conduit.dataproviders.CATEGORY_OFFICE
     _module_type_ = "twoway"
     _in_type_ = "event"
@@ -553,7 +553,7 @@
 class PicasaTwoWay(_GoogleBase, Image.ImageTwoWay):
 
     _name_ = _("Picasa")
-    _description_ = _("Sync your Google Picasa photos")
+    _description_ = _("Synchronize your Google Picasa photos")
     _icon_ = "picasa"
 
     def __init__(self, *args):
@@ -801,7 +801,7 @@
     Contacts GData provider
     """
     _name_ = _("Google Contacts")
-    _description_ = _("Sync your Gmail contacts")
+    _description_ = _("Synchronize your Gmail contacts")
     _category_ = conduit.dataproviders.CATEGORY_OFFICE
     _module_type_ = "twoway"
     _in_type_ = "contact"
@@ -1058,7 +1058,7 @@
     See: http://code.google.com/p/gdatacopier/source/browse/trunk/python/gdatacopier.py
     """
     _name_ = _("Google Documents")
-    _description_ = _("Sync your Google Documents")
+    _description_ = _("Synchronize your Google Documents")
     _category_ = conduit.dataproviders.CATEGORY_OFFICE
     _module_type_ = "sink"
     _out_type_ = "contact"
@@ -1347,7 +1347,7 @@
     http://base-art.net/Articles/87/
     """
     _name_ = _("YouTube")
-    _description_ = _("Sync data from YouTube")
+    _description_ = _("Synchronize data from YouTube")
     _category_ = conduit.dataproviders.CATEGORY_MEDIA
     _module_type_ = "twoway"
     _in_type_ = "file/video"

Modified: trunk/conduit/modules/PicasaDesktopModule/PicasaDesktopModule.py
==============================================================================
--- trunk/conduit/modules/PicasaDesktopModule/PicasaDesktopModule.py	(original)
+++ trunk/conduit/modules/PicasaDesktopModule/PicasaDesktopModule.py	Tue Oct  7 20:53:31 2008
@@ -30,7 +30,7 @@
 class PicasaDesktopSource(DataProvider.DataSource):
 
     _name_ = _("Picasa Desktop")
-    _description_ = _("Sync Picasa from Picasa Desktop")
+    _description_ = _("Synchronize Picasa from Picasa Desktop")
     _category_ = conduit.dataproviders.CATEGORY_PHOTOS
     _module_type_ = "source"
     _in_type_ = "file/photo"

Modified: trunk/conduit/modules/RTMModule/RTMModule.py
==============================================================================
--- trunk/conduit/modules/RTMModule/RTMModule.py	(original)
+++ trunk/conduit/modules/RTMModule/RTMModule.py	Tue Oct  7 20:53:31 2008
@@ -30,7 +30,7 @@
     DEFAULT_TASK_URI = "default"
 
     _name_ = _("Remember The Milk Tasks")
-    _description_ = _("Sync your tasks to Remember The Milk")
+    _description_ = _("Synchronize your tasks to Remember The Milk")
     _category_ = conduit.dataproviders.CATEGORY_OFFICE
     _configurable_ = True
     _module_type_ = "twoway"

Modified: trunk/conduit/modules/RhythmboxDBusModule/RhythmboxDBusModule.py
==============================================================================
--- trunk/conduit/modules/RhythmboxDBusModule/RhythmboxDBusModule.py	(original)
+++ trunk/conduit/modules/RhythmboxDBusModule/RhythmboxDBusModule.py	Tue Oct  7 20:53:31 2008
@@ -102,7 +102,7 @@
 class RhythmboxDBusSource(DataProvider.DataSource):
 
     _name_ = _("Rhythmbox Music (DBus)")
-    _description_ = _("Sync songs from your Rhythmbox playlists")
+    _description_ = _("Synchronize songs from your Rhythmbox playlists")
     _category_ = conduit.dataproviders.CATEGORY_MEDIA
     _module_type_ = "source"
     _in_type_ = "file/audio"

Modified: trunk/conduit/modules/RhythmboxModule/RhythmboxModule.py
==============================================================================
--- trunk/conduit/modules/RhythmboxModule/RhythmboxModule.py	(original)
+++ trunk/conduit/modules/RhythmboxModule/RhythmboxModule.py	Tue Oct  7 20:53:31 2008
@@ -38,7 +38,7 @@
 class RhythmboxSource(DataProvider.DataSource):
 
     _name_ = _("Rhythmbox Music")
-    _description_ = _("Sync songs from your Rhythmbox playlists")
+    _description_ = _("Synchronize songs from your Rhythmbox playlists")
     _category_ = conduit.dataproviders.CATEGORY_MEDIA
     _module_type_ = "source"
     _in_type_ = "file/audio"

Modified: trunk/conduit/modules/ShutterflyModule/ShutterflyModule.py
==============================================================================
--- trunk/conduit/modules/ShutterflyModule/ShutterflyModule.py	(original)
+++ trunk/conduit/modules/ShutterflyModule/ShutterflyModule.py	Tue Oct  7 20:53:31 2008
@@ -24,7 +24,7 @@
 class ShutterflySink(Image.ImageSink):
 	
 	_name_ = _("Shutterfly")
-	_description_ = _("Sync your Shutterfly photos")
+	_description_ = _("Synchronize your Shutterfly photos")
 	_module_type_ = "sink"
 	_icon_ = "shutterfly"
 	_configurable_ = True

Modified: trunk/conduit/modules/SmugMugModule/SmugMugModule.py
==============================================================================
--- trunk/conduit/modules/SmugMugModule/SmugMugModule.py	(original)
+++ trunk/conduit/modules/SmugMugModule/SmugMugModule.py	Tue Oct  7 20:53:31 2008
@@ -26,7 +26,7 @@
 class SmugMugTwoWay(Image.ImageTwoWay):
 
     _name_ = _("SmugMug")
-    _description_ = _("Sync your SmugMug.com photos")
+    _description_ = _("Synchronize your SmugMug.com photos")
     _module_type_ = "twoway"
     _icon_ = "smugmug"
     _configurable_ = True

Modified: trunk/conduit/modules/TomboyModule.py
==============================================================================
--- trunk/conduit/modules/TomboyModule.py	(original)
+++ trunk/conduit/modules/TomboyModule.py	Tue Oct  7 20:53:31 2008
@@ -99,7 +99,7 @@
     LUID is the tomboy uid string
     """
     _name_ = "Tomboy Notes"
-    _description_ = "Sync your Tomboy notes"
+    _description_ = "Synchronize your Tomboy notes"
     _category_ = conduit.dataproviders.CATEGORY_NOTES
     _module_type_ = "twoway"
     _in_type_ = "note/tomboy"

Modified: trunk/conduit/modules/ZotoModule/ZotoModule.py
==============================================================================
--- trunk/conduit/modules/ZotoModule/ZotoModule.py	(original)
+++ trunk/conduit/modules/ZotoModule/ZotoModule.py	Tue Oct  7 20:53:31 2008
@@ -152,7 +152,7 @@
 
 class ZotoSink(Image.ImageTwoWay):
     _name_ = _("Zoto")
-    _description_ = _("Sync your Zoto photos")
+    _description_ = _("Synchronize your Zoto photos")
     _module_type_ = "twoway"
     _icon_ = "zoto"
     _configurable_ = True

Modified: trunk/conduit/modules/iPodModule/iPodModule.py
==============================================================================
--- trunk/conduit/modules/iPodModule/iPodModule.py	(original)
+++ trunk/conduit/modules/iPodModule/iPodModule.py	Tue Oct  7 20:53:31 2008
@@ -155,7 +155,7 @@
     """
 
     _name_ = "Notes"
-    _description_ = "Sync your iPod notes"
+    _description_ = "Synchronize your iPod notes"
     _module_type_ = "twoway"
     _in_type_ = "note"
     _out_type_ = "note"
@@ -271,7 +271,7 @@
 class IPodContactsTwoWay(IPodBase):
 
     _name_ = "Contacts"
-    _description_ = "Sync your iPod contacts"
+    _description_ = "Synchronize your iPod contacts"
     _module_type_ = "twoway"
     _in_type_ = "contact"
     _out_type_ = "contact"
@@ -307,7 +307,7 @@
 class IPodCalendarTwoWay(IPodBase):
 
     _name_ = "Calendar"
-    _description_ = "Sync your iPod calendar"
+    _description_ = "Synchronize your iPod calendar"
     _module_type_ = "twoway"
     _in_type_ = "event"
     _out_type_ = "event"
@@ -343,7 +343,7 @@
 class IPodPhotoSink(IPodBase):
 
     _name_ = "Photos"
-    _description_ = "Sync your iPod photos"
+    _description_ = "Synchronize your iPod photos"
     _module_type_ = "sink"
     _in_type_ = "file/photo"
     _out_type_ = "file/photo"
@@ -793,7 +793,7 @@
 class IPodMusicTwoWay(IPodMediaTwoWay):
 
     _name_ = "iPod Music"
-    _description_ = "Sync your iPod music"
+    _description_ = "Synchronize your iPod music"
     _module_type_ = "twoway"
     _in_type_ = "file/audio"
     _out_type_ = "file/audio"
@@ -828,7 +828,7 @@
 class IPodVideoTwoWay(IPodMediaTwoWay):
 
     _name_ = "iPod Video"
-    _description_ = "Sync your iPod videos"
+    _description_ = "Synchronize your iPod videos"
     _module_type_ = "twoway"
     _in_type_ = "file/video"
     _out_type_ = "file/video"