commit ed62e4727804aede8dd2b1e645a8e3f455a2978d
Author: John Stowers <john.stowers@gmail.com>
Date:   2010-01-21

    fix build

M	INSTALL
M	configure.ac

commit d05e197f546b4aa440a9e24f83324b8b2b3d6fcc
Author: John Stowers <john.stowers@gmail.com>
Date:	2010-01-07

    fix dbus configuration

M	conduit/DBus.py

commit 61ba6e24d80d36ba2d5e7b2faa496a78bda43979
Author: Aron Xu <aronxu@gnome.org>
Date:	2010-01-19

    Add Simplified Chinese help translation.

M	help/Makefile.am
A	help/zh_CN/zh_CN.po

commit b47dcfe75541504aea729a792c40dff3ee90f683
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:	2010-01-18

    Updated Slovenian translation

M	po/sl.po

commit 47b2c0007851989bacbe62354542753c21815562
Author: Petr Kovar <pknbe@volny.cz>
Date:	2010-01-12

    Updated Czech translation by Marek Cernocky and Petr Kovar

M	po/cs.po

commit 363a321bacbc9a70c14d59eeafe4670f7d53aca9
Author: John Stowers <john.stowers@gmail.com>
Date:	2010-01-11

    Protect a crast at startup

	* Should fix lunchpad 506110

M	conduit/gtkui/Tree.py

commit 91d259a5e7b1c09e87ce3207ea29ac9bf717c582
Author: Daniel Nylander <po@danielnylander.se>
Date:	2010-01-10

    Updated Swedish translation

M	po/sv.po

commit 4f1b8040c974e1402794501b47657d87d66408b4
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	2010-01-09

    Updated Spanish translation

M	po/es.po

commit 541edd805a01762995b430bb0aa376f97b3f7536
Author: John Stowers <john.stowers@gmail.com>
Date:	2010-01-09

    Remove translation traces of glade files

	fixes bug 606397

M	po/POTFILES.in
M	po/POTFILES.skip

commit 3cba683db76e613e42c568b0331001a35ddc0443
Author: John Stowers <john.stowers@gmail.com>
Date:	2010-01-07

    fix xml serialization from outside SyncSet

M	conduit/ModuleWrapper.py
M	conduit/SyncSet.py
M	conduit/XMLSerialization.py
M	conduit/dataproviders/DataProvider.py

commit 0eac727854170cffe8150d601807ac055f56fbad
Author: John Stowers <john.stowers@gmail.com>
Date:	2010-01-07

    update script that fetches 3rd party libs

M	scripts/update-3rdparty-libs.sh

commit 4d37d0d25e930486ba57882e82e3b3ff0be16d40
Author: John Stowers <john.stowers@gmail.com>
Date:	2010-01-07

    use system gdata

M	conduit/modules/GoogleModule/Makefile.am
D	conduit/modules/GoogleModule/atom/Makefile.am
D	conduit/modules/GoogleModule/atom/__init__.py
D	conduit/modules/GoogleModule/atom/auth.py
D	conduit/modules/GoogleModule/atom/client.py
D	conduit/modules/GoogleModule/atom/core.py
D	conduit/modules/GoogleModule/atom/http.py
D	conduit/modules/GoogleModule/atom/http_core.py
D	conduit/modules/GoogleModule/atom/http_interface.py
D	conduit/modules/GoogleModule/atom/mock_http.py
D	conduit/modules/GoogleModule/atom/mock_http_core.py
D	conduit/modules/GoogleModule/atom/mock_service.py
D	conduit/modules/GoogleModule/atom/service.py
D	conduit/modules/GoogleModule/atom/token_store.py
D	conduit/modules/GoogleModule/atom/url.py
D	conduit/modules/GoogleModule/calendar-config.glade
D	conduit/modules/GoogleModule/gdata/Crypto/Cipher/AES.pyd
D	conduit/modules/GoogleModule/gdata/Crypto/Cipher/ARC2.pyd
D	conduit/modules/GoogleModule/gdata/Crypto/Cipher/ARC4.pyd
D	conduit/modules/GoogleModule/gdata/Crypto/Cipher/Blowfish.pyd
D	conduit/modules/GoogleModule/gdata/Crypto/Cipher/CAST.pyd
D	conduit/modules/GoogleModule/gdata/Crypto/Cipher/DES.pyd
D	conduit/modules/GoogleModule/gdata/Crypto/Cipher/DES3.pyd
D	conduit/modules/GoogleModule/gdata/Crypto/Cipher/IDEA.pyd
D	conduit/modules/GoogleModule/gdata/Crypto/Cipher/RC5.pyd
D	conduit/modules/GoogleModule/gdata/Crypto/Cipher/XOR.pyd
D	conduit/modules/GoogleModule/gdata/Crypto/Cipher/__init__.py
D	conduit/modules/GoogleModule/gdata/Crypto/Hash/HMAC.py
D	conduit/modules/GoogleModule/gdata/Crypto/Hash/MD2.pyd
D	conduit/modules/GoogleModule/gdata/Crypto/Hash/MD4.pyd
D	conduit/modules/GoogleModule/gdata/Crypto/Hash/MD5.py
D	conduit/modules/GoogleModule/gdata/Crypto/Hash/RIPEMD.pyd
D	conduit/modules/GoogleModule/gdata/Crypto/Hash/SHA.py
D	conduit/modules/GoogleModule/gdata/Crypto/Hash/SHA256.pyd
D	conduit/modules/GoogleModule/gdata/Crypto/Hash/__init__.py
D	conduit/modules/GoogleModule/gdata/Crypto/Protocol/AllOrNothing.py
D	conduit/modules/GoogleModule/gdata/Crypto/Protocol/Chaffing.py
D	conduit/modules/GoogleModule/gdata/Crypto/Protocol/__init__.py
D	conduit/modules/GoogleModule/gdata/Crypto/PublicKey/DSA.py
D	conduit/modules/GoogleModule/gdata/Crypto/PublicKey/ElGamal.py
D	conduit/modules/GoogleModule/gdata/Crypto/PublicKey/RSA.py
D	conduit/modules/GoogleModule/gdata/Crypto/PublicKey/__init__.py
D	conduit/modules/GoogleModule/gdata/Crypto/PublicKey/pubkey.py
D	conduit/modules/GoogleModule/gdata/Crypto/PublicKey/qNEW.py
D	conduit/modules/GoogleModule/gdata/Crypto/Util/RFC1751.py
D	conduit/modules/GoogleModule/gdata/Crypto/Util/__init__.py
D	conduit/modules/GoogleModule/gdata/Crypto/Util/number.py
D	conduit/modules/GoogleModule/gdata/Crypto/Util/randpool.py
D	conduit/modules/GoogleModule/gdata/Crypto/Util/test.py
D	conduit/modules/GoogleModule/gdata/Crypto/__init__.py
D	conduit/modules/GoogleModule/gdata/Crypto/test.py
D	conduit/modules/GoogleModule/gdata/Makefile.am
D	conduit/modules/GoogleModule/gdata/__init__.py
D	conduit/modules/GoogleModule/gdata/alt/__init__.py
D	conduit/modules/GoogleModule/gdata/alt/appengine.py
D	conduit/modules/GoogleModule/gdata/apps/Makefile.am
D	conduit/modules/GoogleModule/gdata/apps/__init__.py
D	conduit/modules/GoogleModule/gdata/apps/emailsettings/__init__.py
D	conduit/modules/GoogleModule/gdata/apps/emailsettings/service.py
D	conduit/modules/GoogleModule/gdata/apps/migration/__init__.py
D	conduit/modules/GoogleModule/gdata/apps/migration/service.py
D	conduit/modules/GoogleModule/gdata/apps/service.py
D	conduit/modules/GoogleModule/gdata/auth.py
D	conduit/modules/GoogleModule/gdata/base/Makefile.am
D	conduit/modules/GoogleModule/gdata/base/__init__.py
D	conduit/modules/GoogleModule/gdata/base/service.py
D	conduit/modules/GoogleModule/gdata/blogger/Makefile.am
D	conduit/modules/GoogleModule/gdata/blogger/__init__.py
D	conduit/modules/GoogleModule/gdata/blogger/service.py
D	conduit/modules/GoogleModule/gdata/calendar/Makefile.am
D	conduit/modules/GoogleModule/gdata/calendar/__init__.py
D	conduit/modules/GoogleModule/gdata/calendar/service.py
D	conduit/modules/GoogleModule/gdata/client.py
D	conduit/modules/GoogleModule/gdata/codesearch/Makefile.am
D	conduit/modules/GoogleModule/gdata/codesearch/__init__.py
D	conduit/modules/GoogleModule/gdata/codesearch/service.py
D	conduit/modules/GoogleModule/gdata/contacts/Makefile.am
D	conduit/modules/GoogleModule/gdata/contacts/__init__.py
D	conduit/modules/GoogleModule/gdata/contacts/service.py
D	conduit/modules/GoogleModule/gdata/docs/Makefile.am
D	conduit/modules/GoogleModule/gdata/docs/__init__.py
D	conduit/modules/GoogleModule/gdata/docs/service.py
D	conduit/modules/GoogleModule/gdata/exif/Makefile.am
D	conduit/modules/GoogleModule/gdata/exif/__init__.py
D	conduit/modules/GoogleModule/gdata/geo/Makefile.am
D	conduit/modules/GoogleModule/gdata/geo/__init__.py
D	conduit/modules/GoogleModule/gdata/media/Makefile.am
D	conduit/modules/GoogleModule/gdata/media/__init__.py
D	conduit/modules/GoogleModule/gdata/oauth/CHANGES.txt
D	conduit/modules/GoogleModule/gdata/oauth/__init__.py
D	conduit/modules/GoogleModule/gdata/oauth/rsa.py
D	conduit/modules/GoogleModule/gdata/photos/Makefile.am
D	conduit/modules/GoogleModule/gdata/photos/__init__.py
D	conduit/modules/GoogleModule/gdata/photos/service.py
D	conduit/modules/GoogleModule/gdata/service.py
D	conduit/modules/GoogleModule/gdata/spreadsheet/Makefile.am
D	conduit/modules/GoogleModule/gdata/spreadsheet/__init__.py
D	conduit/modules/GoogleModule/gdata/spreadsheet/service.py
D	conduit/modules/GoogleModule/gdata/spreadsheet/text_db.py
D	conduit/modules/GoogleModule/gdata/test_data.py
D	conduit/modules/GoogleModule/gdata/tlslite/BaseDB.py
D	conduit/modules/GoogleModule/gdata/tlslite/Checker.py
D	conduit/modules/GoogleModule/gdata/tlslite/FileObject.py
D	conduit/modules/GoogleModule/gdata/tlslite/HandshakeSettings.py
D	conduit/modules/GoogleModule/gdata/tlslite/Session.py
D	conduit/modules/GoogleModule/gdata/tlslite/SessionCache.py
D	conduit/modules/GoogleModule/gdata/tlslite/SharedKeyDB.py
D	conduit/modules/GoogleModule/gdata/tlslite/TLSConnection.py
D	conduit/modules/GoogleModule/gdata/tlslite/TLSRecordLayer.py
D	conduit/modules/GoogleModule/gdata/tlslite/VerifierDB.py
D	conduit/modules/GoogleModule/gdata/tlslite/X509.py
D	conduit/modules/GoogleModule/gdata/tlslite/X509CertChain.py
D	conduit/modules/GoogleModule/gdata/tlslite/__init__.py
D	conduit/modules/GoogleModule/gdata/tlslite/api.py
D	conduit/modules/GoogleModule/gdata/tlslite/constants.py
D	conduit/modules/GoogleModule/gdata/tlslite/errors.py
D
conduit/modules/GoogleModule/gdata/tlslite/integration/AsyncStateMachine.py
D
conduit/modules/GoogleModule/gdata/tlslite/integration/ClientHelper.py
D
conduit/modules/GoogleModule/gdata/tlslite/integration/HTTPTLSConnection.py
D
conduit/modules/GoogleModule/gdata/tlslite/integration/IMAP4_TLS.py
D
conduit/modules/GoogleModule/gdata/tlslite/integration/IntegrationHelper.py
D	conduit/modules/GoogleModule/gdata/tlslite/integration/POP3_TLS.py
D	conduit/modules/GoogleModule/gdata/tlslite/integration/SMTP_TLS.py
D
conduit/modules/GoogleModule/gdata/tlslite/integration/TLSAsyncDispatcherMixIn.py
D
conduit/modules/GoogleModule/gdata/tlslite/integration/TLSSocketServerMixIn.py
D
conduit/modules/GoogleModule/gdata/tlslite/integration/TLSTwistedProtocolWrapper.py
D
conduit/modules/GoogleModule/gdata/tlslite/integration/XMLRPCTransport.py
D	conduit/modules/GoogleModule/gdata/tlslite/integration/__init__.py
D	conduit/modules/GoogleModule/gdata/tlslite/mathtls.py
D	conduit/modules/GoogleModule/gdata/tlslite/messages.py
D	conduit/modules/GoogleModule/gdata/tlslite/utils/AES.py
D	conduit/modules/GoogleModule/gdata/tlslite/utils/ASN1Parser.py
D	conduit/modules/GoogleModule/gdata/tlslite/utils/Cryptlib_AES.py
D	conduit/modules/GoogleModule/gdata/tlslite/utils/Cryptlib_RC4.py
D
conduit/modules/GoogleModule/gdata/tlslite/utils/Cryptlib_TripleDES.py
D	conduit/modules/GoogleModule/gdata/tlslite/utils/OpenSSL_AES.py
D	conduit/modules/GoogleModule/gdata/tlslite/utils/OpenSSL_RC4.py
D	conduit/modules/GoogleModule/gdata/tlslite/utils/OpenSSL_RSAKey.py
D
conduit/modules/GoogleModule/gdata/tlslite/utils/OpenSSL_TripleDES.py
D	conduit/modules/GoogleModule/gdata/tlslite/utils/PyCrypto_AES.py
D	conduit/modules/GoogleModule/gdata/tlslite/utils/PyCrypto_RC4.py
D
conduit/modules/GoogleModule/gdata/tlslite/utils/PyCrypto_RSAKey.py
D
conduit/modules/GoogleModule/gdata/tlslite/utils/PyCrypto_TripleDES.py
D	conduit/modules/GoogleModule/gdata/tlslite/utils/Python_AES.py
D	conduit/modules/GoogleModule/gdata/tlslite/utils/Python_RC4.py
D	conduit/modules/GoogleModule/gdata/tlslite/utils/Python_RSAKey.py
D	conduit/modules/GoogleModule/gdata/tlslite/utils/RC4.py
D	conduit/modules/GoogleModule/gdata/tlslite/utils/RSAKey.py
D	conduit/modules/GoogleModule/gdata/tlslite/utils/TripleDES.py
D	conduit/modules/GoogleModule/gdata/tlslite/utils/__init__.py
D	conduit/modules/GoogleModule/gdata/tlslite/utils/cipherfactory.py
D	conduit/modules/GoogleModule/gdata/tlslite/utils/codec.py
D	conduit/modules/GoogleModule/gdata/tlslite/utils/compat.py
D	conduit/modules/GoogleModule/gdata/tlslite/utils/cryptomath.py
D	conduit/modules/GoogleModule/gdata/tlslite/utils/dateFuncs.py
D	conduit/modules/GoogleModule/gdata/tlslite/utils/entropy.c
D	conduit/modules/GoogleModule/gdata/tlslite/utils/hmac.py
D	conduit/modules/GoogleModule/gdata/tlslite/utils/jython_compat.py
D	conduit/modules/GoogleModule/gdata/tlslite/utils/keyfactory.py
D	conduit/modules/GoogleModule/gdata/tlslite/utils/rijndael.py
D	conduit/modules/GoogleModule/gdata/tlslite/utils/win32prng.c
D	conduit/modules/GoogleModule/gdata/tlslite/utils/xmltools.py
D	conduit/modules/GoogleModule/gdata/urlfetch.py
D	conduit/modules/GoogleModule/gdata/webmastertools/__init__.py
D	conduit/modules/GoogleModule/gdata/webmastertools/service.py
D	conduit/modules/GoogleModule/gdata/youtube/Makefile.am
D	conduit/modules/GoogleModule/gdata/youtube/__init__.py
D	conduit/modules/GoogleModule/gdata/youtube/service.py

commit ebb089a4086298a4680e68997767a160f5c8940a
Author: Christian.Kirbach <Christian.Kirbach@googlemail.com>
Date:	2010-01-08

    Updated German translation

M	po/de.po

commit 74733c92e3b3575f7b5d49fc784f832dbd81eccb
Author: John Stowers <john.stowers@gmail.com>
Date:	2010-01-07

    code clean, provate functionss listed before publin ones

M	conduit/gtkui/Canvas.py
M	conduit/gtkui/UI.py

commit 35befb14b15eb56419a9e386e3fd704bebe85fb9
Author: John Stowers <john.stowers@gmail.com>
Date:	2010-01-07

    show more appropriate hints when adding preconfigured conduits

M	conduit/gtkui/Canvas.py

commit 5514ee85973a5dd7db0156aaa1916fad103a938b
Author: John Stowers <john.stowers@gmail.com>
Date:	2010-01-07

    update db tester to gtkbuilder

M	tools/test-db-wrapper/main.py
R065	tools/test-db-wrapper/main.glade
tools/test-db-wrapper/main.ui

commit 058296007d0736686a9a9dba6c6b34ffa4f62f70
Author: John Stowers <john.stowers@gmail.com>
Date:	2010-01-07

    remove a few more traces of glade

M	conduit/gtkui/Canvas.py
M	conduit/gtkui/ConfigContainer.py
M	conduit/gtkui/ConfigItems.py
M	conduit/gtkui/EmbedConfigurator.py
M	conduit/gtkui/UI.py
M	conduit/gtkui/WindowConfigurator.py

commit 92d3989ae151bd43866b74babf65f05f98d4b0c2
Author: John Stowers <john.stowers@gmail.com>
Date:	2009-11-21

    Port to gtkbuilder

M	conduit/gtkui/Canvas.py
M	conduit/gtkui/ConflictResolver.py
M	conduit/gtkui/UI.py
M	data/Makefile.am
R062	data/conduit.glade	data/conduit.ui

commit 30593bd3af61822cb8ca3f15e9a7bbdc3636fcd2
Author: John Stowers <john.stowers@gmail.com>
Date:	2010-01-06

    move preferences management into its own object

M	conduit/gtkui/UI.py

commit 3b055823bfb25750c8f8450ef1781ec87ace9884
Author: John Stowers <john.stowers@gmail.com>
Date:	2010-01-06

    move autostart management into a utility class

M	conduit/gtkui/UI.py
A	conduit/utils/AutostartManager.py
M	conduit/utils/Makefile.am

commit 4fe74d492f7fa665dcee6ecd519ea2238f0e0325
Author: John Stowers <john.stowers@gmail.com>
Date:	2010-01-06

    update to newest gnome-doc-utils

M	m4/gnome-doc-utils.m4

commit 6a4f38b35796666ba30590100637a86ccbb85c19
Author: John Stowers <john.stowers@gmail.com>
Date:	2010-01-06

    Add more synchronization examples

M	conduit/Knowledge.py

commit 78e9b62f4a429159d75cf276bb6439f6d90f1b10
Author: John Stowers <john.stowers@gmail.com>
Date:	2010-01-06

    clean up preconfigured conduit handling

M	conduit/gtkui/UI.py

commit ca3658a27de96cc50380b67e24c7077e17b92738
Author: Nils-Christoph Fiedler <fiedler@medienkompanie.de>
Date:	2010-01-06

    Added LowGerman translation

A	po/nds.po

commit e9a4c839963ca74589cb1465c59c64f22d9e45d2
Author: Nils-Christoph Fiedler <fiedler@medienkompanie.de>
Date:	2010-01-06

    Added LowGerman translation

M	po/LINGUAS

commit 3aad1c099dc5806f8b87ccce35f15034a69e7367
Author: Aron Xu <aronxu@gnome.org>
Date:	2009-12-09

    Add Simplified Chinese translation.

M	po/LINGUAS
A	po/zh_CN.po

commit 2ba206942fbd310b420b07d87d14d9663806232f
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:	2009-11-23

    Updated Slovenian translation

M	po/sl.po

commit 42ba1f38cae62547e45350456cd7b755592129d3
Author: John Stowers <john.stowers@gmail.com>
Date:	2009-11-22

    use system installed flickrapi >= 1.2

M	conduit/modules/FlickrModule/FlickrModule.py
M	conduit/modules/FlickrModule/Makefile.am
D	conduit/modules/FlickrModule/flickrapi/LICENSE
D	conduit/modules/FlickrModule/flickrapi/Makefile.am
D	conduit/modules/FlickrModule/flickrapi/__init__.py
D	conduit/modules/FlickrModule/flickrapi/cache.py
D	conduit/modules/FlickrModule/flickrapi/exceptions.py
D	conduit/modules/FlickrModule/flickrapi/multipart.py
D	conduit/modules/FlickrModule/flickrapi/reportinghttp.py
D	conduit/modules/FlickrModule/flickrapi/tokencache.py
D	conduit/modules/FlickrModule/flickrapi/xmlnode.py
M	configure.ac

commit 7cb6c7ad8c320dca887242030ce02cf9993aeb7d
Author: John Stowers <john.stowers@gmail.com>
Date:	2009-11-22

    update pyfacebook

M	conduit/modules/FacebookModule/pyfacebook/__init__.py
M	scripts/update-3rdparty-libs.sh

commit 9ac3d372ec8d771dc2409f1d1e5526f2c08efb92
Author: John Stowers <john.stowers@gmail.com>
Date:	2009-11-20

    set text factory to stop unicode errors

M	conduit/Database.py

commit 5b45bf35e421bf273a3aed42079ad389b8f3e08b
Author: John Stowers <john.stowers@gmail.com>
Date:	2009-11-20

    don't die fatally on sqlite errors

M	conduit/Database.py

commit 021d03233c86cd092b738063f8952003886ecdae
Author: Jens Knutson <jensk.maps@gmail.com>
Date:	2009-10-30

    Fix ZotoModule makefile

M	conduit/modules/ZotoModule/Makefile.am

commit 97e80c7ae4003b97e926984c2b756c5cbd6b1731
Author: Christian Kirbach <Christian.Kirbach@googlemail.com>
Date:	2009-10-17

    Updated German manual translation

M	help/de/de.po

commit 92aaaa35027d6b2357f3c58fbc43d8a75f7c5e28
Author: Gianvito Cavasoli <gianvito@gmx.it>
Date:	2009-10-05

    Updated Italian translation

M	po/it.po

commit 5d15851eba792ab54bbb35978f44f0ace3056335
Author: Alexandre Rosenfeld <airmind@gmail.com>
Date:	2009-09-20

    Fixes window resizing in configuration

M	conduit/gtkui/WindowConfigurator.py

commit ac22bdfff9b42ca70e74529efdd1a01273a5c77e
Author: Alexandre Rosenfeld <airmind@gmail.com>
Date:	2009-06-12

    Changed config dialog to "Restore/Close" from "Cancel/Apply".

    Fixed YouTube (Google module) behaviour to work with Restore.
    Added getter for ConfigContainer and changed Flickr config to use it.

M	conduit/gtkui/ConfigContainer.py
M	conduit/gtkui/ConfigItems.py
M	conduit/gtkui/WindowConfigurator.py
M	conduit/modules/FlickrModule/FlickrModule.py
M	conduit/modules/GoogleModule/GoogleModule.py

commit fb064f69afb01142261d8a055ee6eac67439883a
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:	2009-09-13

    Updated British English translation

M	po/en_GB.po

commit 2157a38cfff1726a41e8a85377e7497d5c65e402
Author: Gianvito Cavasoli <gianvito@gmx.it>
Date:	2009-09-06

    Updated Italian translation

M	po/it.po

commit 31dc602d9670dc0c805faa9f0cd252937793d266
Author: Claude Paroz <claude@2xlibre.net>
Date:	2009-09-04

    Updated French translation

    Contributed by Laurent Coudeur and Bruno Brouard

M	po/fr.po

commit 557b23d1e4be53646a1d041566d3e8dd402f74f3
Author: Inaki Larranaga <dooteo@zundan.com>
Date:	2009-08-28

    Added Basque translation

M	po/LINGUAS

commit 44b815d627132d3f76ba271448257a37b01e212a
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:	2009-08-28

    Updated Basque language

A	po/eu.po

commit ed7d30fc5da5d37eec572914b0f56578d37989a4
Author: Timo Jyrinki <timo.jyrinki@iki.fi>
Date:	2009-08-26

    Updated Finnish translation

M	po/fi.po

commit 16b3a1f3688da09606c43356500dfbd667446ac8
Author: Flamarion Jorge <jorge.flamarion@gmail.com>
Date:	2009-08-25

    Updated Brazilian Portuguese translation

M	po/pt_BR.po

commit 8f532ede9ee347f0f6bafb1109b49fbc4235f95a
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2009-08-23

    Updated German translation

M	po/de.po

commit c32ba1103f4dbfc92038ce26dac021c29af344fc
Author: António Lima <amrlima@gmail.com>
Date:	2009-08-16

    Updated Portuguese translation

M	po/pt.po

commit e4204263cf0be48a7cff22ccd12110b9a1fb4e95
Author: Fran Dieguez <fran.dieguez@glug.es>
Date:	2009-08-15

    Updated Galician Translation

M	po/gl.po

commit c32a68bb987b03a549393259b343fc5a7e80ae95
Author: Daniel Nylander <po@danielnylander.se>
Date:	2009-08-14

    Updated Swedish translation

M	po/sv.po

commit f72e5a9de7dc3ac601769d3e9b2d25c45cb208d7
Author: Daniel Nylander <po@danielnylander.se>
Date:	2009-06-14

    Updated sv translation (Daniel Nylander)

M	po/sv.po

commit ae44cc68a0bbcefb64297ed230df7e3de24451ac
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	2009-08-07

    Updated Norwegian bokmål translation.

M	po/nb.po

commit 1a7b5098c5dcb89846618d63da1493888a4fd935
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:	2009-07-22

    Hungarian translation updated

M	po/hu.po

commit c774c1b255142771b9b9d7a615dd68847c20408f
Author: Andrew Stormont <astormont@svn.gnome.org>
Date:	2009-07-20

    Support for Mac OSX added to Wallpaper Module

M	ChangeLog
M	conduit/modules/DesktopWallpaperModule.py

commit d30282d20fe8b0bacc5cb5c7d3d318c31fa63c3a
Author: astormont <astormont@svn.gnome.org>
Date:	2009-07-17

    Support for Mac OSX added to Firefox 3 Module

M	ChangeLog
M	conduit/modules/ConverterModule.py
M	conduit/modules/Firefox3Module/Firefox3Module.py

commit 03bcf91b125da4f73e33feece50bc5ba366da6b7
Author: Andrew Stormont <andy@andrew-stormonts-power-mac-g4.local>
Date:	2009-07-16

    Only load FF3 module if /Users/andy/.mozilla/firefox exists

M	ChangeLog
M	conduit/modules/Firefox3Module/Firefox3Module.py

commit 31476bcf3d4dd4441589e7b47d656f68067f44a2
Author: Andrew Stormont <andy@andrew-stormonts-power-mac-g4.local>
Date:	2009-07-15

    2009-07-15	Andrew Stormont  <astormont@svn.gnome.org>

	* conduit/conduit.real:
	* conduit/gtkui/UI.py:
	Workaround for PyGTK bug on Mac OSX

M	ChangeLog
M	conduit/conduit.real
M	conduit/gtkui/Tree.py
M	conduit/gtkui/UI.py

commit e4360376a4fc10b6d03fa135d13e3517e932fe57
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	2009-07-12

    Updated Spanish translation

M	po/es.po

commit b916b68bbfc6f57333be63331964aa0306018b54
Author: David Planella <david.planella@gmail.com>
Date:	2009-06-21

    Marked multiple strings for translation

    Fixes Bugzilla #568442

M	conduit/Knowledge.py
M	conduit/Main.py
M	conduit/Module.py
M	conduit/dataproviders/DataProvider.py
M	conduit/dataproviders/Image.py
M	conduit/dataproviders/__init__.py
M	conduit/gtkui/Canvas.py
M	conduit/gtkui/UI.py
M	conduit/modules/BackpackModule/BackpackModule.py
M	conduit/modules/BansheeModule/BansheeModule.py
M	conduit/modules/BoxDotNetModule/BoxDotNetModule.py
M	conduit/modules/ConverterModule.py
M	conduit/modules/DesktopWallpaperModule.py
M	conduit/modules/EvolutionModule/EvolutionModule.py
M	conduit/modules/FacebookModule/FacebookModule.py
M	conduit/modules/FeedModule/FeedModule.py
M	conduit/modules/FlickrModule/FlickrModule.py
M	conduit/modules/FspotModule/FspotModule.py
M	conduit/modules/GConfModule/GConfModule.py
M	conduit/modules/GoogleBookmarksModule.py
M	conduit/modules/NautilusBookmarksModule.py
M	conduit/modules/RhythmboxModule/RhythmboxModule.py
M	conduit/modules/SynceModule.py
M	conduit/modules/TomboyModule.py
M	conduit/modules/ZotoModule/ZotoModule.py
M	conduit/modules/iPodModule/iPodModule.py
M	po/POTFILES.in

commit 1fb009f3a92f1876325cd8a01fe6293b80937a1f
Author: John Stowers <john.stowers@gmail.com>
Date:	2009-07-01

    Fix #575000

M	NEWS
M	conduit/gtkui/Database.py
M	conduit/modules/FileModule/FileConfiguration.py
M	conduit/modules/FileModule/FileModule.py

commit cdce2398e326d5f3cdf18f9f2b9a4f5550ed77f1
Author: John Stowers <john.stowers@gmail.com>
Date:	2009-07-01

    Fix crash on close on Python 2.6

M	conduit/modules/NetworkModule/XMLRPCUtils.py

commit 7cc987cea6c8f6a1b49f46c92281cfc933b26bef
Author: John Stowers <john.stowers@gmail.com>
Date:	2009-06-27

    remove obsolete release scripts

D	scripts/maintainer.py
D	scripts/release.sh

commit 2d6d78655cbf02b1d8b432a93368a49d897f93d2
Author: John Stowers <john.stowers@gmail.com>
Date:	2009-06-27

    post release version bump

M	NEWS
M	conduit/__init__.py
M	configure.ac

commit be139817cf1c6e27f9c5965e43f9a7c03fe8c020
Author: John Carr <john.carr@unrouted.co.uk>
Date:	2009-06-27

    Fix #583173

M	conduit/modules/FlickrModule/flickrapi/__init__.py
M	conduit/modules/GoogleModule/gdata/tlslite/utils/cryptomath.py

commit e8bf29817545f757404d69ab1475a151534611a2
Author: John Carr <john.carr@unrouted.co.uk>
Date:	2009-06-17

    Fix an iPod bug that was breaking 4 tracker test cases

M	conduit/modules/iPodModule/iPodModule.py

commit 51d2bdf918e72ab60bcb77aa573b35bd762eee52
Author: John Carr <john.carr@unrouted.co.uk>
Date:	2009-06-27

    Depend on py-GIO >= 2.16.1 (earliest known good version)

M	configure.ac

commit 7652415f0e90f0466ed31f27a4f23e56aa80e6b8
Author: John Carr <john.carr@unrouted.co.uk>
Date:	2009-06-27

    Remove gnomevfs

M	conduit/Vfs.py
M	conduit/__init__.py
M	conduit/datatypes/File.py
M	conduit/defs.py.in
M	conduit/gtkui/UI.py
D	conduit/platform/FileGnomeVfs.py
M	conduit/platform/Makefile.am
M	configure.ac
M	scripts/maintainer.py
M	test/python-tests/TestCoreFile.py
M	test/python-tests/TestCoreVfs.py
M	test/python-tests/common.py
