conduit r1573 - in trunk: . conduit/modules/GoogleModule help help/C po

[jstowers svn gnome org]

Author: jstowers
Date: Thu Jul 17 10:13:09 2008
New Revision: 1573
URL: http://svn.gnome.org/viewvc/conduit?rev=1573&view=rev

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

	* conduit/modules/GoogleModule/Makefile.am: Fix build.



Modified:
   trunk/ChangeLog
   trunk/conduit/modules/GoogleModule/Makefile.am
   trunk/help/C/conduit.xml
   trunk/help/ChangeLog
   trunk/po/ChangeLog
   trunk/po/POTFILES.in
   trunk/po/POTFILES.skip

Modified: trunk/conduit/modules/GoogleModule/Makefile.am
==============================================================================
--- trunk/conduit/modules/GoogleModule/Makefile.am	(original)
+++ trunk/conduit/modules/GoogleModule/Makefile.am	Thu Jul 17 10:13:09 2008
@@ -3,8 +3,19 @@
 conduit_handlersdir = $(libdir)/conduit/modules/GoogleModule
 conduit_handlers_PYTHON = GoogleModule.py
 
-conduit_handlers_DATA = calendar-config.glade picasa-config.glade youtube-config.glade contacts-config.glade
-EXTRA_DIST = calendar-config.glade picasa-config.glade youtube-config.glade contacts-config.glade
+conduit_handlers_DATA = \
+	calendar-config.glade \
+	picasa-config.glade \
+	youtube-config.glade \
+	contacts-config.glade \
+	documents-config.glade
+
+EXTRA_DIST = \
+	calendar-config.glade \
+	picasa-config.glade \
+	youtube-config.glade \
+	contacts-config.glade \
+	documents-config.glade
 
 clean-local:
 	rm -rf *.pyc *.pyo

Modified: trunk/help/C/conduit.xml
==============================================================================
--- trunk/help/C/conduit.xml	(original)
+++ trunk/help/C/conduit.xml	Thu Jul 17 10:13:09 2008
@@ -150,7 +150,7 @@
           <title>The Edit Menu</title>
           <itemizedlist>
             <listitem><para><menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Clear Canvas</guimenuitem> </menuchoice> Removes all configurations, data providers, and groups from the canvas pane. This allows you start using the canvas as it was a clean slate. The best time to use this is when you are re-configuring a large portion of your sync groups. There is no quick way to revert back after selecting this setting.</para></listitem>
-            <listitem><para><menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Preferences</guimenuitem> </menuchoice> Global Conduit settings that effect all of your sync groups and basic Conduit operations. For more information please see the <emphasis>Conduit Preferences</emphasis> section of the documentation.</para></listitem>
+            <listitem><para><menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Preferences</guimenuitem> </menuchoice> Global Conduit settings that effect all of your sync groups and basic Conduit operations. For more information please see <xref linkend="conduit-preferences-window" /></para></listitem>
           </itemizedlist>
         </section>
         <section>

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Thu Jul 17 10:13:09 2008
@@ -19,6 +19,7 @@
 conduit/modules/EvolutionModule/EvolutionModule.py
 conduit/modules/EvolutionModule/config.glade
 conduit/modules/FacebookModule/FacebookModule.py
+conduit/modules/FacebookModule/config.glade
 conduit/modules/FeedModule/FeedModule.py
 conduit/modules/FeedModule/config.glade
 conduit/modules/FileModule/FileConfiguration.py

Modified: trunk/po/POTFILES.skip
==============================================================================
--- trunk/po/POTFILES.skip	(original)
+++ trunk/po/POTFILES.skip	Thu Jul 17 10:13:09 2008
@@ -2,6 +2,7 @@
 data/conduit-autostart.desktop.in
 data/conduit.desktop.in
 tools/eog-plugin/config.glade
+tools/totem-plugin/conduit.py
 tools/test-db-wrapper/main.glade
 tools/test-db-wrapper/main.glade
 conduit/modules/GoogleModule/contacts-config.glade