conduit r1779 - in trunk: . conduit/modules/FspotModule conduit/modules/GoogleModule conduit/modules/N800Module data

[jstowers svn gnome org]

Author: jstowers
Date: Fri Oct 24 14:55:34 2008
New Revision: 1779
URL: http://svn.gnome.org/viewvc/conduit?rev=1779&view=rev

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

	* conduit/modules/FspotModule/FspotModule.py:
	* conduit/modules/GoogleModule/GoogleModule.py:
	* conduit/modules/N800Module/N800Module.py:
	* data/conduit.glade: Add string hyphenation.
	Fixes #529327 (Philip Withnall)



Modified:
   trunk/ChangeLog
   trunk/conduit/modules/FspotModule/FspotModule.py
   trunk/conduit/modules/GoogleModule/GoogleModule.py
   trunk/conduit/modules/N800Module/N800Module.py
   trunk/data/conduit.glade

Modified: trunk/conduit/modules/FspotModule/FspotModule.py
==============================================================================
--- trunk/conduit/modules/FspotModule/FspotModule.py	(original)
+++ trunk/conduit/modules/FspotModule/FspotModule.py	Fri Oct 24 14:55:34 2008
@@ -124,7 +124,7 @@
         """
         # Check if remote is read only
         if self.photo_remote.IsReadOnly ():
-            raise Exceptions.SyncronizeError (_("F-Spot DBus interface is operating in read only mode"))
+            raise Exceptions.SyncronizeError (_("F-Spot DBus interface is operating in read-only mode"))
 
         # create roll if necessary
         if not self.has_roll:

Modified: trunk/conduit/modules/GoogleModule/GoogleModule.py
==============================================================================
--- trunk/conduit/modules/GoogleModule/GoogleModule.py	(original)
+++ trunk/conduit/modules/GoogleModule/GoogleModule.py	Fri Oct 24 14:55:34 2008
@@ -801,7 +801,7 @@
     Contacts GData provider
     """
     _name_ = _("Google Contacts")
-    _description_ = _("Synchronize your Gmail contacts")
+    _description_ = _("Synchronize your Google Mail contacts")
     _category_ = conduit.dataproviders.CATEGORY_OFFICE
     _module_type_ = "twoway"
     _in_type_ = "contact"

Modified: trunk/conduit/modules/N800Module/N800Module.py
==============================================================================
--- trunk/conduit/modules/N800Module/N800Module.py	(original)
+++ trunk/conduit/modules/N800Module/N800Module.py	Fri Oct 24 14:55:34 2008
@@ -190,7 +190,7 @@
     """
 
     _name_ = _("N800 Photos")
-    _description_ = _("Synchronizes photo to a N800 device")
+    _description_ = _("Synchronizes photos to an N800 device")
     _in_type_ = "file/photo"
     _out_type_ = "file/photo"
     _icon_ = "image-x-generic"

Modified: trunk/data/conduit.glade
==============================================================================
--- trunk/data/conduit.glade	(original)
+++ trunk/data/conduit.glade	Fri Oct 24 14:55:34 2008
@@ -53,7 +53,7 @@
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="tooltip" translatable="yes">Cancel currently synchronizing groups</property>
+                        <property name="tooltip" translatable="yes">Cancel currently-synchronizing groups</property>
                         <property name="label" translatable="yes">Cancel Synchronization</property>
                         <property name="use_underline">True</property>
                         <signal name="activate" handler="on_cancel_activate"/>
@@ -485,14 +485,14 @@
     <child>
       <widget class="GtkMenuItem" id="sync_options">
         <property name="visible">True</property>
-        <property name="label" translatable="yes">Sync Options</property>
+        <property name="label" translatable="yes">Synchronization Options</property>
         <property name="use_underline">True</property>
         <child>
           <widget class="GtkMenu" id="sync_options_menu">
             <child>
               <widget class="GtkCheckMenuItem" id="slow_sync">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">Slow Sync</property>
+                <property name="label" translatable="yes">Slow Synchronization</property>
                 <property name="use_underline">True</property>
                 <signal name="activate" handler="on_slow_sync_activate"/>
               </widget>
@@ -500,7 +500,7 @@
             <child>
               <widget class="GtkCheckMenuItem" id="two_way_sync">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">Two Way Sync</property>
+                <property name="label" translatable="yes">Two-Way Synchronization</property>
                 <property name="use_underline">True</property>
                 <signal name="activate" handler="on_two_way_sync_group_clicked"/>
               </widget>
@@ -508,7 +508,7 @@
             <child>
               <widget class="GtkCheckMenuItem" id="auto_sync">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">Always Up To Date</property>
+                <property name="label" translatable="yes">Always Up-To-Date</property>
                 <property name="use_underline">True</property>
                 <signal name="activate" handler="on_autosync_clicked"/>
               </widget>
@@ -917,7 +917,7 @@
                               <widget class="GtkLabel" id="label77">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">When there is a two way conflict:</property>
+                                <property name="label" translatable="yes">When there is a two-way conflict:</property>
                               </widget>
                               <packing>
                                 <property name="expand">False</property>