Merge tag 'upstream/0.4.4'

Upstream version 0.4.4

31 files changed, 121 insertions, 65 deletions

diff --git a/rapid/ChangeLog b/rapid/ChangeLog
index 775d535..e2bd42f 100644
--- a/rapid/ChangeLog
+++ b/rapid/ChangeLog
@@ -1,3 +1,23 @@
+Version 0.4.4
+-------------
+
+2012-05-30
+
+Fixed bug #998320: Applied patch from Dmitry Kazimirov for option to have 
+subfolder generation and file renaming use a month in text format. Thanks
+Dmitry!
+
+Fixed bug #986681: Crash when showing question dialog on some non-Gnome systems.
+Thanks go to Liudas Ališauskas for the suggested fix.
+
+Fixed bug #995769: The Help button in the preferences dialog does not work.
+
+Fixed bug #996613: Updated Free Software Foundation address.
+
+Added Estonian translation. Updated Brazilian, Dutch, French, German, Norwegian 
+Bokmal, Polish, Spanish and Russian translations.
+
+
 Version 0.4.3
 -------------
 
diff --git a/rapid/backupfile.py b/rapid/backupfile.py
index 39efb53..6581e6d 100644
--- a/rapid/backupfile.py
+++ b/rapid/backupfile.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: latin1 -*-
 
-### Copyright (C) 2011 Damon Lynch <damonlynch@gmail.com>
+### Copyright (C) 2011 - 2012 Damon Lynch <damonlynch@gmail.com>
 
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
@@ -15,7 +15,8 @@
 
 ### You should have received a copy of the GNU General Public License
 ### along with this program; if not, write to the Free Software
-### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+### USA
 
 import multiprocessing
 import tempfile
diff --git a/rapid/config.py b/rapid/config.py
index 74802ec..64228e8 100644
--- a/rapid/config.py
+++ b/rapid/config.py
@@ -1,5 +1,5 @@
 # -*- coding: latin1 -*-
-### Copyright (C) 2007, 2008, 2009, 2010, 2011 Damon Lynch <damonlynch@gmail.com>
+### Copyright (C) 2007 - 2012 Damon Lynch <damonlynch@gmail.com>
 
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
@@ -13,9 +13,10 @@
 
 ### You should have received a copy of the GNU General Public License
 ### along with this program; if not, write to the Free Software
-### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+### USA
 
-version = '0.4.3'
+version = '0.4.4'
 
 GCONF_KEY="/apps/rapid-photo-downloader"
 
diff --git a/rapid/copyfiles.py b/rapid/copyfiles.py
index f6ff073..4a67ece 100644
--- a/rapid/copyfiles.py
+++ b/rapid/copyfiles.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: latin1 -*-
 
-### Copyright (C) 2011 Damon Lynch <damonlynch@gmail.com>
+### Copyright (C) 2011-2012 Damon Lynch <damonlynch@gmail.com>
 
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
@@ -15,7 +15,8 @@
 
 ### You should have received a copy of the GNU General Public License
 ### along with this program; if not, write to the Free Software
-### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+### USA
 
 import multiprocessing
 import tempfile
diff --git a/rapid/device.py b/rapid/device.py
index 423acdd..77b03ac 100644
--- a/rapid/device.py
+++ b/rapid/device.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: latin1 -*-
 
-### Copyright (C) 2011 Damon Lynch <damonlynch@gmail.com>
+### Copyright (C) 2011-2012 Damon Lynch <damonlynch@gmail.com>
 
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
@@ -15,7 +15,8 @@
 
 ### You should have received a copy of the GNU General Public License
 ### along with this program; if not, write to the Free Software
-### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+### USA
 
 import os
 import gtk, gio
diff --git a/rapid/downloadtracker.py b/rapid/downloadtracker.py
index df48754..5a9e452 100644
--- a/rapid/downloadtracker.py
+++ b/rapid/downloadtracker.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: latin1 -*-
 
-### Copyright (C) 2011 Damon Lynch <damonlynch@gmail.com>
+### Copyright (C) 2011-2012 Damon Lynch <damonlynch@gmail.com>
 
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
@@ -15,7 +15,8 @@
 
 ### You should have received a copy of the GNU General Public License
 ### along with this program; if not, write to the Free Software
-### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+### USA
 
 import time
 
diff --git a/rapid/errorlog.py b/rapid/errorlog.py
index 9b35a52..d391b89 100644
--- a/rapid/errorlog.py
+++ b/rapid/errorlog.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: latin1 -*-
 
-### Copyright (C) 2011 Damon Lynch <damonlynch@gmail.com>
+### Copyright (C) 2011-2012 Damon Lynch <damonlynch@gmail.com>
 
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
@@ -15,7 +15,8 @@
 
 ### You should have received a copy of the GNU General Public License
 ### along with this program; if not, write to the Free Software
-### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+### USA
 
 import gtk
 
diff --git a/rapid/filemodify.py b/rapid/filemodify.py
index 3f4f2be..8e5d8a3 100644
--- a/rapid/filemodify.py
+++ b/rapid/filemodify.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: latin1 -*-
 
-### Copyright (C) 2011 Damon Lynch <damonlynch@gmail.com>
+### Copyright (C) 2011-2012 Damon Lynch <damonlynch@gmail.com>
 
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
@@ -15,7 +15,8 @@
 
 ### You should have received a copy of the GNU General Public License
 ### along with this program; if not, write to the Free Software
-### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+### USA
 
 import os.path, fractions
 import subprocess
diff --git a/rapid/filmstrip.py b/rapid/filmstrip.py
index fc751fd..916cb39 100755
--- a/rapid/filmstrip.py
+++ b/rapid/filmstrip.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: latin1 -*-
 
-### Copyright (C) 2010 Damon Lynch <damonlynch@gmail.com>
+### Copyright (C) 2010-2012 Damon Lynch <damonlynch@gmail.com>
 
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
@@ -15,7 +15,8 @@
 
 ### You should have received a copy of the GNU General Public License
 ### along with this program; if not, write to the Free Software
-### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+### USA
 
 """
 Adds a filmstrip to the left and right of a pixbuf
diff --git a/rapid/generatename.py b/rapid/generatename.py
index 99d7287..84c9310 100644
--- a/rapid/generatename.py
+++ b/rapid/generatename.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: latin1 -*-
 
-### Copyright (C) 2007, 2008, 2009, 2010, 2011 Damon Lynch <damonlynch@gmail.com>
+### Copyright (C) 2007-2012 Damon Lynch <damonlynch@gmail.com>
 
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
@@ -15,7 +15,8 @@
 
 ### You should have received a copy of the GNU General Public License
 ### along with this program; if not, write to the Free Software
-### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+### USA
 
 import os, re, datetime, string, collections
 
diff --git a/rapid/generatenameconfig.py b/rapid/generatenameconfig.py
index 0fbeb38..23e58f6 100644
--- a/rapid/generatenameconfig.py
+++ b/rapid/generatenameconfig.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: latin1 -*-
 
-### Copyright (C) 2007, 2008, 2009, 2010, 2011 Damon Lynch <damonlynch@gmail.com>
+### Copyright (C) 2007-2012 Damon Lynch <damonlynch@gmail.com>
 
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
@@ -15,7 +15,8 @@
 
 ### You should have received a copy of the GNU General Public License
 ### along with this program; if not, write to the Free Software
-### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+### USA
 
 # Special key in each dictionary which specifies the order of elements.
 # It is very important to have a consistent and rational order when displaying 
@@ -132,7 +133,7 @@ SUBSECONDS = 'Subseconds'
 LIST_DATE_TIME_L2 = ['YYYYMMDD', 'YYYY-MM-DD','YYMMDD', 'YY-MM-DD', 
                     'MMDDYYYY', 'MMDDYY', 'MMDD', 
                     'DDMMYYYY', 'DDMMYY', 'YYYY', 'YY', 
-                    'MM', 'DD', 
+                    'MM', 'DD', 'Month (full)', 'Month (abbreviated)',
                     'HHMMSS', 'HHMM', 'HH-MM-SS',  'HH-MM',  'HH',  'MM (minutes)',  'SS']
                     
 
@@ -143,7 +144,7 @@ DEFAULT_VIDEO_SUBFOLDER_PREFS = [DATE_TIME, VIDEO_DATE, LIST_DATE_TIME_L2[9], '/
 
 class i18TranslateMeThanks:
     """ this class is never used in actual running code
-    It's purpose is to have these values inserted into the program's i18n template file
+    Its purpose is to have these values inserted into the program's i18n template file
     
     """
     def __init__(self):
@@ -266,6 +267,10 @@ class i18TranslateMeThanks:
         # Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
         _('DD')
         # Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+        _('Month (full)'),
+        # Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+        _('Month (abbreviated)'),
+        # Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
         _('HHMMSS')
         # Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
         _('HHMM')
@@ -287,7 +292,7 @@ class i18TranslateMeThanks:
 DATE_TIME_CONVERT = ['%Y%m%d', '%Y-%m-%d','%y%m%d', '%y-%m-%d', 
                     '%m%d%Y', '%m%d%y', '%m%d',
                     '%d%m%Y', '%d%m%y', '%Y', '%y', 
-                    '%m', '%d',
+                    '%m', '%d', '%B', '%b',
                     '%H%M%S', '%H%M', '%H-%M-%S',  '%H-%M',  
                     '%H',  '%M',  '%S']
                     
diff --git a/rapid/glade3/about.ui b/rapid/glade3/about.ui
index 7e10e37..b770f72 100644
--- a/rapid/glade3/about.ui
+++ b/rapid/glade3/about.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.20"/>
+  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAboutDialog" id="about">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -8,7 +9,7 @@
     <property name="icon">rapid-photo-downloader.svg</property>
     <property name="type_hint">dialog</property>
     <property name="program_name">Rapid Photo Downloader</property>
-    <property name="copyright">Copyright Damon Lynch 2007-11</property>
+    <property name="copyright">Copyright Damon Lynch 2007-12</property>
     <property name="comments" translatable="yes">Import your photos and videos efficiently and reliably</property>
     <property name="website">http://www.damonlynch.net/rapid</property>
     <property name="license">Rapid Photo Downloader is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
@@ -26,6 +27,7 @@ Bert &lt;crinbert@yahoo.com&gt;
 Martin Dahl Moe
 Marco de Freitas &lt;marcodefreitas@gmail.com&gt;
 Martin Egger &lt;martin.egger@gmx.net&gt;
+Tauno Erik &lt;tauno.erik@gmail.com&gt;
 Emanuele Grande &lt;caccolangrifata@gmail.com&gt;
 Torben Gundtofte-Bruun &lt;torben@g-b.dk&gt;
 Miroslav Matejaš &lt;silverspace@ubuntu-hr.org&gt;
@@ -52,13 +54,12 @@ Aron Xu &lt;happyaron.xu@gmail.com&gt;
     <property name="logo">rapid-photo-downloader.svg</property>
     <property name="wrap_license">True</property>
     <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox1">
+      <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area1">
+          <object class="GtkHButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
diff --git a/rapid/metadataexiftool.py b/rapid/metadataexiftool.py
index d6b61fc..9be5ea7 100755
--- a/rapid/metadataexiftool.py
+++ b/rapid/metadataexiftool.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: latin1 -*-
 
-### Copyright (C) 2011 Damon Lynch <damonlynch@gmail.com>
+### Copyright (C) 2011-2012 Damon Lynch <damonlynch@gmail.com>
 
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
@@ -15,7 +15,8 @@
 
 ### You should have received a copy of the GNU General Public License
 ### along with this program; if not, write to the Free Software
-### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+### USA
 
 import subprocess
 import json
diff --git a/rapid/metadataphoto.py b/rapid/metadataphoto.py
index 1b36be9..4e88994 100644
--- a/rapid/metadataphoto.py
+++ b/rapid/metadataphoto.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: latin1 -*-
 
-### Copyright (C) 2007-10 Damon Lynch <damonlynch@gmail.com>
+### Copyright (C) 2007-2012 Damon Lynch <damonlynch@gmail.com>
 
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
@@ -15,7 +15,8 @@
 
 ### You should have received a copy of the GNU General Public License
 ### along with this program; if not, write to the Free Software
-### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+### USA
 
 import re
 import datetime
diff --git a/rapid/metadatavideo.py b/rapid/metadatavideo.py
index 5519143..f5a11a4 100644
--- a/rapid/metadatavideo.py
+++ b/rapid/metadatavideo.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: latin1 -*-
 
-### Copyright (C) 2007-11 Damon Lynch <damonlynch@gmail.com>
+### Copyright (C) 2007-2012 Damon Lynch <damonlynch@gmail.com>
 
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
@@ -15,7 +15,8 @@
 
 ### You should have received a copy of the GNU General Public License
 ### along with this program; if not, write to the Free Software
-### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+### USA
 
 HAVE_HACHOIR = True
 DOWNLOAD_VIDEO = True
diff --git a/rapid/metadataxmp.py b/rapid/metadataxmp.py
index 47321e3..b42b587 100755
--- a/rapid/metadataxmp.py
+++ b/rapid/metadataxmp.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: latin1 -*-
 
-### Copyright (C) 2011-12 Damon Lynch <damonlynch@gmail.com>
+### Copyright (C) 2011-2012 Damon Lynch <damonlynch@gmail.com>
 
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
@@ -15,7 +15,8 @@
 
 ### You should have received a copy of the GNU General Public License
 ### along with this program; if not, write to the Free Software
-### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+### USA
 
 import subprocess
 
diff --git a/rapid/misc.py b/rapid/misc.py
index e748dc3..69b4a93 100644
--- a/rapid/misc.py
+++ b/rapid/misc.py
@@ -15,7 +15,8 @@
 
 ### You should have received a copy of the GNU General Public License
 ### along with this program; if not, write to the Free Software
-### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+### USA
 
 # modified by Damon Lynch 2009 to remove default bold formatting and alignment
 """Module of commonly used helper classes and functions
diff --git a/rapid/paths.py b/rapid/paths.py
index 0653324..b110512 100644
--- a/rapid/paths.py
+++ b/rapid/paths.py
@@ -12,7 +12,8 @@
 
 ### You should have received a copy of the GNU General Public License
 ### along with this program; if not, write to the Free Software
-### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+### USA
 
 import os
 
diff --git a/rapid/preferencesdialog.py b/rapid/preferencesdialog.py
index bc9e0b7..6e1f548 100644
--- a/rapid/preferencesdialog.py
+++ b/rapid/preferencesdialog.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: latin1 -*-
 
-### Copyright (C) 2007 - 2011 Damon Lynch <damonlynch@gmail.com>
+### Copyright (C) 2007-2012 Damon Lynch <damonlynch@gmail.com>
 
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
@@ -15,7 +15,8 @@
 
 ### You should have received a copy of the GNU General Public License
 ### along with this program; if not, write to the Free Software
-### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+### USA
 
 
 import datetime, re
@@ -27,6 +28,8 @@ import multiprocessing
 import logging
 logger = multiprocessing.get_logger()
 
+import webbrowser
+
 import ValidatedEntry
 import misc
 
@@ -399,7 +402,7 @@ class QuestionDialog(gtk.Dialog):
         prompt_hbox = gtk.HBox()
         
         icontheme = gtk.icon_theme_get_default()
-        icon = icontheme.load_icon('gtk-dialog-question', 36, gtk.ICON_LOOKUP_USE_BUILTIN)        
+        icon = icontheme.load_icon('dialog-question', 36, gtk.ICON_LOOKUP_USE_BUILTIN)        
         if icon:
             image = gtk.Image()
             image.set_from_pixbuf(icon)
@@ -705,7 +708,7 @@ class RemoveAllJobCodeDialog(gtk.Dialog):
         prompt_hbox = gtk.HBox()
         
         icontheme = gtk.icon_theme_get_default()
-        icon = icontheme.load_icon('gtk-dialog-question', 36, gtk.ICON_LOOKUP_USE_BUILTIN)        
+        icon = icontheme.load_icon('dialog-question', 36, gtk.ICON_LOOKUP_USE_BUILTIN)        
         if icon:
             image = gtk.Image()
             image.set_from_pixbuf(icon)
diff --git a/rapid/prefs.py b/rapid/prefs.py
index 2f7d771..cc89c96 100644
--- a/rapid/prefs.py
+++ b/rapid/prefs.py
@@ -12,7 +12,8 @@
 
 ### You should have received a copy of the GNU General Public License
 ### along with this program; if not, write to the Free Software
-### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+### USA
 
 ### Modified August 2007 by Damon Lynch to allow use of list value preferences
 ### Modified May 2010 by Damon Lynch to allow preferences to be reset
diff --git a/rapid/prefsrapid.py b/rapid/prefsrapid.py
index efd06b5..b7030c8 100644
--- a/rapid/prefsrapid.py
+++ b/rapid/prefsrapid.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: latin1 -*-
 
-### Copyright (C) 2007, 2008, 2009, 2010, 2011 Damon Lynch <damonlynch@gmail.com>
+### Copyright (C) 2007-2012 Damon Lynch <damonlynch@gmail.com>
 
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
@@ -15,7 +15,8 @@
 
 ### You should have received a copy of the GNU General Public License
 ### along with this program; if not, write to the Free Software
-### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+### USA
 
 import subprocess, os, datetime, re
 
diff --git a/rapid/problemnotification.py b/rapid/problemnotification.py
index 95e31a4..ee0be5d 100755
--- a/rapid/problemnotification.py
+++ b/rapid/problemnotification.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: latin1 -*-
 
-### Copyright (C) 2010 Damon Lynch <damonlynch@gmail.com>
+### Copyright (C) 2010-2012 Damon Lynch <damonlynch@gmail.com>
 
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
@@ -15,7 +15,8 @@
 
 ### You should have received a copy of the GNU General Public License
 ### along with this program; if not, write to the Free Software
-### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+### USA
 
 import sys
 import types
diff --git a/rapid/rapid.py b/rapid/rapid.py
index 9c423c2..a060db3 100755
--- a/rapid/rapid.py
+++ b/rapid/rapid.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: latin1 -*-
 
-### Copyright (C) 2011 Damon Lynch <damonlynch@gmail.com>
+### Copyright (C) 2011-2012 Damon Lynch <damonlynch@gmail.com>
 
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
@@ -15,7 +15,8 @@
 
 ### You should have received a copy of the GNU General Public License
 ### along with this program; if not, write to the Free Software
-### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+### USA
 
 
 import tempfile
diff --git a/rapid/renamesubfolderprefstest.py b/rapid/renamesubfolderprefstest.py
index 26afd97..d675c54 100644
--- a/rapid/renamesubfolderprefstest.py
+++ b/rapid/renamesubfolderprefstest.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: latin1 -*-
 
-### Copyright (C) 2007, 2008, 2009 Damon Lynch <damonlynch@gmail.com>
+### Copyright (C) 2007-2012 Damon Lynch <damonlynch@gmail.com>
 
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
@@ -15,7 +15,8 @@
 
 ### You should have received a copy of the GNU General Public License
 ### along with this program; if not, write to the Free Software
-### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+### USA
 
 import unittest
 
diff --git a/rapid/rpdfile.py b/rapid/rpdfile.py
index 8818182..99f6aa5 100644
--- a/rapid/rpdfile.py
+++ b/rapid/rpdfile.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: latin1 -*-
 
-### Copyright (C) 2011 Damon Lynch <damonlynch@gmail.com>
+### Copyright (C) 2011-2012 Damon Lynch <damonlynch@gmail.com>
 
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
@@ -15,7 +15,8 @@
 
 ### You should have received a copy of the GNU General Public License
 ### along with this program; if not, write to the Free Software
-### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+### USA
 
 import os
 import gtk
diff --git a/rapid/rpdmultiprocessing.py b/rapid/rpdmultiprocessing.py
index 7fdd252..06d69d1 100644
--- a/rapid/rpdmultiprocessing.py
+++ b/rapid/rpdmultiprocessing.py
@@ -1,5 +1,5 @@
 # -*- coding: latin1 -*-
-### Copyright (C) 2007, 2008, 2009, 2010, 2011 Damon Lynch <damonlynch@gmail.com>
+### Copyright (C) 2007-2012 Damon Lynch <damonlynch@gmail.com>
 
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
@@ -13,7 +13,8 @@
 
 ### You should have received a copy of the GNU General Public License
 ### along with this program; if not, write to the Free Software
-### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+### USA
 
 CONN_PARTIAL = 0
 CONN_COMPLETE = 1
diff --git a/rapid/scan.py b/rapid/scan.py
index 02902ec..c6ccaf8 100755
--- a/rapid/scan.py
+++ b/rapid/scan.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: latin1 -*-
 
-### Copyright (C) 2011 Damon Lynch <damonlynch@gmail.com>
+### Copyright (C) 2011-2012 Damon Lynch <damonlynch@gmail.com>
 
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
@@ -15,7 +15,8 @@
 
 ### You should have received a copy of the GNU General Public License
 ### along with this program; if not, write to the Free Software
-### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+### USA
 
 import os
 import multiprocessing
diff --git a/rapid/subfolderfile.py b/rapid/subfolderfile.py
index 345edce..a7b0f89 100644
--- a/rapid/subfolderfile.py
+++ b/rapid/subfolderfile.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: latin1 -*-
 
-### Copyright (C) 2011 Damon Lynch <damonlynch@gmail.com>
+### Copyright (C) 2011-2012 Damon Lynch <damonlynch@gmail.com>
 
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
@@ -15,7 +15,8 @@
 
 ### You should have received a copy of the GNU General Public License
 ### along with this program; if not, write to the Free Software
-### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+### USA
 
 """
 Generates names for files and folders.
diff --git a/rapid/tableplusminus.py b/rapid/tableplusminus.py
index 5713474..b730092 100644
--- a/rapid/tableplusminus.py
+++ b/rapid/tableplusminus.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: latin1 -*-
 
-### Copyright (C) 2007, 2008, 2009 Damon Lynch <damonlynch@gmail.com>
+### Copyright (C) 2007-2012 Damon Lynch <damonlynch@gmail.com>
 
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
@@ -15,7 +15,8 @@
 
 ### You should have received a copy of the GNU General Public License
 ### along with this program; if not, write to the Free Software
-### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+### USA
 
 # import gtk.gdk as gdk
 import sys
diff --git a/rapid/thumbnail.py b/rapid/thumbnail.py
index 404c18b..69a6cf7 100644
--- a/rapid/thumbnail.py
+++ b/rapid/thumbnail.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: latin1 -*-
 
-### Copyright (C) 2011 Damon Lynch <damonlynch@gmail.com>
+### Copyright (C) 2011-2012 Damon Lynch <damonlynch@gmail.com>
 
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
@@ -15,7 +15,8 @@
 
 ### You should have received a copy of the GNU General Public License
 ### along with this program; if not, write to the Free Software
-### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+### USA
 
 import multiprocessing
 import types
diff --git a/rapid/utilities.py b/rapid/utilities.py
index ad77a29..35c51ac 100644
--- a/rapid/utilities.py
+++ b/rapid/utilities.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: latin1 -*-
 
-### Copyright (C) 2007 - 2011 Damon Lynch <damonlynch@gmail.com>
+### Copyright (C) 2007-2012 Damon Lynch <damonlynch@gmail.com>
 
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
@@ -15,7 +15,8 @@
 
 ### You should have received a copy of the GNU General Public License
 ### along with this program; if not, write to the Free Software
-### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+### USA
 
 import os
 import gio