conduit r1535 - in trunk: . po

[johncarr svn gnome org]

Author: johncarr
Date: Wed Jul  9 16:07:16 2008
New Revision: 1535
URL: http://svn.gnome.org/viewvc/conduit?rev=1535&view=rev

Log:
Merge in changes from trunk

Modified:
   trunk/   (props changed)
   trunk/po/ChangeLog
   trunk/po/POTFILES.in
   trunk/po/nb.po

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Wed Jul  9 16:07:16 2008
@@ -31,6 +31,7 @@
 conduit/modules/GConfModule/GConfModule.py
 conduit/modules/GoogleModule/GoogleModule.py
 conduit/modules/GoogleModule/calendar-config.glade
+conduit/modules/GoogleModule/documents-config.glade
 conduit/modules/GoogleModule/picasa-config.glade
 conduit/modules/GoogleModule/youtube-config.glade
 conduit/modules/iPodModule/config.glade