Merge branch 'master' of git://repo.or.cz/fpbd-bostik.git

pyfpdb/GuiAutoImport.py

@@ -343,12 +343,12 @@ if __name__== "__main__":
     if os.name == 'nt': settings['os'] = 'windows'
     else:               settings['os'] = 'linuxmac'
 
-    settings.update(config.get_db_parameters('fpdb'))
+    settings.update(config.get_db_parameters())
     settings.update(config.get_import_parameters())
     settings.update(config.get_default_paths())
 
     if(options.gui == True):
-        i = GuiAutoImport(settings, config)
+        i = GuiAutoImport(settings, config, None, None)
         main_window = gtk.Window()
         main_window.connect('destroy', destroy)
         main_window.add(i.mainVBox)

pyfpdb/locale/fpdb-en_GB.pot

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-10-02 13:52+CEST\n"
+"POT-Creation-Date: 2010-10-03 09:59+CEST\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"