[Digikam-devel] AAA!!! How to commit to a remote branch?

Andi Clemens andi.clemens at gmail.com
Sat Aug 18 10:12:36 BST 2012


Hi,

somehow Git always creates a new remote branch here, I am unable to commit  
to the one I'm tracking.


I checked out the remote branch with the following command:

git checkout --track -b 3.0.0 origin/development/3.0.0

Then I committed my changes. I called

git push

but nothing happens.

I called

git push --all

and it created a lot of remote braches I don't really want.

How can I commit to the one I'm tracking with my local "3.0.0" branch?

Andi


------- Forwarded message -------
From: "Andi Clemens" <andi.clemens at googlemail.com>
To: kde-commits at kde.org
Cc:
Subject: [digikam/3.0.0] /: changed my email address
Date: Sat, 18 Aug 2012 11:09:03 +0200

Git commit 9ac27d2445368c215926ce40e94fa14d1d0f4956 by Andi Clemens.
Committed on 18/08/2012 at 11:03.
Pushed by aclemens into branch '3.0.0'.

changed my email address

M  +1    -1    AUTHORS
M  +1    -1    digikam.lsm.cmake
M  +1    -1    digikam/album/albumselectcombobox.cpp
M  +1    -1    digikam/album/albumselectcombobox.h
M  +1    -1    digikam/album/albumselectiontreeview.cpp
M  +1    -1    digikam/album/albumselectiontreeview.h
M  +1    -1    digikam/album/albumtreeview.cpp
M  +1    -1    digikam/album/albumtreeview.h
M  +1    -1    digikam/date/monthwidget.cpp
M  +1    -1    digikam/date/timelinewidget.cpp
M  +1    -1    digikam/date/timelinewidget.h
M  +1    -1    digikam/dragdrop/albumdragdrop.cpp
M  +1    -1    digikam/dragdrop/imagedragdrop.cpp
M  +1    -1    digikam/filters/filtersidebarwidget.cpp
M  +1    -1    digikam/filters/filtersidebarwidget.h
M  +1    -1    digikam/filters/tagfilterview.cpp
M  +1    -1    digikam/filters/tagfilterview.h
M  +1    -1    digikam/items/digikamimagedelegate.cpp
M  +1    -1    digikam/items/digikamimagedelegatepriv.h
M  +1    -1    digikam/items/digikamimagefacedelegate.cpp
M  +1    -1    digikam/items/digikamimageview.cpp
M  +1    -1    digikam/items/imagecategorydrawer.cpp
M  +1    -1    digikam/items/imagedelegate.cpp
M  +1    -1    digikam/items/imagedelegatepriv.h
M  +1    -1    digikam/items/imagethumbnaildelegate.cpp
M  +1    -1    digikam/items/imageviewutilities.cpp
M  +1    -1    digikam/main/digikamapp.cpp
M  +1    -1    digikam/main/digikamapp.h
M  +1    -1    digikam/models/digikammodelcollection.cpp
M  +1    -1    digikam/models/digikammodelcollection.h
M  +1    -1    digikam/tags/tagcheckview.cpp
M  +1    -1    digikam/tags/tagcheckview.h
M  +1    -1    digikam/tags/tagfolderview.cpp
M  +1    -1    digikam/utils/contextmenuhelper.cpp
M  +1    -1    digikam/utils/contextmenuhelper.h
M  +1    -1    digikam/utils/editablesearchtreeview.cpp
M  +1    -1    digikam/utils/globals.h
M  +1    -1    digikam/utils/uifilevalidator.cpp
M  +1    -1    digikam/utils/uifilevalidator.h
M  +1    -1    digikam/views/digikamview.cpp
M  +1    -1    digikam/views/digikamview.h
M  +1    -1    digikam/views/imagepreviewview.cpp
M  +1    -1    digikam/views/imagepreviewview.h
M  +1    -1    digikam/views/leftsidebarwidgets.cpp
M  +1    -1    digikam/views/welcomepageview.cpp
M  +1    -1    digikam/views/welcomepageview.h
M  +1    -1    imageplugins/enhance/blurtool.cpp
M  +1    -1    imageplugins/enhance/blurtool.h
M  +1    -1    imageplugins/transform/freerotationtool.cpp
M  +1    -1    imageplugins/transform/freerotationtool.h
M  +1    -1    libs/database/albumdb.cpp
M  +1    -1    libs/database/albumdb.h
M  +1    -1    libs/database/haar/haariface.cpp
M  +1    -1    libs/database/haar/haariface.h
M  +1    -1    libs/dialogs/daboutdata.cpp
M  +1    -1    libs/dialogs/deletedialog.cpp
M  +1    -1    libs/dialogs/deletedialog.h
M  +1    -1    libs/dialogs/infodlg.cpp
M  +1    -1    libs/dialogs/infodlg.h
M  +1    -1    libs/dimg/filters/curves/curvesbox.cpp
M  +1    -1    libs/dimg/filters/curves/curvesbox.h
M  +1    -1    libs/dimg/filters/decorate/borderfilter.cpp
M  +1    -1    libs/dimg/filters/decorate/borderfilter.h
M  +1    -1    libs/dimg/filters/fx/blurfilter.cpp
M  +1    -1    libs/dimg/filters/fx/blurfilter.h
M  +1    -1    libs/dimg/filters/levels/histogrambox.cpp
M  +1    -1    libs/dimg/filters/levels/histogrambox.h
M  +1    -1    libs/dimg/filters/transform/freerotationfilter.cpp
M  +1    -1    libs/dimg/filters/transform/freerotationfilter.h
M  +1    -1    libs/imageproperties/imagedescedittab.cpp
M  +1    -1    libs/models/abstractalbummodel.cpp
M  +1    -1    libs/models/abstractalbummodel.h
M  +1    -1    libs/models/imagefiltermodel.cpp
M  +1    -1    libs/models/imagefiltermodel.h
M  +1    -1    libs/models/imagefiltersettings.cpp
M  +1    -1    libs/models/imagefiltersettings.h
M  +1    -1    libs/widgets/common/buttonicondisabler.cpp
M  +1    -1    libs/widgets/common/buttonicondisabler.h
M  +1    -1    libs/widgets/common/dcursortracker.cpp
M  +1    -1    libs/widgets/common/dcursortracker.h
M  +1    -1    libs/widgets/itemview/ditemdelegate.cpp
M  +1    -1    libs/widgets/itemview/itemviewimagedelegate.cpp
M  +1    -1    libs/widgets/itemview/itemviewimagedelegatepriv.h
M  +1    -1    project/scripts/checkMocIncludes.rb
M  +1    -1    project/scripts/cleanup_headers/cleanup_headers.py
M  +1    -1    project/scripts/fileformatter.py
M  +1    -1    showfoto/main/showfoto.cpp
M  +1    -1    showfoto/main/showfoto.h
M  +1    -1    tests/advancedrenametest.cpp
M  +1    -1    tests/advancedrenametest.h
M  +1    -1    tests/cameranamehelpertest.cpp
M  +1    -1    tests/cameranamehelpertest.h
M  +1    -1    tests/freerotationtest.cpp
M  +1    -1    tests/freerotationtest.h
M  +1    -1    tests/uifilevalidatortest.cpp
M  +1    -1    tests/uifilevalidatortest.h
M  +1    -1    utilities/advancedrename/advancedrenamedialog.cpp
M  +1    -1    utilities/advancedrename/advancedrenamedialog.h
M  +1    -1    utilities/advancedrename/advancedrenameinput.cpp
M  +1    -1    utilities/advancedrename/advancedrenameinput.h
M  +1    -1    utilities/advancedrename/advancedrenamemanager.cpp
M  +1    -1    utilities/advancedrename/advancedrenamemanager.h
M  +1    -1    utilities/advancedrename/advancedrenameprocessdialog.cpp
M  +1    -1    utilities/advancedrename/advancedrenameprocessdialog.h
M  +1    -1    utilities/advancedrename/advancedrenamewidget.cpp
M  +1    -1    utilities/advancedrename/advancedrenamewidget.h
M  +1    -1    utilities/advancedrename/common/dynamiclayout.cpp
M  +1    -1    utilities/advancedrename/common/dynamiclayout.h
M  +1    -1    utilities/advancedrename/common/highlighter.cpp
M  +1    -1    utilities/advancedrename/common/highlighter.h
M  +1    -1    utilities/advancedrename/common/modifier.cpp
M  +1    -1    utilities/advancedrename/common/modifier.h
M  +1    -1    utilities/advancedrename/common/option.cpp
M  +1    -1    utilities/advancedrename/common/option.h
M  +1    -1    utilities/advancedrename/common/parser.cpp
M  +1    -1    utilities/advancedrename/common/parser.h
M  +1    -1    utilities/advancedrename/common/parseresults.cpp
M  +1    -1    utilities/advancedrename/common/parseresults.h
M  +1    -1    utilities/advancedrename/common/parsesettings.h
M  +1    -1    utilities/advancedrename/common/rule.cpp
M  +1    -1    utilities/advancedrename/common/rule.h
M  +1    -1    utilities/advancedrename/common/ruledialog.cpp
M  +1    -1    utilities/advancedrename/common/ruledialog.h
M  +1    -1    utilities/advancedrename/common/token.cpp
M  +1    -1    utilities/advancedrename/common/token.h
M  +1    -1    utilities/advancedrename/common/tooltipcreator.cpp
M  +1    -1    utilities/advancedrename/common/tooltipcreator.h
M  +1    -1    utilities/advancedrename/common/tooltipdialog.cpp
M  +1    -1    utilities/advancedrename/common/tooltipdialog.h
M  +1    -1    utilities/advancedrename/parser/defaultrenameparser.cpp
M  +1    -1    utilities/advancedrename/parser/defaultrenameparser.h
M  +1    -1    utilities/advancedrename/parser/importrenameparser.cpp
M  +1    -1    utilities/advancedrename/parser/importrenameparser.h
M  +1    -1    utilities/advancedrename/parser/modifiers/casemodifier.cpp
M  +1    -1    utilities/advancedrename/parser/modifiers/casemodifier.h
M  +1    -1
utilities/advancedrename/parser/modifiers/defaultvaluemodifier.cpp
M  +1    -1
utilities/advancedrename/parser/modifiers/defaultvaluemodifier.h
M  +1    -1    utilities/advancedrename/parser/modifiers/rangemodifier.cpp
M  +1    -1    utilities/advancedrename/parser/modifiers/rangemodifier.h
M  +1    -1
utilities/advancedrename/parser/modifiers/removedoublesmodifier.cpp
M  +1    -1
utilities/advancedrename/parser/modifiers/removedoublesmodifier.h
M  +1    -1
utilities/advancedrename/parser/modifiers/replacemodifier.cpp
M  +1    -1    utilities/advancedrename/parser/modifiers/replacemodifier.h
M  +1    -1
utilities/advancedrename/parser/modifiers/trimmedmodifier.cpp
M  +1    -1    utilities/advancedrename/parser/modifiers/trimmedmodifier.h
M  +1    -1    utilities/advancedrename/parser/modifiers/uniquemodifier.cpp
M  +1    -1    utilities/advancedrename/parser/modifiers/uniquemodifier.h
M  +1    -1    utilities/advancedrename/parser/options/cameranameoption.cpp
M  +1    -1    utilities/advancedrename/parser/options/cameranameoption.h
M  +1    -1
utilities/advancedrename/parser/options/database/databaseoption.cpp
M  +1    -1
utilities/advancedrename/parser/options/database/databaseoption.h
M  +1    -1
utilities/advancedrename/parser/options/database/dbheaderlistitem.cpp
M  +1    -1
utilities/advancedrename/parser/options/database/dbheaderlistitem.h
M  +1    -1
utilities/advancedrename/parser/options/database/dbkeyscollection.cpp
M  +1    -1
utilities/advancedrename/parser/options/database/dbkeyscollection.h
M  +1    -1
utilities/advancedrename/parser/options/database/dbkeyselector.cpp
M  +1    -1
utilities/advancedrename/parser/options/database/dbkeyselector.h
M  +1    -1
utilities/advancedrename/parser/options/database/keys/commonkeys.cpp
M  +1    -1
utilities/advancedrename/parser/options/database/keys/commonkeys.h
M  +1    -1
utilities/advancedrename/parser/options/database/keys/metadatakeys.cpp
M  +1    -1
utilities/advancedrename/parser/options/database/keys/metadatakeys.h
M  +1    -1
utilities/advancedrename/parser/options/database/keys/positionkeys.cpp
M  +1    -1
utilities/advancedrename/parser/options/database/keys/positionkeys.h
M  +1    -1    utilities/advancedrename/parser/options/dateoption.cpp
M  +1    -1    utilities/advancedrename/parser/options/dateoption.h
M  +1    -1
utilities/advancedrename/parser/options/directorynameoption.cpp
M  +1    -1
utilities/advancedrename/parser/options/directorynameoption.h
M  +1    -1
utilities/advancedrename/parser/options/filepropertiesoption.cpp
M  +1    -1
utilities/advancedrename/parser/options/filepropertiesoption.h
M  +1    -1    utilities/advancedrename/parser/options/metadataoption.cpp
M  +1    -1    utilities/advancedrename/parser/options/metadataoption.h
M  +1    -1
utilities/advancedrename/parser/options/sequencenumberoption.cpp
M  +1    -1
utilities/advancedrename/parser/options/sequencenumberoption.h
M  +1    -1    utilities/cameragui/controller/camerahistoryupdater.cpp
M  +1    -1    utilities/cameragui/controller/camerahistoryupdater.h
M  +1    -1    utilities/cameragui/main/cameraui.cpp
M  +1    -1    utilities/cameragui/views/cameranamehelper.cpp
M  +1    -1    utilities/cameragui/views/cameranamehelper.h
M  +1    -1    utilities/cameragui/widgets/renamecustomizer.cpp
M  +1    -1    utilities/cameragui/widgets/renamecustomizer.h
M  +1    -1    utilities/fuzzysearch/findduplicatesview.cpp
M  +1    -1    utilities/fuzzysearch/findduplicatesview.h
M  +1    -1    utilities/fuzzysearch/fuzzysearchview.cpp
M  +1    -1    utilities/imageeditor/editor/editortoolsettings.cpp
M  +1    -1    utilities/imageeditor/editor/editortoolsettings.h
M  +1    -1    utilities/imageeditor/editor/editorwindow.cpp
M  +1    -1    utilities/imageeditor/editor/editorwindow.h
M  +1    -1    utilities/importui/backend/camerahistoryupdater.cpp
M  +1    -1    utilities/importui/backend/camerahistoryupdater.h
M  +1    -1    utilities/importui/main/cameraui.cpp
M  +1    -1    utilities/importui/views/cameranamehelper.cpp
M  +1    -1    utilities/importui/views/cameranamehelper.h
M  +1    -1    utilities/importui/widgets/renamecustomizer.cpp
M  +1    -1    utilities/importui/widgets/renamecustomizer.h
M  +1    -1    utilities/maintenance/duplicatesfinder.cpp
M  +1    -1    utilities/maintenance/facedetector.cpp
M  +1    -1    utilities/maintenance/fingerprintsgenerator.cpp
M  +1    -1    utilities/maintenance/maintenancemngr.cpp
M  +1    -1    utilities/maintenance/maintenancetool.cpp
M  +1    -1    utilities/maintenance/maintenancetool.h
M  +1    -1    utilities/maintenance/metadatasynchronizer.cpp
M  +1    -1    utilities/maintenance/newitemsfinder.cpp
M  +1    -1    utilities/maintenance/thumbsgenerator.cpp
M  +1    -1    utilities/scripts/cleanup_digikamdb/cleanup_digikamdb
M  +1    -1    utilities/scripts/cleanup_digikamdb/cleanup_digikamdb.1
M  +2    -2
utilities/scripts/cleanup_digikamdb/cleanup_digikamdb.docbook
M  +1    -1    utilities/searchwindow/searchfolderview.cpp
M  +1    -1    utilities/setup/setupcollectionview.cpp

http://commits.kde.org/digikam/9ac27d2445368c215926ce40e94fa14d1d0f4956

diff --git a/AUTHORS b/AUTHORS
index f57b4e4..80ca6e9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,7 +3,7 @@ MAIN DEVELOPERS :

   Gilles Caulier <caulier dot gilles at gmail dot com>
: Coordinator, lead developer, French translations.
   Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
: Lead developer.
-Andi Clemens <andi dot clemens at googlemail dot com>
: Lead developer.
+Andi Clemens <andi dot clemens at gmail dot com>                     :
Lead developer.
   Franscesco Riosa <francesco at pnpitalia dot it>
: Lead developer.
   Michael G. Hansen <mike at mghansen dot de>
: Lead developer.

diff --git a/digikam.lsm.cmake b/digikam.lsm.cmake
index a4ab99a..f1528d4 100644
--- a/digikam.lsm.cmake
+++ b/digikam.lsm.cmake
@@ -6,7 +6,7 @@ Description:    Manage your photographs like a
professional with the power of op
   Keywords:       Digital Still Camera, KDE, Graphics, Image Viewer, Image
Editor, Light Table, Time Line, Digital Camera Interface, Gphoto, Digital
Photo Management, Search, Rating, Tags, Comments, Exif, Iptc, Makenotes,
Xmp, Geolocation, Batch process, Raw workflow
   Author:         Gilles Caulier <caulier dot gilles at gmail dot com>,
                   Marcel Wiesweg <marcel dot wiesweg at gmx dot de>,
-                Andi Clemens <andi dot clemens at googlemail dot com>,
+                Andi Clemens <andi dot clemens at gmail dot com>,
                   Arnd Baecker <arnd dot baecker at web dot de>,
                   Francisco J. Cruz <fj dot cruz at supercable dot es>,
                   Joern Ahrens <joern dot ahrens at kdemail dot net>,
diff --git a/digikam/album/albumselectcombobox.cpp
b/digikam/album/albumselectcombobox.cpp
index e0c3765..bef76f4 100644
--- a/digikam/album/albumselectcombobox.cpp
+++ b/digikam/album/albumselectcombobox.cpp
@@ -7,7 +7,7 @@
    * Description : A combo box for selecting albums
    *
    * Copyright (C) 2008-2011 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
- * Copyright (C) 2010-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2010-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/digikam/album/albumselectcombobox.h
b/digikam/album/albumselectcombobox.h
index 8129ca8..5cd2b80 100644
--- a/digikam/album/albumselectcombobox.h
+++ b/digikam/album/albumselectcombobox.h
@@ -7,7 +7,7 @@
    * Description : A combo box for selecting albums
    *
    * Copyright (C) 2008-2011 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
- * Copyright (C) 2010-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2010-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/digikam/album/albumselectiontreeview.cpp
b/digikam/album/albumselectiontreeview.cpp
index 7c12d00..4e0237f 100644
--- a/digikam/album/albumselectiontreeview.cpp
+++ b/digikam/album/albumselectiontreeview.cpp
@@ -8,7 +8,7 @@
    *
    * Copyright (C) 2005-2006 by Joern Ahrens <joern dot ahrens at kdemail
dot net>
    * Copyright (C) 2006-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2009-2011 by Johannes Wienke <languitar at semipol dot
de>
    *
    * This program is free software; you can redistribute it
diff --git a/digikam/album/albumselectiontreeview.h
b/digikam/album/albumselectiontreeview.h
index 5f08232..2e20133 100644
--- a/digikam/album/albumselectiontreeview.h
+++ b/digikam/album/albumselectiontreeview.h
@@ -8,7 +8,7 @@
    *
    * Copyright (C) 2005-2006 by Joern Ahrens <joern dot ahrens at kdemail
dot net>
    * Copyright (C) 2006-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2009-2011 by Johannes Wienke <languitar at semipol dot
de>
    *
    * This program is free software; you can redistribute it
diff --git a/digikam/album/albumtreeview.cpp
b/digikam/album/albumtreeview.cpp
index 4b9dabb..b0239ed 100644
--- a/digikam/album/albumtreeview.cpp
+++ b/digikam/album/albumtreeview.cpp
@@ -7,7 +7,7 @@
    * Description : Tree View for album models
    *
    * Copyright (C) 2009-2011 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
- * Copyright (C) 2010-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2010-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/digikam/album/albumtreeview.h b/digikam/album/albumtreeview.h
index 41e8783..8fa7dac 100644
--- a/digikam/album/albumtreeview.h
+++ b/digikam/album/albumtreeview.h
@@ -7,7 +7,7 @@
    * Description : Tree View for album models
    *
    * Copyright (C) 2009-2010 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
- * Copyright (C) 2010-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2010-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/digikam/date/monthwidget.cpp b/digikam/date/monthwidget.cpp
index e6ceade..e0c6b00 100644
--- a/digikam/date/monthwidget.cpp
+++ b/digikam/date/monthwidget.cpp
@@ -8,7 +8,7 @@
    *
    * Copyright (C) 2005 by Renchi Raju <renchi dot raju at gmail dot com>
    * Copyright (C) 2006-2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2011 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/digikam/date/timelinewidget.cpp
b/digikam/date/timelinewidget.cpp
index 459850c..7b5c544 100644
--- a/digikam/date/timelinewidget.cpp
+++ b/digikam/date/timelinewidget.cpp
@@ -7,7 +7,7 @@
    * Description : a widget to display date and time statistics of pictures
    *
    * Copyright (C) 2007-2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/digikam/date/timelinewidget.h b/digikam/date/timelinewidget.h
index 48fbb80..991db32 100644
--- a/digikam/date/timelinewidget.h
+++ b/digikam/date/timelinewidget.h
@@ -7,7 +7,7 @@
    * Description : a widget to display date and time statistics of pictures
    *
    * Copyright (C) 2007-2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/digikam/dragdrop/albumdragdrop.cpp
b/digikam/dragdrop/albumdragdrop.cpp
index e8dc7b5..1fcdd7d 100644
--- a/digikam/dragdrop/albumdragdrop.cpp
+++ b/digikam/dragdrop/albumdragdrop.cpp
@@ -9,7 +9,7 @@
    * Copyright (C) 2005-2006 by Joern Ahrens <joern.ahrens at kdemail.net>
    * Copyright (C) 2006-2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
    * Copyright (C) 2009-2011 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
- * Copyright (C) 2009 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2009 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/digikam/dragdrop/imagedragdrop.cpp
b/digikam/dragdrop/imagedragdrop.cpp
index fa1faa9..b563b25 100644
--- a/digikam/dragdrop/imagedragdrop.cpp
+++ b/digikam/dragdrop/imagedragdrop.cpp
@@ -9,7 +9,7 @@
    * Copyright (C) 2002-2005 by Renchi Raju <renchi dot raju at gmail dot
com>
    * Copyright (C) 2002-2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
    * Copyright (C) 2006-2011 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
- * Copyright (C) 2009 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2009 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/digikam/filters/filtersidebarwidget.cpp
b/digikam/filters/filtersidebarwidget.cpp
index 9d28691..7e7e4ea 100644
--- a/digikam/filters/filtersidebarwidget.cpp
+++ b/digikam/filters/filtersidebarwidget.cpp
@@ -7,7 +7,7 @@
    * Description : filters view for the right sidebar
    *
    * Copyright (C) 2009-2010 by Johannes Wienke <languitar at semipol dot
de>
- * Copyright (C) 2010-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2010-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C)      2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
    * Copyright (C) 2011 by Michael G. Hansen <mike at mghansen dot de>
    *
diff --git a/digikam/filters/filtersidebarwidget.h
b/digikam/filters/filtersidebarwidget.h
index 6fdb3f9..3de4f37 100644
--- a/digikam/filters/filtersidebarwidget.h
+++ b/digikam/filters/filtersidebarwidget.h
@@ -7,7 +7,7 @@
    * Description : filters view for the right sidebar
    *
    * Copyright (C) 2009-2010 by Johannes Wienke <languitar at semipol dot
de>
- * Copyright (C) 2010-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2010-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C)      2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
    * Copyright (C) 2011 by Michael G. Hansen <mike at mghansen dot de>
    *
diff --git a/digikam/filters/tagfilterview.cpp
b/digikam/filters/tagfilterview.cpp
index 1417cf8..167601d 100644
--- a/digikam/filters/tagfilterview.cpp
+++ b/digikam/filters/tagfilterview.cpp
@@ -7,7 +7,7 @@
    * Description : tag filter view for the right sidebar
    *
    * Copyright (C) 2009-2010 by Johannes Wienke <languitar at semipol dot
de>
- * Copyright (C) 2010-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2010-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C)      2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
    *
    * This program is free software; you can redistribute it
diff --git a/digikam/filters/tagfilterview.h
b/digikam/filters/tagfilterview.h
index 44d4509..266d96c 100644
--- a/digikam/filters/tagfilterview.h
+++ b/digikam/filters/tagfilterview.h
@@ -7,7 +7,7 @@
    * Description : filter view for the right sidebar
    *
    * Copyright (C) 2009-2010 by Johannes Wienke <languitar at semipol dot
de>
- * Copyright (C) 2010-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2010-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C)      2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
    *
    * This program is free software; you can redistribute it
diff --git a/digikam/items/digikamimagedelegate.cpp
b/digikam/items/digikamimagedelegate.cpp
index 4facfd2..3e65a85 100644
--- a/digikam/items/digikamimagedelegate.cpp
+++ b/digikam/items/digikamimagedelegate.cpp
@@ -8,7 +8,7 @@
    *
    * Copyright (C) 2002-2005 by Renchi Raju <renchi dot raju at gmail dot
com>
    * Copyright (C) 2002-2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2006-2011 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
    *
    * This program is free software; you can redistribute it
diff --git a/digikam/items/digikamimagedelegatepriv.h
b/digikam/items/digikamimagedelegatepriv.h
index a89992c..ad54e4b 100644
--- a/digikam/items/digikamimagedelegatepriv.h
+++ b/digikam/items/digikamimagedelegatepriv.h
@@ -8,7 +8,7 @@
    *
    * Copyright (C) 2002-2005 by Renchi Raju <renchi dot raju at gmail dot
com>
    * Copyright (C) 2002-2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2006-2011 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
    *
    * This program is free software; you can redistribute it
diff --git a/digikam/items/digikamimagefacedelegate.cpp
b/digikam/items/digikamimagefacedelegate.cpp
index e0ff38c..35193f2 100644
--- a/digikam/items/digikamimagefacedelegate.cpp
+++ b/digikam/items/digikamimagefacedelegate.cpp
@@ -8,7 +8,7 @@
    *
    * Copyright (C) 2002-2005 by Renchi Raju <renchi dot raju at gmail dot
com>
    * Copyright (C) 2002-2010 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2006-2010 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
    *
    * This program is free software; you can redistribute it
diff --git a/digikam/items/digikamimageview.cpp
b/digikam/items/digikamimageview.cpp
index 5987a22..bb6ba80 100644
--- a/digikam/items/digikamimageview.cpp
+++ b/digikam/items/digikamimageview.cpp
@@ -8,7 +8,7 @@
    *
    * Copyright (C) 2009-2011 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
    * Copyright (C) 2009-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2011 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/digikam/items/imagecategorydrawer.cpp
b/digikam/items/imagecategorydrawer.cpp
index 5b19ff9..661ae49 100644
--- a/digikam/items/imagecategorydrawer.cpp
+++ b/digikam/items/imagecategorydrawer.cpp
@@ -7,7 +7,7 @@
    * Description : Qt item view for images - category drawer
    *
    * Copyright (C) 2009-2011 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2011 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/digikam/items/imagedelegate.cpp
b/digikam/items/imagedelegate.cpp
index 1d2057d..6dfad4f 100644
--- a/digikam/items/imagedelegate.cpp
+++ b/digikam/items/imagedelegate.cpp
@@ -7,7 +7,7 @@
    * Description : Qt item view for images - the delegate
    *
    * Copyright (C) 2002-2005 by Renchi Raju <renchi dot raju at gmail dot
com>
- * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2002-2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
    * Copyright (C) 2006-2011 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
    *
diff --git a/digikam/items/imagedelegatepriv.h
b/digikam/items/imagedelegatepriv.h
index 6e8ffeb..0ffa233 100644
--- a/digikam/items/imagedelegatepriv.h
+++ b/digikam/items/imagedelegatepriv.h
@@ -8,7 +8,7 @@
    *
    * Copyright (C) 2002-2005 by Renchi Raju <renchi dot raju at gmail dot
com>
    * Copyright (C) 2002-2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2006-2011 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
    *
    * This program is free software; you can redistribute it
diff --git a/digikam/items/imagethumbnaildelegate.cpp
b/digikam/items/imagethumbnaildelegate.cpp
index b5c816f..d34b21e 100644
--- a/digikam/items/imagethumbnaildelegate.cpp
+++ b/digikam/items/imagethumbnaildelegate.cpp
@@ -9,7 +9,7 @@
    * Copyright (C) 2002-2005 by Renchi Raju <renchi dot raju at gmail dot
com>
    * Copyright (C) 2010-2011 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
    * Copyright (C) 2002-2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/digikam/items/imageviewutilities.cpp
b/digikam/items/imageviewutilities.cpp
index 73c9168..46c1ea0 100644
--- a/digikam/items/imageviewutilities.cpp
+++ b/digikam/items/imageviewutilities.cpp
@@ -9,7 +9,7 @@
    * Copyright (C) 2002-2005 by Renchi Raju <renchi dot raju at gmail dot
com>
    * Copyright (C) 2002-2010 by Gilles Caulier <caulier dot gilles at gmail
dot com>
    * Copyright (C) 2006-2010 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
- * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/digikam/main/digikamapp.cpp b/digikam/main/digikamapp.cpp
index eaedd16..b8d04cd 100644
--- a/digikam/main/digikamapp.cpp
+++ b/digikam/main/digikamapp.cpp
@@ -9,7 +9,7 @@
    * Copyright (C) 2002-2005 by Renchi Raju <renchi dot raju at gmail dot
com>
    * Copyright (C)      2006 by Tom Albers <tomalbers at kde dot nl>
    * Copyright (C) 2002-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/digikam/main/digikamapp.h b/digikam/main/digikamapp.h
index 36b35ba..f5fac47 100644
--- a/digikam/main/digikamapp.h
+++ b/digikam/main/digikamapp.h
@@ -9,7 +9,7 @@
    * Copyright (C) 2002-2005 by Renchi Raju <renchi dot raju at gmail dot
com>
    * Copyright (C)      2006 by Tom Albers <tomalbers at kde dot nl>
    * Copyright (C) 2002-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/digikam/models/digikammodelcollection.cpp
b/digikam/models/digikammodelcollection.cpp
index 1a81e6d..b43b7bc 100644
--- a/digikam/models/digikammodelcollection.cpp
+++ b/digikam/models/digikammodelcollection.cpp
@@ -7,7 +7,7 @@
    * Description : collection of basic models used for views in digikam
    *
    * Copyright (C) 2009-2010 by Johannes Wienke <languitar at semipol dot
de>
- * Copyright (C) 2010 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2010 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/digikam/models/digikammodelcollection.h
b/digikam/models/digikammodelcollection.h
index d9081b3..00deeeb 100644
--- a/digikam/models/digikammodelcollection.h
+++ b/digikam/models/digikammodelcollection.h
@@ -7,7 +7,7 @@
    * Description : collection of basic models used for views in digikam
    *
    * Copyright (C) 2009-2010 by Johannes Wienke <languitar at semipol dot
de>
- * Copyright (C) 2010 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2010 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/digikam/tags/tagcheckview.cpp b/digikam/tags/tagcheckview.cpp
index 0a54eb5..f381c39 100644
--- a/digikam/tags/tagcheckview.cpp
+++ b/digikam/tags/tagcheckview.cpp
@@ -8,7 +8,7 @@
    *
    * Copyright (C) 2005 by Renchi Raju <renchi dot raju at gmail dot com>
    * Copyright (C) 2006-2010 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2009-2010 by Johannes Wienke <languitar at semipol dot
de>
    *
    * This program is free software; you can redistribute it
diff --git a/digikam/tags/tagcheckview.h b/digikam/tags/tagcheckview.h
index cf70c75..a2457c8 100644
--- a/digikam/tags/tagcheckview.h
+++ b/digikam/tags/tagcheckview.h
@@ -8,7 +8,7 @@
    *
    * Copyright (C) 2005 by Renchi Raju <renchi dot raju at gmail dot com>
    * Copyright (C) 2006-2010 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2009-2010 by Johannes Wienke <languitar at semipol dot
de>
    *
    * This program is free software; you can redistribute it
diff --git a/digikam/tags/tagfolderview.cpp
b/digikam/tags/tagfolderview.cpp
index 303ddea..3ea1546 100644
--- a/digikam/tags/tagfolderview.cpp
+++ b/digikam/tags/tagfolderview.cpp
@@ -8,7 +8,7 @@
    *
    * Copyright (C) 2005-2006 by Joern Ahrens <joern.ahrens at kdemail.net>
    * Copyright (C) 2006-2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2009-2011 by Johannes Wienke <languitar at semipol dot
de>
    *
    * This program is free software; you can redistribute it
diff --git a/digikam/utils/contextmenuhelper.cpp
b/digikam/utils/contextmenuhelper.cpp
index d64552d..a00e8e6 100644
--- a/digikam/utils/contextmenuhelper.cpp
+++ b/digikam/utils/contextmenuhelper.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-02-15
    * Description : contextmenu helper class
    *
- * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2010-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
    *
    * This program is free software; you can redistribute it
diff --git a/digikam/utils/contextmenuhelper.h
b/digikam/utils/contextmenuhelper.h
index 3ef5b0a..8a167dd 100644
--- a/digikam/utils/contextmenuhelper.h
+++ b/digikam/utils/contextmenuhelper.h
@@ -6,7 +6,7 @@
    * Date        : 2009-02-15
    * Description : contextmenu helper class
    *
- * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2010-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
    *
    * This program is free software; you can redistribute it
diff --git a/digikam/utils/editablesearchtreeview.cpp
b/digikam/utils/editablesearchtreeview.cpp
index 83264e0..636545b 100644
--- a/digikam/utils/editablesearchtreeview.cpp
+++ b/digikam/utils/editablesearchtreeview.cpp
@@ -8,7 +8,7 @@
    *
    * Copyright (C) 2008-2010 by Gilles Caulier <caulier dot gilles at gmail
dot com>
    * Copyright (C) 2009-2010 by Johannes Wienke <languitar at semipol dot
de>
- * Copyright (C) 2009 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2009 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/digikam/utils/globals.h b/digikam/utils/globals.h
index 6312eed..eafc9b5 100644
--- a/digikam/utils/globals.h
+++ b/digikam/utils/globals.h
@@ -6,7 +6,7 @@
    * Date        : 2009-09-08
    * Description : global macros, variables and flags
    *
- * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2009-2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
    *
    * This program is free software; you can redistribute it
diff --git a/digikam/utils/uifilevalidator.cpp
b/digikam/utils/uifilevalidator.cpp
index 63ef748..5be8d21 100644
--- a/digikam/utils/uifilevalidator.cpp
+++ b/digikam/utils/uifilevalidator.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-11-02
    * Description : validate / fix ui files
    *
- * Copyright (C) 2009 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2009 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/digikam/utils/uifilevalidator.h
b/digikam/utils/uifilevalidator.h
index 05b8dd7..3006326 100644
--- a/digikam/utils/uifilevalidator.h
+++ b/digikam/utils/uifilevalidator.h
@@ -6,7 +6,7 @@
    * Date        : 2009-11-02
    * Description : validate / fix ui files
    *
- * Copyright (C) 2009 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2009 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/digikam/views/digikamview.cpp b/digikam/views/digikamview.cpp
index 7b033ba..899ca32 100644
--- a/digikam/views/digikamview.cpp
+++ b/digikam/views/digikamview.cpp
@@ -9,7 +9,7 @@
    * Copyright (C) 2002-2005 by Renchi Raju <renchi dot raju at gmail dot
com>
    * Copyright (C) 2002-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
    * Copyright (C) 2009-2011 by Johannes Wienke <languitar at semipol dot
de>
- * Copyright (C) 2010-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2010-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2011      by Michael G. Hansen <mike at mghansen dot de>
    *
    * This program is free software; you can redistribute it
diff --git a/digikam/views/digikamview.h b/digikam/views/digikamview.h
index 2a51b51..418dc01 100644
--- a/digikam/views/digikamview.h
+++ b/digikam/views/digikamview.h
@@ -9,7 +9,7 @@
    * Copyright (C) 2002-2005 by Renchi Raju <renchi dot raju at gmail dot
com>
    * Copyright (C) 2002-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
    * Copyright (C) 2009-2011 by Johannes Wienke <languitar at semipol dot
de>
- * Copyright (C) 2010-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2010-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/digikam/views/imagepreviewview.cpp
b/digikam/views/imagepreviewview.cpp
index 60842ee..263fab7 100644
--- a/digikam/views/imagepreviewview.cpp
+++ b/digikam/views/imagepreviewview.cpp
@@ -7,7 +7,7 @@
    * Description : a embedded view to show the image preview widget.
    *
    * Copyright (C) 2006-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2010-2011 by Aditya Bhatt <adityabhatt1991 at gmail dot
com>
    *
    * This program is free software; you can redistribute it
diff --git a/digikam/views/imagepreviewview.h
b/digikam/views/imagepreviewview.h
index f9c4b28..c04202d 100644
--- a/digikam/views/imagepreviewview.h
+++ b/digikam/views/imagepreviewview.h
@@ -7,7 +7,7 @@
    * Description : a embedded view to show the image preview widget.
    *
    * Copyright (C) 2006-2011 by Gilles Caulier  <caulier dot gilles at
gmail dot com>
- * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2010-2011 by Aditya Bhatt <adityabhatt1991 at gmail dot
com>
    *
    * This program is free software; you can redistribute it
diff --git a/digikam/views/leftsidebarwidgets.cpp
b/digikam/views/leftsidebarwidgets.cpp
index f798cb5..a604f2b 100644
--- a/digikam/views/leftsidebarwidgets.cpp
+++ b/digikam/views/leftsidebarwidgets.cpp
@@ -8,7 +8,7 @@
    *
    * Copyright (C) 2009-2010 by Johannes Wienke <languitar at semipol dot
de>
    * Copyright (C) 2010-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2012 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2012 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/digikam/views/welcomepageview.cpp
b/digikam/views/welcomepageview.cpp
index 6ec8668..4359da5 100644
--- a/digikam/views/welcomepageview.cpp
+++ b/digikam/views/welcomepageview.cpp
@@ -8,7 +8,7 @@
    *               on root album.
    *
    * Copyright (C) 2006-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/digikam/views/welcomepageview.h
b/digikam/views/welcomepageview.h
index 90523b5..9ae1614 100644
--- a/digikam/views/welcomepageview.h
+++ b/digikam/views/welcomepageview.h
@@ -8,7 +8,7 @@
    *               on root album.
    *
    * Copyright (C) 2006-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/imageplugins/enhance/blurtool.cpp
b/imageplugins/enhance/blurtool.cpp
index 522f8d2..2fe717c 100644
--- a/imageplugins/enhance/blurtool.cpp
+++ b/imageplugins/enhance/blurtool.cpp
@@ -7,7 +7,7 @@
    * Description : a tool to blur an image
    *
    * Copyright (C) 2004-2010 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009      by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009      by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/imageplugins/enhance/blurtool.h
b/imageplugins/enhance/blurtool.h
index d4f282c..b33cc5b 100644
--- a/imageplugins/enhance/blurtool.h
+++ b/imageplugins/enhance/blurtool.h
@@ -7,7 +7,7 @@
    * Description : a tool to blur an image
    *
    * Copyright (C) 2004-2010 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009      by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009      by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/imageplugins/transform/freerotationtool.cpp
b/imageplugins/transform/freerotationtool.cpp
index 87b6c33..cd10ba2 100644
--- a/imageplugins/transform/freerotationtool.cpp
+++ b/imageplugins/transform/freerotationtool.cpp
@@ -8,7 +8,7 @@
    *               free rotation.
    *
    * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/imageplugins/transform/freerotationtool.h
b/imageplugins/transform/freerotationtool.h
index dfb5974..6b00db9 100644
--- a/imageplugins/transform/freerotationtool.h
+++ b/imageplugins/transform/freerotationtool.h
@@ -8,7 +8,7 @@
    *               free rotation.
    *
    * Copyright (C) 2004-2010 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/libs/database/albumdb.cpp b/libs/database/albumdb.cpp
index 9d453de..2d04b15 100644
--- a/libs/database/albumdb.cpp
+++ b/libs/database/albumdb.cpp
@@ -9,7 +9,7 @@
    * Copyright (C) 2004-2005 by Renchi Raju <renchi dot raju at gmail dot
com>
    * Copyright (C) 2006-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
    * Copyright (C) 2006-2012 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
- * Copyright (C) 2012      by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2012      by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/libs/database/albumdb.h b/libs/database/albumdb.h
index d9d4038..6a90fcd 100644
--- a/libs/database/albumdb.h
+++ b/libs/database/albumdb.h
@@ -9,7 +9,7 @@
    * Copyright (C) 2004-2005 by Renchi Raju <renchi dot raju at gmail dot
com>
    * Copyright (C) 2006-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
    * Copyright (C) 2006-2012 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
- * Copyright (C) 2012      by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2012      by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/libs/database/haar/haariface.cpp
b/libs/database/haar/haariface.cpp
index ecaaabf..7437217 100644
--- a/libs/database/haar/haariface.cpp
+++ b/libs/database/haar/haariface.cpp
@@ -9,7 +9,7 @@
    * Copyright (C) 2003      by Ricardo Niederberger Cabral <nieder at mail
dot ru>
    * Copyright (C) 2009-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
    * Copyright (C) 2009-2012 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
- * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/libs/database/haar/haariface.h
b/libs/database/haar/haariface.h
index f894db7..a5b2302 100644
--- a/libs/database/haar/haariface.h
+++ b/libs/database/haar/haariface.h
@@ -9,7 +9,7 @@
    * Copyright (C) 2003      by Ricardo Niederberger Cabral <nieder at mail
dot ru>
    * Copyright (C) 2009-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
    * Copyright (C) 2009-2012 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
- * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/libs/dialogs/daboutdata.cpp b/libs/dialogs/daboutdata.cpp
index eb1c0cd..cfa734a 100644
--- a/libs/dialogs/daboutdata.cpp
+++ b/libs/dialogs/daboutdata.cpp
@@ -125,7 +125,7 @@ void DAboutData::authorsRegistration(KAboutData&
aboutData)

       aboutData.addAuthor ( ki18n("Andi Clemens"),
                             ki18n("Developer"),
-                          "andi dot clemens at googlemail dot com",
+                          "andi dot clemens at gmail dot com",
                             "http://www.digikam.org/?q=blog/135");

       aboutData.addAuthor ( ki18n("Matthias Welwarsky"),
diff --git a/libs/dialogs/deletedialog.cpp b/libs/dialogs/deletedialog.cpp
index 51b6f71..5903926 100644
--- a/libs/dialogs/deletedialog.cpp
+++ b/libs/dialogs/deletedialog.cpp
@@ -8,7 +8,7 @@
    *
    * Copyright (C) 2004      by Michael Pyne <michael.pyne at kdemail.net>
    * Copyright (C) 2006      by Ian Monroe <ian at monroe.nu>
- * Copyright (C) 2009      by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009      by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2006-2011 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
    * Copyright (C) 2008-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
    *
diff --git a/libs/dialogs/deletedialog.h b/libs/dialogs/deletedialog.h
index 9cb626e..6b1e200 100644
--- a/libs/dialogs/deletedialog.h
+++ b/libs/dialogs/deletedialog.h
@@ -8,7 +8,7 @@
    *
    * Copyright (C) 2004      by Michael Pyne <michael.pyne at kdemail.net>
    * Copyright (C) 2006      by Ian Monroe <ian at monroe.nu>
- * Copyright (C) 2009      by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009      by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2006-2011 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
    * Copyright (C) 2008-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
    *
diff --git a/libs/dialogs/infodlg.cpp b/libs/dialogs/infodlg.cpp
index 9a3fab5..ccef7fa 100644
--- a/libs/dialogs/infodlg.cpp
+++ b/libs/dialogs/infodlg.cpp
@@ -7,7 +7,7 @@
    * Description : general info list dialog
    *
    * Copyright (C) 2008-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009      by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009      by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/libs/dialogs/infodlg.h b/libs/dialogs/infodlg.h
index 833d109..3cc2ed1 100644
--- a/libs/dialogs/infodlg.h
+++ b/libs/dialogs/infodlg.h
@@ -7,7 +7,7 @@
    * Description : general info list dialog
    *
    * Copyright (C) 2008-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009      by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009      by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/libs/dimg/filters/curves/curvesbox.cpp
b/libs/dimg/filters/curves/curvesbox.cpp
index 58d64bf..00b5ab2 100644
--- a/libs/dimg/filters/curves/curvesbox.cpp
+++ b/libs/dimg/filters/curves/curvesbox.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-06-14
    * Description : a curves widget with additional control elements
    *
- * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2010 by Gilles Caulier <caulier dot gilles at gmail dot
com>
    *
    * This program is free software; you can redistribute it
diff --git a/libs/dimg/filters/curves/curvesbox.h
b/libs/dimg/filters/curves/curvesbox.h
index ce3585e..04c4175 100644
--- a/libs/dimg/filters/curves/curvesbox.h
+++ b/libs/dimg/filters/curves/curvesbox.h
@@ -6,7 +6,7 @@
    * Date        : 2009-06-14
    * Description : a curves widget with additional control elements
    *
- * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2010 by Gilles Caulier <caulier dot gilles at gmail dot
com>
    *
    * This program is free software; you can redistribute it
diff --git a/libs/dimg/filters/decorate/borderfilter.cpp
b/libs/dimg/filters/decorate/borderfilter.cpp
index 2f9fcfb..cb4f805 100644
--- a/libs/dimg/filters/decorate/borderfilter.cpp
+++ b/libs/dimg/filters/decorate/borderfilter.cpp
@@ -8,7 +8,7 @@
    *
    * Copyright 2005-2010 by Gilles Caulier <caulier dot gilles at gmail dot
com>
    * Copyright 2006-2010 by Marcel Wiesweg <marcel dot wiesweg at gmx dot
de>
- * Copyright 2009-2010 by Andi Clemens <andi dot clemens at googlemail
dot com>
+ * Copyright 2009-2010 by Andi Clemens <andi dot clemens at gmail dot com>
    * Copyright 2010 by Martin Klapetek <martin dot klapetek at gmail dot
com>
    *
    * This program is free software; you can redistribute it
diff --git a/libs/dimg/filters/decorate/borderfilter.h
b/libs/dimg/filters/decorate/borderfilter.h
index 93491e2..ffff691 100644
--- a/libs/dimg/filters/decorate/borderfilter.h
+++ b/libs/dimg/filters/decorate/borderfilter.h
@@ -8,7 +8,7 @@
    *
    * Copyright 2005-2010 by Gilles Caulier <caulier dot gilles at gmail dot
com>
    * Copyright 2006-2010 by Marcel Wiesweg <marcel dot wiesweg at gmx dot
de>
- * Copyright 2009-2010 by Andi Clemens <andi dot clemens at googlemail
dot com>
+ * Copyright 2009-2010 by Andi Clemens <andi dot clemens at gmail dot com>
    * Copyright 2010 by Martin Klapetek <martin dot klapetek at gmail dot
com>
    *
    * This program is free software; you can redistribute it
diff --git a/libs/dimg/filters/fx/blurfilter.cpp
b/libs/dimg/filters/fx/blurfilter.cpp
index 17a6f4f..118fe8d 100644
--- a/libs/dimg/filters/fx/blurfilter.cpp
+++ b/libs/dimg/filters/fx/blurfilter.cpp
@@ -7,7 +7,7 @@
    * Description : A Gaussian Blur threaded image filter.
    *
    * Copyright (C) 2005-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009      by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009      by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2010      by Martin Klapetek <martin dot klapetek at
gmail dot com>
    *
    * This program is free software; you can redistribute it
diff --git a/libs/dimg/filters/fx/blurfilter.h
b/libs/dimg/filters/fx/blurfilter.h
index d3cd9bf..9c8ab75 100644
--- a/libs/dimg/filters/fx/blurfilter.h
+++ b/libs/dimg/filters/fx/blurfilter.h
@@ -7,7 +7,7 @@
    * Description : A Gaussian Blur threaded image filter.
    *
    * Copyright (C) 2005-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009      by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009      by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2010      by Martin Klapetek <martin dot klapetek at
gmail dot com>
    *
    * This program is free software; you can redistribute it
diff --git a/libs/dimg/filters/levels/histogrambox.cpp
b/libs/dimg/filters/levels/histogrambox.cpp
index b74c21f..fd4fb51 100644
--- a/libs/dimg/filters/levels/histogrambox.cpp
+++ b/libs/dimg/filters/levels/histogrambox.cpp
@@ -6,7 +6,7 @@
    * Date        : 2008-09-30
    * Description : a widget to display an image histogram and its control
widgets
    *
- * Copyright (C) 2008-2009 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2008-2009 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2011 by Gilles Caulier <caulier dot gilles at gmail dot
com>
    *
    * This program is free software; you can redistribute it
diff --git a/libs/dimg/filters/levels/histogrambox.h
b/libs/dimg/filters/levels/histogrambox.h
index b886162..75c6ec9 100644
--- a/libs/dimg/filters/levels/histogrambox.h
+++ b/libs/dimg/filters/levels/histogrambox.h
@@ -6,7 +6,7 @@
    * Date        : 2008-09-30
    * Description : a widget to display an image histogram and its control
widgets
    *
- * Copyright (C) 2008-2009 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2008-2009 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2011 by Gilles Caulier <caulier dot gilles at gmail dot
com>
    *
    * This program is free software; you can redistribute it
diff --git a/libs/dimg/filters/transform/freerotationfilter.cpp
b/libs/dimg/filters/transform/freerotationfilter.cpp
index 180dee9..b83d467 100644
--- a/libs/dimg/filters/transform/freerotationfilter.cpp
+++ b/libs/dimg/filters/transform/freerotationfilter.cpp
@@ -7,7 +7,7 @@
    * Description : Free rotation threaded image filter.
    *
    * Copyright (C) 2004-2010 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2010 by Martin Klapetek <martin dot klapetek at gmail
dot com>
    *
    * This program is free software; you can redistribute it
diff --git a/libs/dimg/filters/transform/freerotationfilter.h
b/libs/dimg/filters/transform/freerotationfilter.h
index 2050739..9128e03 100644
--- a/libs/dimg/filters/transform/freerotationfilter.h
+++ b/libs/dimg/filters/transform/freerotationfilter.h
@@ -7,7 +7,7 @@
    * Description : Free rotation threaded image filter.
    *
    * Copyright (C) 2004-2010 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2010 by Martin Klapetek <martin dot klapetek at gmail
dot com>
    *
    * This program is free software; you can redistribute it
diff --git a/libs/imageproperties/imagedescedittab.cpp
b/libs/imageproperties/imagedescedittab.cpp
index fff3f42..dcaa4bc 100644
--- a/libs/imageproperties/imagedescedittab.cpp
+++ b/libs/imageproperties/imagedescedittab.cpp
@@ -9,7 +9,7 @@
    * Copyright (C) 2003-2005 by Renchi Raju <renchi dot raju at gmail dot
com>
    * Copyright (C) 2003-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
    * Copyright (C) 2006-2011 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
- * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2009-2011 by Johannes Wienke <languitar at semipol dot
de>
    *
    * This program is free software; you can redistribute it
diff --git a/libs/models/abstractalbummodel.cpp
b/libs/models/abstractalbummodel.cpp
index 4a91f7d..8eb2e12 100644
--- a/libs/models/abstractalbummodel.cpp
+++ b/libs/models/abstractalbummodel.cpp
@@ -7,7 +7,7 @@
    * Description : Qt Model for Albums
    *
    * Copyright (C) 2008-2011 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
- * Copyright (C) 2010 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2010 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/libs/models/abstractalbummodel.h
b/libs/models/abstractalbummodel.h
index d1c0f02..a9c015b 100644
--- a/libs/models/abstractalbummodel.h
+++ b/libs/models/abstractalbummodel.h
@@ -7,7 +7,7 @@
    * Description : Qt Model for Albums
    *
    * Copyright (C) 2008-2011 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
- * Copyright (C) 2010 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2010 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/libs/models/imagefiltermodel.cpp
b/libs/models/imagefiltermodel.cpp
index d57a85f..383f209 100644
--- a/libs/models/imagefiltermodel.cpp
+++ b/libs/models/imagefiltermodel.cpp
@@ -8,7 +8,7 @@
    *
    * Copyright (C) 2009-2011 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
    * Copyright (C)      2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C)      2010 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C)      2010 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2011 by Michael G. Hansen <mike at mghansen dot de>
    *
    * This program is free software; you can redistribute it
diff --git a/libs/models/imagefiltermodel.h
b/libs/models/imagefiltermodel.h
index db94993..0f160cb 100644
--- a/libs/models/imagefiltermodel.h
+++ b/libs/models/imagefiltermodel.h
@@ -8,7 +8,7 @@
    *
    * Copyright (C) 2009-2011 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
    * Copyright (C)      2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C)      2010 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C)      2010 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2011 by Michael G. Hansen <mike at mghansen dot de>
    *
    * This program is free software; you can redistribute it
diff --git a/libs/models/imagefiltersettings.cpp
b/libs/models/imagefiltersettings.cpp
index 83cb0bd..edbd8a8 100644
--- a/libs/models/imagefiltersettings.cpp
+++ b/libs/models/imagefiltersettings.cpp
@@ -8,7 +8,7 @@
    *
    * Copyright (C) 2009-2011 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
    * Copyright (C)      2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C)      2010 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C)      2010 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2011 by Michael G. Hansen <mike at mghansen dot de>
    *
    * This program is free software; you can redistribute it
diff --git a/libs/models/imagefiltersettings.h
b/libs/models/imagefiltersettings.h
index de4ea61..f27e407 100644
--- a/libs/models/imagefiltersettings.h
+++ b/libs/models/imagefiltersettings.h
@@ -8,7 +8,7 @@
    *
    * Copyright (C) 2009-2011 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
    * Copyright (C)      2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C)      2010 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C)      2010 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2011 by Michael G. Hansen <mike at mghansen dot de>
    *
    * This program is free software; you can redistribute it
diff --git a/libs/widgets/common/buttonicondisabler.cpp
b/libs/widgets/common/buttonicondisabler.cpp
index c0367b9..b33ce27 100644
--- a/libs/widgets/common/buttonicondisabler.cpp
+++ b/libs/widgets/common/buttonicondisabler.cpp
@@ -8,7 +8,7 @@
    *               This will simulate a disabled button, that is still
clickable.
    *
    * Copyright (C) 2006-2010 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/libs/widgets/common/buttonicondisabler.h
b/libs/widgets/common/buttonicondisabler.h
index 60b1f27..c024272 100644
--- a/libs/widgets/common/buttonicondisabler.h
+++ b/libs/widgets/common/buttonicondisabler.h
@@ -8,7 +8,7 @@
    *               This will simulate a disabled button, that is still
clickable.
    *
    * Copyright (C) 2006-2010 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/libs/widgets/common/dcursortracker.cpp
b/libs/widgets/common/dcursortracker.cpp
index ddf7ddc..d6463ea 100644
--- a/libs/widgets/common/dcursortracker.cpp
+++ b/libs/widgets/common/dcursortracker.cpp
@@ -8,7 +8,7 @@
    *               Tool tip content is displayed without delay.
    *
    * Copyright (C) 2007-2010 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/libs/widgets/common/dcursortracker.h
b/libs/widgets/common/dcursortracker.h
index 6afde51..8ac02f1 100644
--- a/libs/widgets/common/dcursortracker.h
+++ b/libs/widgets/common/dcursortracker.h
@@ -8,7 +8,7 @@
    *               Tool tip content is displayed without delay.
    *
    * Copyright (C) 2007-2010 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2010 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/libs/widgets/itemview/ditemdelegate.cpp
b/libs/widgets/itemview/ditemdelegate.cpp
index db9372f..ae93d23 100644
--- a/libs/widgets/itemview/ditemdelegate.cpp
+++ b/libs/widgets/itemview/ditemdelegate.cpp
@@ -7,7 +7,7 @@
    * Description : Qt item view for images - common delegate code
    *
    * Copyright (C) 2002-2005 by Renchi Raju <renchi dot raju at gmail dot
com>
- * Copyright (C)      2009 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C)      2009 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2002-2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
    * Copyright (C) 2006-2011 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
    *
diff --git a/libs/widgets/itemview/itemviewimagedelegate.cpp
b/libs/widgets/itemview/itemviewimagedelegate.cpp
index cde23ba..2301f07 100644
--- a/libs/widgets/itemview/itemviewimagedelegate.cpp
+++ b/libs/widgets/itemview/itemviewimagedelegate.cpp
@@ -7,7 +7,7 @@
    * Description : Qt item view for images - the delegate
    *
    * Copyright (C) 2002-2005 by Renchi Raju <renchi dot raju at gmail dot
com>
- * Copyright (C) 2009      by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009      by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2006-2011 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
    * Copyright (C) 2002-2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
    *
diff --git a/libs/widgets/itemview/itemviewimagedelegatepriv.h
b/libs/widgets/itemview/itemviewimagedelegatepriv.h
index b785bb8..fa39d91 100644
--- a/libs/widgets/itemview/itemviewimagedelegatepriv.h
+++ b/libs/widgets/itemview/itemviewimagedelegatepriv.h
@@ -7,7 +7,7 @@
    * Description : Qt item view for images - the delegate
    *
    * Copyright (C) 2002-2005 by Renchi Raju <renchi dot raju at gmail dot
com>
- * Copyright (C) 2009 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2009 by Andi Clemens <andi dot clemens at gmail dot com>
    * Copyright (C) 2002-2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
    * Copyright (C) 2006-2011 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
    *
diff --git a/project/scripts/checkMocIncludes.rb
b/project/scripts/checkMocIncludes.rb
index f3d92d0..059da35 100755
--- a/project/scripts/checkMocIncludes.rb
+++ b/project/scripts/checkMocIncludes.rb
@@ -8,7 +8,7 @@
   # Date        : 2012-07-14
   # Description : a helper script for finding source code with no moc
includes
   #
-# Copyright (C) 2012 by Andi Clemens <andi dot clemens at googlemail dot
com>
+# Copyright (C) 2012 by Andi Clemens <andi dot clemens at gmail dot com>
   #
   # This program is free software; you can redistribute it
   # and/or modify it under the terms of the GNU General
diff --git a/project/scripts/cleanup_headers/cleanup_headers.py
b/project/scripts/cleanup_headers/cleanup_headers.py
index be98f6e..04ac9f5 100755
--- a/project/scripts/cleanup_headers/cleanup_headers.py
+++ b/project/scripts/cleanup_headers/cleanup_headers.py
@@ -8,7 +8,7 @@
   # Date        : 2009-10-12
   # Description : a helper script for formatting the digiKam source code
   #
-# Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at googlemail
dot com>
+# Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
   #
   # This program is free software; you can redistribute it
   # and/or modify it under the terms of the GNU General
diff --git a/project/scripts/fileformatter.py
b/project/scripts/fileformatter.py
index 68c8b3a..7e95afc 100755
--- a/project/scripts/fileformatter.py
+++ b/project/scripts/fileformatter.py
@@ -8,7 +8,7 @@
   # Date        : 2011-03-09
   # Description : a helper script for formatting the digiKam source code
   #
-# Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot
com>
+# Copyright (C) 2011 by Andi Clemens <andi dot clemens at gmail dot com>
   #
   # This program is free software; you can redistribute it
   # and/or modify it under the terms of the GNU General
diff --git a/showfoto/main/showfoto.cpp b/showfoto/main/showfoto.cpp
index e0b4c4f..a58b18f 100644
--- a/showfoto/main/showfoto.cpp
+++ b/showfoto/main/showfoto.cpp
@@ -8,7 +8,7 @@
    *
    * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
    * Copyright (C) 2006-2011 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
- * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2004-2005 by Renchi Raju <renchi dot raju at gmail dot
com>
    * Copyright (C) 2005-2006 by Tom Albers <tomalbers at kde dot nl>
    * Copyright (C) 2008 by Arnd Baecker <arnd dot baecker at web dot de>
diff --git a/showfoto/main/showfoto.h b/showfoto/main/showfoto.h
index 38a2445..88ac33a 100644
--- a/showfoto/main/showfoto.h
+++ b/showfoto/main/showfoto.h
@@ -8,7 +8,7 @@
    *
    * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
    * Copyright (C) 2006-2011 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
- * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2004-2005 by Renchi Raju <renchi dot raju at gmail dot
com>
    * Copyright (C) 2005-2006 by Tom Albers <tomalbers at kde dot nl>
    *
diff --git a/tests/advancedrenametest.cpp b/tests/advancedrenametest.cpp
index f595280..7bcc23c 100644
--- a/tests/advancedrenametest.cpp
+++ b/tests/advancedrenametest.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-06-09
    * Description : a test for the AdvancedRename utility
    *
- * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/tests/advancedrenametest.h b/tests/advancedrenametest.h
index ecd2cce..f539172 100644
--- a/tests/advancedrenametest.h
+++ b/tests/advancedrenametest.h
@@ -6,7 +6,7 @@
    * Date        : 2009-06-09
    * Description : a test for the AdvancedRename utility
    *
- * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/tests/cameranamehelpertest.cpp
b/tests/cameranamehelpertest.cpp
index 3d99211..8cd84bd 100644
--- a/tests/cameranamehelpertest.cpp
+++ b/tests/cameranamehelpertest.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-08-01
    * Description : a test for the CameraNameHelper
    *
- * Copyright (C) 2009 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2009 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/tests/cameranamehelpertest.h b/tests/cameranamehelpertest.h
index c5db309..50d7e62 100644
--- a/tests/cameranamehelpertest.h
+++ b/tests/cameranamehelpertest.h
@@ -6,7 +6,7 @@
    * Date        : 2009-08-01
    * Description : a test for the CameraNameHelper
    *
- * Copyright (C) 2009 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2009 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/tests/freerotationtest.cpp b/tests/freerotationtest.cpp
index 8683977..f160a20 100644
--- a/tests/freerotationtest.cpp
+++ b/tests/freerotationtest.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-06-09
    * Description : a test for the freerotation tool
    *
- * Copyright (C) 2009 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2009 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/tests/freerotationtest.h b/tests/freerotationtest.h
index 85124a8..3a4cc19 100644
--- a/tests/freerotationtest.h
+++ b/tests/freerotationtest.h
@@ -6,7 +6,7 @@
    * Date        : 2009-06-09
    * Description : a test for the freerotation tool
    *
- * Copyright (C) 2009 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2009 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/tests/uifilevalidatortest.cpp b/tests/uifilevalidatortest.cpp
index 92e721b..4f7da84 100644
--- a/tests/uifilevalidatortest.cpp
+++ b/tests/uifilevalidatortest.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-11-05
    * Description : a test for the UiFileValidator class
    *
- * Copyright (C) 2009 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2009 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/tests/uifilevalidatortest.h b/tests/uifilevalidatortest.h
index f790bce..91163b1 100644
--- a/tests/uifilevalidatortest.h
+++ b/tests/uifilevalidatortest.h
@@ -6,7 +6,7 @@
    * Date        : 2009-11-05
    * Description : a test for the UiFileValidator class
    *
- * Copyright (C) 2009 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2009 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/advancedrenamedialog.cpp
b/utilities/advancedrename/advancedrenamedialog.cpp
index 9319f76..9c24232 100644
--- a/utilities/advancedrename/advancedrenamedialog.cpp
+++ b/utilities/advancedrename/advancedrenamedialog.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-09-14
    * Description : a rename dialog for the AdvancedRename utility
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/advancedrenamedialog.h
b/utilities/advancedrename/advancedrenamedialog.h
index 84d668f..a90705b 100644
--- a/utilities/advancedrename/advancedrenamedialog.h
+++ b/utilities/advancedrename/advancedrenamedialog.h
@@ -6,7 +6,7 @@
    * Date        : 2009-09-14
    * Description : a rename dialog for the AdvancedRename utility
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/advancedrenameinput.cpp
b/utilities/advancedrename/advancedrenameinput.cpp
index 4b0e501..37b0824 100644
--- a/utilities/advancedrename/advancedrenameinput.cpp
+++ b/utilities/advancedrename/advancedrenameinput.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-09-03
    * Description : an input widget for the AdvancedRename utility
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/advancedrenameinput.h
b/utilities/advancedrename/advancedrenameinput.h
index be03fea..9fc5b72 100644
--- a/utilities/advancedrename/advancedrenameinput.h
+++ b/utilities/advancedrename/advancedrenameinput.h
@@ -6,7 +6,7 @@
    * Date        : 2009-09-03
    * Description : an input widget for the AdvancedRename utility
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/advancedrenamemanager.cpp
b/utilities/advancedrename/advancedrenamemanager.cpp
index 33cc547..c08cdc8 100644
--- a/utilities/advancedrename/advancedrenamemanager.cpp
+++ b/utilities/advancedrename/advancedrenamemanager.cpp
@@ -6,7 +6,7 @@
    * Date        : 2010-08-08
    * Description : a class that manages the files to be renamed
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/advancedrenamemanager.h
b/utilities/advancedrename/advancedrenamemanager.h
index 5fe16bd..0c177ad 100644
--- a/utilities/advancedrename/advancedrenamemanager.h
+++ b/utilities/advancedrename/advancedrenamemanager.h
@@ -6,7 +6,7 @@
    * Date        : 2010-08-08
    * Description : a class that manages the files to be renamed
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/advancedrenameprocessdialog.cpp
b/utilities/advancedrename/advancedrenameprocessdialog.cpp
index 4fbbc71..d10df06 100644
--- a/utilities/advancedrename/advancedrenameprocessdialog.cpp
+++ b/utilities/advancedrename/advancedrenameprocessdialog.cpp
@@ -6,7 +6,7 @@
    * Date        : 2010-11-14
    * Description : process dialog for renaming files
    *
- * Copyright (C) 2010-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2010-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/advancedrenameprocessdialog.h
b/utilities/advancedrename/advancedrenameprocessdialog.h
index 91fa59d..db0393b 100644
--- a/utilities/advancedrename/advancedrenameprocessdialog.h
+++ b/utilities/advancedrename/advancedrenameprocessdialog.h
@@ -6,7 +6,7 @@
    * Date        : 2010-11-14
    * Description : process dialog for renaming files
    *
- * Copyright (C) 2010-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2010-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/advancedrenamewidget.cpp
b/utilities/advancedrename/advancedrenamewidget.cpp
index b46ebce..c2ca6f8 100644
--- a/utilities/advancedrename/advancedrenamewidget.cpp
+++ b/utilities/advancedrename/advancedrenamewidget.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-05-22
    * Description : a control widget for the AdvancedRename utility
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/advancedrenamewidget.h
b/utilities/advancedrename/advancedrenamewidget.h
index ede7c59..67934ab 100644
--- a/utilities/advancedrename/advancedrenamewidget.h
+++ b/utilities/advancedrename/advancedrenamewidget.h
@@ -6,7 +6,7 @@
    * Date        : 2009-05-22
    * Description : a control widget for the AdvancedRename utility
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/common/dynamiclayout.cpp
b/utilities/advancedrename/common/dynamiclayout.cpp
index 786ea22..1868b2c 100644
--- a/utilities/advancedrename/common/dynamiclayout.cpp
+++ b/utilities/advancedrename/common/dynamiclayout.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-10-22
    * Description : a dynamic layout manager
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/common/dynamiclayout.h
b/utilities/advancedrename/common/dynamiclayout.h
index 797fcaa..1f3e2e9 100644
--- a/utilities/advancedrename/common/dynamiclayout.h
+++ b/utilities/advancedrename/common/dynamiclayout.h
@@ -6,7 +6,7 @@
    * Date        : 2009-10-22
    * Description : a dynamic layout manager
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/common/highlighter.cpp
b/utilities/advancedrename/common/highlighter.cpp
index 16d7bbe..a5d99b7 100644
--- a/utilities/advancedrename/common/highlighter.cpp
+++ b/utilities/advancedrename/common/highlighter.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-11-19
    * Description : syntax highlighter for AdvancedRename utility
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/common/highlighter.h
b/utilities/advancedrename/common/highlighter.h
index 332c477..e480886 100644
--- a/utilities/advancedrename/common/highlighter.h
+++ b/utilities/advancedrename/common/highlighter.h
@@ -6,7 +6,7 @@
    * Date        : 2009-11-19
    * Description : syntax highlighter for AdvancedRename utility
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/common/modifier.cpp
b/utilities/advancedrename/common/modifier.cpp
index b26f196..8496563 100644
--- a/utilities/advancedrename/common/modifier.cpp
+++ b/utilities/advancedrename/common/modifier.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-09-14
    * Description : a class to manipulate the results of an renaming options
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/common/modifier.h
b/utilities/advancedrename/common/modifier.h
index 220ab4e..f878ae8 100644
--- a/utilities/advancedrename/common/modifier.h
+++ b/utilities/advancedrename/common/modifier.h
@@ -6,7 +6,7 @@
    * Date        : 2009-09-14
    * Description : a class to manipulate the results of an renaming options
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/common/option.cpp
b/utilities/advancedrename/common/option.cpp
index ae67f91..45fc545 100644
--- a/utilities/advancedrename/common/option.cpp
+++ b/utilities/advancedrename/common/option.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-08-08
    * Description : an abstract option class
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/common/option.h
b/utilities/advancedrename/common/option.h
index 3e800ad..516db0f 100644
--- a/utilities/advancedrename/common/option.h
+++ b/utilities/advancedrename/common/option.h
@@ -6,7 +6,7 @@
    * Date        : 2009-08-08
    * Description : an abstract option class
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/common/parser.cpp
b/utilities/advancedrename/common/parser.cpp
index f4d3afd..cf4509c 100644
--- a/utilities/advancedrename/common/parser.cpp
+++ b/utilities/advancedrename/common/parser.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-08-11
    * Description : the main parser object for the AdvancedRename utility
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/common/parser.h
b/utilities/advancedrename/common/parser.h
index fdf8c41..8c632cd 100644
--- a/utilities/advancedrename/common/parser.h
+++ b/utilities/advancedrename/common/parser.h
@@ -6,7 +6,7 @@
    * Date        : 2009-08-11
    * Description : the main parser object for the AdvancedRename utility
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/common/parseresults.cpp
b/utilities/advancedrename/common/parseresults.cpp
index 02e2068..ffa5f0f 100644
--- a/utilities/advancedrename/common/parseresults.cpp
+++ b/utilities/advancedrename/common/parseresults.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-09-14
    * Description : a parse results map for token management
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/common/parseresults.h
b/utilities/advancedrename/common/parseresults.h
index 842456f..6f416b0 100644
--- a/utilities/advancedrename/common/parseresults.h
+++ b/utilities/advancedrename/common/parseresults.h
@@ -6,7 +6,7 @@
    * Date        : 2009-09-14
    * Description : a parse results map for token management
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/common/parsesettings.h
b/utilities/advancedrename/common/parsesettings.h
index 8e5b7bc..9efc57f 100644
--- a/utilities/advancedrename/common/parsesettings.h
+++ b/utilities/advancedrename/common/parsesettings.h
@@ -6,7 +6,7 @@
    * Date        : 2009-09-12
    * Description : parse settings class
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/common/rule.cpp
b/utilities/advancedrename/common/rule.cpp
index 178ebad..f063de5 100644
--- a/utilities/advancedrename/common/rule.cpp
+++ b/utilities/advancedrename/common/rule.cpp
@@ -6,7 +6,7 @@
    * Date        : 2010-05-01
    * Description : an abstract rule class
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/common/rule.h
b/utilities/advancedrename/common/rule.h
index 5d170a9..7e6eba8 100644
--- a/utilities/advancedrename/common/rule.h
+++ b/utilities/advancedrename/common/rule.h
@@ -6,7 +6,7 @@
    * Date        : 2010-05-01
    * Description : an abstract rule class
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/common/ruledialog.cpp
b/utilities/advancedrename/common/ruledialog.cpp
index 63169a9..ef11f79 100644
--- a/utilities/advancedrename/common/ruledialog.cpp
+++ b/utilities/advancedrename/common/ruledialog.cpp
@@ -7,7 +7,7 @@
    * Description : a dialog that can be used to display a configuration
    *               dialog for a rule
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/common/ruledialog.h
b/utilities/advancedrename/common/ruledialog.h
index 8e1b8f3..224b803 100644
--- a/utilities/advancedrename/common/ruledialog.h
+++ b/utilities/advancedrename/common/ruledialog.h
@@ -7,7 +7,7 @@
    * Description : a dialog that can be used to display a configuration
    *               dialog for a rule
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/common/token.cpp
b/utilities/advancedrename/common/token.cpp
index 56ae06d..2485cfc 100644
--- a/utilities/advancedrename/common/token.cpp
+++ b/utilities/advancedrename/common/token.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-08-08
    * Description : a token class
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/common/token.h
b/utilities/advancedrename/common/token.h
index fddd26e..c51b5e0 100644
--- a/utilities/advancedrename/common/token.h
+++ b/utilities/advancedrename/common/token.h
@@ -6,7 +6,7 @@
    * Date        : 2009-08-08
    * Description : a token class
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/common/tooltipcreator.cpp
b/utilities/advancedrename/common/tooltipcreator.cpp
index 476c7ca..1d293c3 100644
--- a/utilities/advancedrename/common/tooltipcreator.cpp
+++ b/utilities/advancedrename/common/tooltipcreator.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-09-14
    * Description : a class to build the tooltip for a renameparser and its
options
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/common/tooltipcreator.h
b/utilities/advancedrename/common/tooltipcreator.h
index 27a33b8..ff1d5e2 100644
--- a/utilities/advancedrename/common/tooltipcreator.h
+++ b/utilities/advancedrename/common/tooltipcreator.h
@@ -6,7 +6,7 @@
    * Date        : 2009-09-14
    * Description : a class to build the tooltip for a renameparser and its
options
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/common/tooltipdialog.cpp
b/utilities/advancedrename/common/tooltipdialog.cpp
index e7cd543..56d98ae 100644
--- a/utilities/advancedrename/common/tooltipdialog.cpp
+++ b/utilities/advancedrename/common/tooltipdialog.cpp
@@ -6,7 +6,7 @@
    * Date        : 2010-05-28
    * Description : a dialog for showing the advancedrename tooltip
    *
- * Copyright (C) 2010-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2010-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/common/tooltipdialog.h
b/utilities/advancedrename/common/tooltipdialog.h
index cf05600..7db8c0c 100644
--- a/utilities/advancedrename/common/tooltipdialog.h
+++ b/utilities/advancedrename/common/tooltipdialog.h
@@ -6,7 +6,7 @@
    * Date        : 2010-05-28
    * Description : a dialog for showing the advancedrename tooltip
    *
- * Copyright (C) 2010-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2010-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/parser/defaultrenameparser.cpp
b/utilities/advancedrename/parser/defaultrenameparser.cpp
index 55f85c5..0166d6e 100644
--- a/utilities/advancedrename/parser/defaultrenameparser.cpp
+++ b/utilities/advancedrename/parser/defaultrenameparser.cpp
@@ -7,7 +7,7 @@
    * Description : the default parser for the AdvancedRename utility,
    *               includes all renaming options
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/parser/defaultrenameparser.h
b/utilities/advancedrename/parser/defaultrenameparser.h
index 8b6388a..f1920cd 100644
--- a/utilities/advancedrename/parser/defaultrenameparser.h
+++ b/utilities/advancedrename/parser/defaultrenameparser.h
@@ -7,7 +7,7 @@
    * Description : the default parser for the AdvancedRename utility,
    *               includes all renaming options
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/parser/importrenameparser.cpp
b/utilities/advancedrename/parser/importrenameparser.cpp
index 024b3f8..0329104 100644
--- a/utilities/advancedrename/parser/importrenameparser.cpp
+++ b/utilities/advancedrename/parser/importrenameparser.cpp
@@ -7,7 +7,7 @@
    * Description : a parser for the AdvancedRename utility used for
importing images,
    *               excluding the database options
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/parser/importrenameparser.h
b/utilities/advancedrename/parser/importrenameparser.h
index 2a8e97a..616340e 100644
--- a/utilities/advancedrename/parser/importrenameparser.h
+++ b/utilities/advancedrename/parser/importrenameparser.h
@@ -7,7 +7,7 @@
    * Description : a parser for the AdvancedRename utility used for
importing images,
    *               excluding the database options
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/parser/modifiers/casemodifier.cpp
b/utilities/advancedrename/parser/modifiers/casemodifier.cpp
index 9e4f8e6..7d4edbe 100644
--- a/utilities/advancedrename/parser/modifiers/casemodifier.cpp
+++ b/utilities/advancedrename/parser/modifiers/casemodifier.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-09-14
    * Description : modifier to change the case of a renaming option
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/parser/modifiers/casemodifier.h
b/utilities/advancedrename/parser/modifiers/casemodifier.h
index 2299767..14cf9a5 100644
--- a/utilities/advancedrename/parser/modifiers/casemodifier.h
+++ b/utilities/advancedrename/parser/modifiers/casemodifier.h
@@ -6,7 +6,7 @@
    * Date        : 2009-09-14
    * Description : modifier to change the case of a renaming option
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git
a/utilities/advancedrename/parser/modifiers/defaultvaluemodifier.cpp
b/utilities/advancedrename/parser/modifiers/defaultvaluemodifier.cpp
index 0f894cf..b17398e 100644
--- a/utilities/advancedrename/parser/modifiers/defaultvaluemodifier.cpp
+++ b/utilities/advancedrename/parser/modifiers/defaultvaluemodifier.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-11-11
    * Description : a modifier for setting a default value if option parsing
failed
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git
a/utilities/advancedrename/parser/modifiers/defaultvaluemodifier.h
b/utilities/advancedrename/parser/modifiers/defaultvaluemodifier.h
index ba31f61..2021d9f 100644
--- a/utilities/advancedrename/parser/modifiers/defaultvaluemodifier.h
+++ b/utilities/advancedrename/parser/modifiers/defaultvaluemodifier.h
@@ -6,7 +6,7 @@
    * Date        : 2009-11-11
    * Description : a modifier for setting a default value if option parsing
failed
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/parser/modifiers/rangemodifier.cpp
b/utilities/advancedrename/parser/modifiers/rangemodifier.cpp
index 316d5a8..011ae08 100644
--- a/utilities/advancedrename/parser/modifiers/rangemodifier.cpp
+++ b/utilities/advancedrename/parser/modifiers/rangemodifier.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-09-18
    * Description : a modifier for displaying only a range of a token result
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/parser/modifiers/rangemodifier.h
b/utilities/advancedrename/parser/modifiers/rangemodifier.h
index befc5a7..b5d3258 100644
--- a/utilities/advancedrename/parser/modifiers/rangemodifier.h
+++ b/utilities/advancedrename/parser/modifiers/rangemodifier.h
@@ -6,7 +6,7 @@
    * Date        : 2009-09-18
    * Description : a modifier for displaying only a range of a token result
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git
a/utilities/advancedrename/parser/modifiers/removedoublesmodifier.cpp
b/utilities/advancedrename/parser/modifiers/removedoublesmodifier.cpp
index 58fa55f..98d7406 100644
--- a/utilities/advancedrename/parser/modifiers/removedoublesmodifier.cpp
+++ b/utilities/advancedrename/parser/modifiers/removedoublesmodifier.cpp
@@ -6,7 +6,7 @@
    * Date        : 2010-08-08
    * Description : a modifier for deleting duplicate words
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git
a/utilities/advancedrename/parser/modifiers/removedoublesmodifier.h
b/utilities/advancedrename/parser/modifiers/removedoublesmodifier.h
index f5081f2..30b5cb0 100644
--- a/utilities/advancedrename/parser/modifiers/removedoublesmodifier.h
+++ b/utilities/advancedrename/parser/modifiers/removedoublesmodifier.h
@@ -6,7 +6,7 @@
    * Date        : 2010-08-08
    * Description : a modifier for deleting duplicate words
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/parser/modifiers/replacemodifier.cpp
b/utilities/advancedrename/parser/modifiers/replacemodifier.cpp
index 30e0569..db194d0 100644
--- a/utilities/advancedrename/parser/modifiers/replacemodifier.cpp
+++ b/utilities/advancedrename/parser/modifiers/replacemodifier.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-09-18
    * Description : a modifier for replacing text in a token result
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/parser/modifiers/replacemodifier.h
b/utilities/advancedrename/parser/modifiers/replacemodifier.h
index 58482d4..49ebded 100644
--- a/utilities/advancedrename/parser/modifiers/replacemodifier.h
+++ b/utilities/advancedrename/parser/modifiers/replacemodifier.h
@@ -6,7 +6,7 @@
    * Date        : 2009-09-18
    * Description : a modifier for replacing text in a token result
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/parser/modifiers/trimmedmodifier.cpp
b/utilities/advancedrename/parser/modifiers/trimmedmodifier.cpp
index c76bd84..205bafe 100644
--- a/utilities/advancedrename/parser/modifiers/trimmedmodifier.cpp
+++ b/utilities/advancedrename/parser/modifiers/trimmedmodifier.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-09-14
    * Description : trimmed token modifier
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/parser/modifiers/trimmedmodifier.h
b/utilities/advancedrename/parser/modifiers/trimmedmodifier.h
index 36a62b5..d289c66 100644
--- a/utilities/advancedrename/parser/modifiers/trimmedmodifier.h
+++ b/utilities/advancedrename/parser/modifiers/trimmedmodifier.h
@@ -6,7 +6,7 @@
    * Date        : 2009-09-14
    * Description : trimmed token modifier
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/parser/modifiers/uniquemodifier.cpp
b/utilities/advancedrename/parser/modifiers/uniquemodifier.cpp
index 5ec7a7f..ab9c14a 100644
--- a/utilities/advancedrename/parser/modifiers/uniquemodifier.cpp
+++ b/utilities/advancedrename/parser/modifiers/uniquemodifier.cpp
@@ -7,7 +7,7 @@
    * Description : A modifier for appending a suffix number to a renaming
option.
    *               This guarantees a unique string for duplicate values.
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/parser/modifiers/uniquemodifier.h
b/utilities/advancedrename/parser/modifiers/uniquemodifier.h
index 5922526..78beb6d 100644
--- a/utilities/advancedrename/parser/modifiers/uniquemodifier.h
+++ b/utilities/advancedrename/parser/modifiers/uniquemodifier.h
@@ -7,7 +7,7 @@
    * Description : A modifier for appending a suffix number to a renaming
option.
    *               This guarantees a unique string for duplicate values.
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/parser/options/cameranameoption.cpp
b/utilities/advancedrename/parser/options/cameranameoption.cpp
index 0699750..e01aa3a 100644
--- a/utilities/advancedrename/parser/options/cameranameoption.cpp
+++ b/utilities/advancedrename/parser/options/cameranameoption.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-08-08
    * Description : an option to provide camera information to the parser
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/parser/options/cameranameoption.h
b/utilities/advancedrename/parser/options/cameranameoption.h
index f042152..c872b2d 100644
--- a/utilities/advancedrename/parser/options/cameranameoption.h
+++ b/utilities/advancedrename/parser/options/cameranameoption.h
@@ -6,7 +6,7 @@
    * Date        : 2009-08-08
    * Description : an option to provide camera information to the parser
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git
a/utilities/advancedrename/parser/options/database/databaseoption.cpp
b/utilities/advancedrename/parser/options/database/databaseoption.cpp
index 2ea76a2..9ee6a91 100644
--- a/utilities/advancedrename/parser/options/database/databaseoption.cpp
+++ b/utilities/advancedrename/parser/options/database/databaseoption.cpp
@@ -6,7 +6,7 @@
    * Date        : 2010-05-19
    * Description : an option to provide database information to the parser
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git
a/utilities/advancedrename/parser/options/database/databaseoption.h
b/utilities/advancedrename/parser/options/database/databaseoption.h
index 727cc94..ba46e14 100644
--- a/utilities/advancedrename/parser/options/database/databaseoption.h
+++ b/utilities/advancedrename/parser/options/database/databaseoption.h
@@ -6,7 +6,7 @@
    * Date        : 2010-05-19
    * Description : an option to provide database information to the parser
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git
a/utilities/advancedrename/parser/options/database/dbheaderlistitem.cpp
b/utilities/advancedrename/parser/options/database/dbheaderlistitem.cpp
index 76c9ba8..cf1c7e4 100644
--- a/utilities/advancedrename/parser/options/database/dbheaderlistitem.cpp
+++ b/utilities/advancedrename/parser/options/database/dbheaderlistitem.cpp
@@ -6,7 +6,7 @@
    * Date        : 2010-05-22
    * Description : header list view item
    *
- * Copyright (C) 2010-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2010-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git
a/utilities/advancedrename/parser/options/database/dbheaderlistitem.h
b/utilities/advancedrename/parser/options/database/dbheaderlistitem.h
index 0bb7d31..54458fa 100644
--- a/utilities/advancedrename/parser/options/database/dbheaderlistitem.h
+++ b/utilities/advancedrename/parser/options/database/dbheaderlistitem.h
@@ -6,7 +6,7 @@
    * Date        : 2010-05-22
    * Description : header list view item
    *
- * Copyright (C) 2010-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2010-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git
a/utilities/advancedrename/parser/options/database/dbkeyscollection.cpp
b/utilities/advancedrename/parser/options/database/dbkeyscollection.cpp
index 0eb9e2f..5854b1e 100644
--- a/utilities/advancedrename/parser/options/database/dbkeyscollection.cpp
+++ b/utilities/advancedrename/parser/options/database/dbkeyscollection.cpp
@@ -6,7 +6,7 @@
    * Date        : 2010-05-19
    * Description : a base class for a database keys collection
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git
a/utilities/advancedrename/parser/options/database/dbkeyscollection.h
b/utilities/advancedrename/parser/options/database/dbkeyscollection.h
index 3a07d1b..5a9ab5b 100644
--- a/utilities/advancedrename/parser/options/database/dbkeyscollection.h
+++ b/utilities/advancedrename/parser/options/database/dbkeyscollection.h
@@ -6,7 +6,7 @@
    * Date        : 2010-05-19
    * Description : a db option key
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git
a/utilities/advancedrename/parser/options/database/dbkeyselector.cpp
b/utilities/advancedrename/parser/options/database/dbkeyselector.cpp
index d9d5fb1..dffb387 100644
--- a/utilities/advancedrename/parser/options/database/dbkeyselector.cpp
+++ b/utilities/advancedrename/parser/options/database/dbkeyselector.cpp
@@ -6,7 +6,7 @@
    * Date        : 2010-05-22
    * Description : database key selector.
    *
- * Copyright (C) 2010-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2010-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git
a/utilities/advancedrename/parser/options/database/dbkeyselector.h
b/utilities/advancedrename/parser/options/database/dbkeyselector.h
index 7df852b..899bc19 100644
--- a/utilities/advancedrename/parser/options/database/dbkeyselector.h
+++ b/utilities/advancedrename/parser/options/database/dbkeyselector.h
@@ -6,7 +6,7 @@
    * Date        : 2010-05-22
    * Description : database key selector.
    *
- * Copyright (C) 2010-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2010-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git
a/utilities/advancedrename/parser/options/database/keys/commonkeys.cpp
b/utilities/advancedrename/parser/options/database/keys/commonkeys.cpp
index df1c030..1c07429 100644
--- a/utilities/advancedrename/parser/options/database/keys/commonkeys.cpp
+++ b/utilities/advancedrename/parser/options/database/keys/commonkeys.cpp
@@ -6,7 +6,7 @@
    * Date        : 2010-05-22
    * Description : common information keys
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git
a/utilities/advancedrename/parser/options/database/keys/commonkeys.h
b/utilities/advancedrename/parser/options/database/keys/commonkeys.h
index 4d9284d..8871119 100644
--- a/utilities/advancedrename/parser/options/database/keys/commonkeys.h
+++ b/utilities/advancedrename/parser/options/database/keys/commonkeys.h
@@ -6,7 +6,7 @@
    * Date        : 2010-05-22
    * Description : common information keys
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git
a/utilities/advancedrename/parser/options/database/keys/metadatakeys.cpp
b/utilities/advancedrename/parser/options/database/keys/metadatakeys.cpp
index f4a27e8..7a1792a 100644
---
a/utilities/advancedrename/parser/options/database/keys/metadatakeys.cpp
+++
b/utilities/advancedrename/parser/options/database/keys/metadatakeys.cpp
@@ -6,7 +6,7 @@
    * Date        : 2010-05-22
    * Description : metadata information keys
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git
a/utilities/advancedrename/parser/options/database/keys/metadatakeys.h
b/utilities/advancedrename/parser/options/database/keys/metadatakeys.h
index 12b78eb..c55682e 100644
--- a/utilities/advancedrename/parser/options/database/keys/metadatakeys.h
+++ b/utilities/advancedrename/parser/options/database/keys/metadatakeys.h
@@ -6,7 +6,7 @@
    * Date        : 2010-05-22
    * Description : metadata information keys
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git
a/utilities/advancedrename/parser/options/database/keys/positionkeys.cpp
b/utilities/advancedrename/parser/options/database/keys/positionkeys.cpp
index bbb35d2..13bbb9f 100644
---
a/utilities/advancedrename/parser/options/database/keys/positionkeys.cpp
+++
b/utilities/advancedrename/parser/options/database/keys/positionkeys.cpp
@@ -6,7 +6,7 @@
    * Date        : 2010-05-23
    * Description : position information keys
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git
a/utilities/advancedrename/parser/options/database/keys/positionkeys.h
b/utilities/advancedrename/parser/options/database/keys/positionkeys.h
index 0f5f3b4..ad15472 100644
--- a/utilities/advancedrename/parser/options/database/keys/positionkeys.h
+++ b/utilities/advancedrename/parser/options/database/keys/positionkeys.h
@@ -6,7 +6,7 @@
    * Date        : 2010-05-23
    * Description : position information keys
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/parser/options/dateoption.cpp
b/utilities/advancedrename/parser/options/dateoption.cpp
index ba5b622..b43f4f9 100644
--- a/utilities/advancedrename/parser/options/dateoption.cpp
+++ b/utilities/advancedrename/parser/options/dateoption.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-08-08
    * Description : an option to provide date information to the parser
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/parser/options/dateoption.h
b/utilities/advancedrename/parser/options/dateoption.h
index d5cfc0a..621e0b1 100644
--- a/utilities/advancedrename/parser/options/dateoption.h
+++ b/utilities/advancedrename/parser/options/dateoption.h
@@ -6,7 +6,7 @@
    * Date        : 2009-08-08
    * Description : an option to provide date information to the parser
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git
a/utilities/advancedrename/parser/options/directorynameoption.cpp
b/utilities/advancedrename/parser/options/directorynameoption.cpp
index 65d6b0a..2b7cf4f 100644
--- a/utilities/advancedrename/parser/options/directorynameoption.cpp
+++ b/utilities/advancedrename/parser/options/directorynameoption.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-09-02
    * Description : an option to provide directory information to the parser
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/parser/options/directorynameoption.h
b/utilities/advancedrename/parser/options/directorynameoption.h
index 25b5cd7..485cfdd 100644
--- a/utilities/advancedrename/parser/options/directorynameoption.h
+++ b/utilities/advancedrename/parser/options/directorynameoption.h
@@ -6,7 +6,7 @@
    * Date        : 2009-09-02
    * Description : an option to provide directory information to the parser
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git
a/utilities/advancedrename/parser/options/filepropertiesoption.cpp
b/utilities/advancedrename/parser/options/filepropertiesoption.cpp
index 99a10f0..5c4c39f 100644
--- a/utilities/advancedrename/parser/options/filepropertiesoption.cpp
+++ b/utilities/advancedrename/parser/options/filepropertiesoption.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-08-08
    * Description : an option to provide file information to the parser
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git
a/utilities/advancedrename/parser/options/filepropertiesoption.h
b/utilities/advancedrename/parser/options/filepropertiesoption.h
index e4a2b58..380a419 100644
--- a/utilities/advancedrename/parser/options/filepropertiesoption.h
+++ b/utilities/advancedrename/parser/options/filepropertiesoption.h
@@ -6,7 +6,7 @@
    * Date        : 2009-08-08
    * Description : an option to provide file information to the parser
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/parser/options/metadataoption.cpp
b/utilities/advancedrename/parser/options/metadataoption.cpp
index 1243808..c6a2bc0 100644
--- a/utilities/advancedrename/parser/options/metadataoption.cpp
+++ b/utilities/advancedrename/parser/options/metadataoption.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-08-08
    * Description : an option to provide metadata information to the parser
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/advancedrename/parser/options/metadataoption.h
b/utilities/advancedrename/parser/options/metadataoption.h
index c95abfd..6f6cd36 100644
--- a/utilities/advancedrename/parser/options/metadataoption.h
+++ b/utilities/advancedrename/parser/options/metadataoption.h
@@ -6,7 +6,7 @@
    * Date        : 2009-08-08
    * Description : an option to provide metadata information to the parser
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git
a/utilities/advancedrename/parser/options/sequencenumberoption.cpp
b/utilities/advancedrename/parser/options/sequencenumberoption.cpp
index a04202c..55a0e14 100644
--- a/utilities/advancedrename/parser/options/sequencenumberoption.cpp
+++ b/utilities/advancedrename/parser/options/sequencenumberoption.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-08-08
    * Description : an option to add a sequence number to the parser
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git
a/utilities/advancedrename/parser/options/sequencenumberoption.h
b/utilities/advancedrename/parser/options/sequencenumberoption.h
index 30e747c..b113f54 100644
--- a/utilities/advancedrename/parser/options/sequencenumberoption.h
+++ b/utilities/advancedrename/parser/options/sequencenumberoption.h
@@ -6,7 +6,7 @@
    * Date        : 2009-08-08
    * Description : an option to add a sequence number to the parser
    *
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/cameragui/controller/camerahistoryupdater.cpp
b/utilities/cameragui/controller/camerahistoryupdater.cpp
index 17f5f23..713863c 100644
--- a/utilities/cameragui/controller/camerahistoryupdater.cpp
+++ b/utilities/cameragui/controller/camerahistoryupdater.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-10-16
    * Description : history updater thread for cameraui
    *
- * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/cameragui/controller/camerahistoryupdater.h
b/utilities/cameragui/controller/camerahistoryupdater.h
index ed37d5b..c0d3a5f 100644
--- a/utilities/cameragui/controller/camerahistoryupdater.h
+++ b/utilities/cameragui/controller/camerahistoryupdater.h
@@ -6,7 +6,7 @@
    * Date        : 2009-10-16
    * Description : history updater thread for cameraui
    *
- * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/cameragui/main/cameraui.cpp
b/utilities/cameragui/main/cameraui.cpp
index 3dc10db..2767e4c 100644
--- a/utilities/cameragui/main/cameraui.cpp
+++ b/utilities/cameragui/main/cameraui.cpp
@@ -9,7 +9,7 @@
   * Copyright (C) 2004-2005 by Renchi Raju <renchi dot raju at gmail dot
com>
   * Copyright (C) 2006-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
   * Copyright (C) 2006-2011 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
-* Copyright (C) 2012      by Andi Clemens <andi dot clemens at googlemail
dot com>
+* Copyright (C) 2012      by Andi Clemens <andi dot clemens at gmail dot
com>
   * Copyright (C) 2012      by Islam Wazery <wazery at ubuntu dot com>
   *
   * This program is free software; you can redistribute it
diff --git a/utilities/cameragui/views/cameranamehelper.cpp
b/utilities/cameragui/views/cameranamehelper.cpp
index d00a945..58ef319 100644
--- a/utilities/cameragui/views/cameranamehelper.cpp
+++ b/utilities/cameragui/views/cameranamehelper.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-08-01
    * Description : camera name helper class
    *
- * Copyright (C) 2009 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2009 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/cameragui/views/cameranamehelper.h
b/utilities/cameragui/views/cameranamehelper.h
index 7f6535c..1331319 100644
--- a/utilities/cameragui/views/cameranamehelper.h
+++ b/utilities/cameragui/views/cameranamehelper.h
@@ -6,7 +6,7 @@
    * Date        : 2009-08-01
    * Description : camera name helper class
    *
- * Copyright (C) 2009 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2009 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/cameragui/widgets/renamecustomizer.cpp
b/utilities/cameragui/widgets/renamecustomizer.cpp
index 8783f4c..6fb389c 100644
--- a/utilities/cameragui/widgets/renamecustomizer.cpp
+++ b/utilities/cameragui/widgets/renamecustomizer.cpp
@@ -9,7 +9,7 @@
    *
    * Copyright (C) 2004-2005 by Renchi Raju <renchi dot raju at gmail dot
com>
    * Copyright (C) 2006-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2011      by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2011      by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/cameragui/widgets/renamecustomizer.h
b/utilities/cameragui/widgets/renamecustomizer.h
index ce2eea5..ec7e384 100644
--- a/utilities/cameragui/widgets/renamecustomizer.h
+++ b/utilities/cameragui/widgets/renamecustomizer.h
@@ -9,7 +9,7 @@
    *
    * Copyright (C) 2004-2005 by Renchi Raju <renchi dot raju at gmail dot
com>
    * Copyright (C) 2006-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2011      by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2011      by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/fuzzysearch/findduplicatesview.cpp
b/utilities/fuzzysearch/findduplicatesview.cpp
index 0e01304..6c9c7d2 100644
--- a/utilities/fuzzysearch/findduplicatesview.cpp
+++ b/utilities/fuzzysearch/findduplicatesview.cpp
@@ -8,7 +8,7 @@
    *
    * Copyright (C) 2008-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
    * Copyright (C) 2008-2012 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
- * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/fuzzysearch/findduplicatesview.h
b/utilities/fuzzysearch/findduplicatesview.h
index c21392a..9cc92b6 100644
--- a/utilities/fuzzysearch/findduplicatesview.h
+++ b/utilities/fuzzysearch/findduplicatesview.h
@@ -8,7 +8,7 @@
    *
    * Copyright (C) 2008-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
    * Copyright (C) 2008-2012 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
- * Copyright (C) 2009      by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009      by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/fuzzysearch/fuzzysearchview.cpp
b/utilities/fuzzysearch/fuzzysearchview.cpp
index f6169f2..df48b7a 100644
--- a/utilities/fuzzysearch/fuzzysearchview.cpp
+++ b/utilities/fuzzysearch/fuzzysearchview.cpp
@@ -8,7 +8,7 @@
    *
    * Copyright (C) 2008-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
    * Copyright (C) 2008-2012 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
- * Copyright (C) 2012 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2012 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/imageeditor/editor/editortoolsettings.cpp
b/utilities/imageeditor/editor/editortoolsettings.cpp
index 8ccc773..ebc9c51 100644
--- a/utilities/imageeditor/editor/editortoolsettings.cpp
+++ b/utilities/imageeditor/editor/editortoolsettings.cpp
@@ -7,7 +7,7 @@
    * Description : Editor tool settings template box
    *
    * Copyright (C) 2008-2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2008-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2008-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/imageeditor/editor/editortoolsettings.h
b/utilities/imageeditor/editor/editortoolsettings.h
index 3328fcb..1997be0 100644
--- a/utilities/imageeditor/editor/editortoolsettings.h
+++ b/utilities/imageeditor/editor/editortoolsettings.h
@@ -7,7 +7,7 @@
    * Description : Editor tool settings template box
    *
    * Copyright (C) 2008-2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2008-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2008-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/imageeditor/editor/editorwindow.cpp
b/utilities/imageeditor/editor/editorwindow.cpp
index e2c10e1..04e84d3 100644
--- a/utilities/imageeditor/editor/editorwindow.cpp
+++ b/utilities/imageeditor/editor/editorwindow.cpp
@@ -7,7 +7,7 @@
    * Description : main image editor GUI implementation
    *
    * Copyright (C) 2006-2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/imageeditor/editor/editorwindow.h
b/utilities/imageeditor/editor/editorwindow.h
index a2c0e2f..f710900 100644
--- a/utilities/imageeditor/editor/editorwindow.h
+++ b/utilities/imageeditor/editor/editorwindow.h
@@ -7,7 +7,7 @@
    * Description : main image editor GUI implementation
    *
    * Copyright (C) 2006-2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/importui/backend/camerahistoryupdater.cpp
b/utilities/importui/backend/camerahistoryupdater.cpp
index 17f5f23..713863c 100644
--- a/utilities/importui/backend/camerahistoryupdater.cpp
+++ b/utilities/importui/backend/camerahistoryupdater.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-10-16
    * Description : history updater thread for cameraui
    *
- * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/importui/backend/camerahistoryupdater.h
b/utilities/importui/backend/camerahistoryupdater.h
index ed37d5b..c0d3a5f 100644
--- a/utilities/importui/backend/camerahistoryupdater.h
+++ b/utilities/importui/backend/camerahistoryupdater.h
@@ -6,7 +6,7 @@
    * Date        : 2009-10-16
    * Description : history updater thread for cameraui
    *
- * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/importui/main/cameraui.cpp
b/utilities/importui/main/cameraui.cpp
index 1aeec89..70ffccb 100644
--- a/utilities/importui/main/cameraui.cpp
+++ b/utilities/importui/main/cameraui.cpp
@@ -9,7 +9,7 @@
   * Copyright (C) 2004-2005 by Renchi Raju <renchi dot raju at gmail dot
com>
   * Copyright (C) 2006-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
   * Copyright (C) 2006-2011 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
-* Copyright (C) 2012      by Andi Clemens <andi dot clemens at googlemail
dot com>
+* Copyright (C) 2012      by Andi Clemens <andi dot clemens at gmail dot
com>
   * Copyright (C) 2012      by Islam Wazery <wazery at ubuntu dot com>
   *
   * This program is free software; you can redistribute it
diff --git a/utilities/importui/views/cameranamehelper.cpp
b/utilities/importui/views/cameranamehelper.cpp
index d00a945..58ef319 100644
--- a/utilities/importui/views/cameranamehelper.cpp
+++ b/utilities/importui/views/cameranamehelper.cpp
@@ -6,7 +6,7 @@
    * Date        : 2009-08-01
    * Description : camera name helper class
    *
- * Copyright (C) 2009 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2009 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/importui/views/cameranamehelper.h
b/utilities/importui/views/cameranamehelper.h
index 7f6535c..1331319 100644
--- a/utilities/importui/views/cameranamehelper.h
+++ b/utilities/importui/views/cameranamehelper.h
@@ -6,7 +6,7 @@
    * Date        : 2009-08-01
    * Description : camera name helper class
    *
- * Copyright (C) 2009 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2009 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/importui/widgets/renamecustomizer.cpp
b/utilities/importui/widgets/renamecustomizer.cpp
index 8783f4c..6fb389c 100644
--- a/utilities/importui/widgets/renamecustomizer.cpp
+++ b/utilities/importui/widgets/renamecustomizer.cpp
@@ -9,7 +9,7 @@
    *
    * Copyright (C) 2004-2005 by Renchi Raju <renchi dot raju at gmail dot
com>
    * Copyright (C) 2006-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2011      by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2011      by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/importui/widgets/renamecustomizer.h
b/utilities/importui/widgets/renamecustomizer.h
index ce2eea5..ec7e384 100644
--- a/utilities/importui/widgets/renamecustomizer.h
+++ b/utilities/importui/widgets/renamecustomizer.h
@@ -9,7 +9,7 @@
    *
    * Copyright (C) 2004-2005 by Renchi Raju <renchi dot raju at gmail dot
com>
    * Copyright (C) 2006-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2011      by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2011      by Andi Clemens <andi dot clemens at gmail dot
com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/maintenance/duplicatesfinder.cpp
b/utilities/maintenance/duplicatesfinder.cpp
index 78006db..027f7c8 100644
--- a/utilities/maintenance/duplicatesfinder.cpp
+++ b/utilities/maintenance/duplicatesfinder.cpp
@@ -7,7 +7,7 @@
    * Description : Duplicates items finder.
    *
    * Copyright (C) 2012 by Gilles Caulier <caulier dot gilles at gmail dot
com>
- * Copyright (C) 2012 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2012 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/maintenance/facedetector.cpp
b/utilities/maintenance/facedetector.cpp
index ee0e658..2480f55 100644
--- a/utilities/maintenance/facedetector.cpp
+++ b/utilities/maintenance/facedetector.cpp
@@ -8,7 +8,7 @@
    *
    * Copyright (C) 2010 by Aditya Bhatt <adityabhatt1991 at gmail dot com>
    * Copyright (C) 2010-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2012 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2012 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/maintenance/fingerprintsgenerator.cpp
b/utilities/maintenance/fingerprintsgenerator.cpp
index a11bfe9..0e20589 100644
--- a/utilities/maintenance/fingerprintsgenerator.cpp
+++ b/utilities/maintenance/fingerprintsgenerator.cpp
@@ -7,7 +7,7 @@
    * Description : fingerprints generator
    *
    * Copyright (C) 2008-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2012 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2012 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/maintenance/maintenancemngr.cpp
b/utilities/maintenance/maintenancemngr.cpp
index c1a4239..e7a0461 100644
--- a/utilities/maintenance/maintenancemngr.cpp
+++ b/utilities/maintenance/maintenancemngr.cpp
@@ -7,7 +7,7 @@
    * Description : maintenance manager
    *
    * Copyright (C) 2012 by Gilles Caulier <caulier dot gilles at gmail dot
com>
- * Copyright (C) 2012 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2012 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/maintenance/maintenancetool.cpp
b/utilities/maintenance/maintenancetool.cpp
index 0aedca9..cc91cc4 100644
--- a/utilities/maintenance/maintenancetool.cpp
+++ b/utilities/maintenance/maintenancetool.cpp
@@ -7,7 +7,7 @@
    * Description : maintenance tool
    *
    * Copyright (C) 2012 by Gilles Caulier <caulier dot gilles at gmail dot
com>
- * Copyright (C) 2012 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2012 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/maintenance/maintenancetool.h
b/utilities/maintenance/maintenancetool.h
index e0cda3a..9e5a35b 100644
--- a/utilities/maintenance/maintenancetool.h
+++ b/utilities/maintenance/maintenancetool.h
@@ -7,7 +7,7 @@
    * Description : maintenance tool
    *
    * Copyright (C) 2012 by Gilles Caulier <caulier dot gilles at gmail dot
com>
- * Copyright (C) 2012 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2012 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/maintenance/metadatasynchronizer.cpp
b/utilities/maintenance/metadatasynchronizer.cpp
index afc198d..9aec4e7 100644
--- a/utilities/maintenance/metadatasynchronizer.cpp
+++ b/utilities/maintenance/metadatasynchronizer.cpp
@@ -7,7 +7,7 @@
    * Description : batch sync pictures metadata with database
    *
    * Copyright (C) 2007-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2012 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2012 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/maintenance/newitemsfinder.cpp
b/utilities/maintenance/newitemsfinder.cpp
index 1f36f2e..1524e04 100644
--- a/utilities/maintenance/newitemsfinder.cpp
+++ b/utilities/maintenance/newitemsfinder.cpp
@@ -7,7 +7,7 @@
    * Description : new items finder.
    *
    * Copyright (C) 2012 by Gilles Caulier <caulier dot gilles at gmail dot
com>
- * Copyright (C) 2012 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2012 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/maintenance/thumbsgenerator.cpp
b/utilities/maintenance/thumbsgenerator.cpp
index 0531e16..44590d6 100644
--- a/utilities/maintenance/thumbsgenerator.cpp
+++ b/utilities/maintenance/thumbsgenerator.cpp
@@ -7,7 +7,7 @@
    * Description : batch thumbnails generator
    *
    * Copyright (C) 2006-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2012 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2012 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General
diff --git a/utilities/scripts/cleanup_digikamdb/cleanup_digikamdb
b/utilities/scripts/cleanup_digikamdb/cleanup_digikamdb
index f9fe22a..3a68d3d 100644
--- a/utilities/scripts/cleanup_digikamdb/cleanup_digikamdb
+++ b/utilities/scripts/cleanup_digikamdb/cleanup_digikamdb
@@ -1,6 +1,6 @@
   #!/bin/sh

-# Author: Andi Clemens, <andi dot clemens at googlemail dot com>
+# Author: Andi Clemens, <andi dot clemens at gmail dot com>
   #
   # Description:
   #
diff --git a/utilities/scripts/cleanup_digikamdb/cleanup_digikamdb.1
b/utilities/scripts/cleanup_digikamdb/cleanup_digikamdb.1
index 0daa81f..1447348 100644
--- a/utilities/scripts/cleanup_digikamdb/cleanup_digikamdb.1
+++ b/utilities/scripts/cleanup_digikamdb/cleanup_digikamdb.1
@@ -55,4 +55,4 @@ The \fIVACUUM\fR command cleans the main database by
copying its contents to a t
   the original database file from the copy.
   This eliminates free pages, aligns table data to be contiguous, and
otherwise cleans up the database file structure.
   .SH AUTHOR
-\fBcleanup_digikamdb\fR was written by Andi Clemens <andi dot clemens at
googlemail dot com>
+\fBcleanup_digikamdb\fR was written by Andi Clemens <andi dot clemens at
gmail dot com>
diff --git a/utilities/scripts/cleanup_digikamdb/cleanup_digikamdb.docbook
b/utilities/scripts/cleanup_digikamdb/cleanup_digikamdb.docbook
index 5f34e5d..99bdb75 100644
--- a/utilities/scripts/cleanup_digikamdb/cleanup_digikamdb.docbook
+++ b/utilities/scripts/cleanup_digikamdb/cleanup_digikamdb.docbook
@@ -16,7 +16,7 @@
                   <contrib>Developer</contrib>
                   <firstname>Andi</firstname>
                   <surname>Clemens</surname>
-                <email>andi dot clemens at googlemail dot com</email>
+                <email>andi dot clemens at gmail dot com</email>
               </author>
           </authorgroup>
       </refentryinfo>
@@ -124,7 +124,7 @@
       <refsect1>
           <title>Author</title>
           <para>
-            &product; was written by Andi Clemens <andi dot clemens at
googlemail dot com>
+            &product; was written by Andi Clemens <andi dot clemens at
gmail dot com>
           </para>
       </refsect1>

diff --git a/utilities/searchwindow/searchfolderview.cpp
b/utilities/searchwindow/searchfolderview.cpp
index c73ff84..2bc7c98 100644
--- a/utilities/searchwindow/searchfolderview.cpp
+++ b/utilities/searchwindow/searchfolderview.cpp
@@ -9,7 +9,7 @@
    * Copyright (C) 2005      by Renchi Raju <renchi at pooh dot tam dot
uiuc dot edu>
    * Copyright (C) 2008-2012 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
    * Copyright (C) 2006-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2009      by Andi Clemens <andi dot clemens at
googlemail dot com>
+ * Copyright (C) 2009      by Andi Clemens <andi dot clemens at gmail dot
com>
    * Copyright (C) 2009      by Johannes Wienke <languitar at semipol dot
de>
    *
    * This program is free software; you can redistribute it
diff --git a/utilities/setup/setupcollectionview.cpp
b/utilities/setup/setupcollectionview.cpp
index 21109f7..6d12a97 100644
--- a/utilities/setup/setupcollectionview.cpp
+++ b/utilities/setup/setupcollectionview.cpp
@@ -8,7 +8,7 @@
    *
    * Copyright (C) 2008-2011 by Marcel Wiesweg <marcel dot wiesweg at gmx
dot de>
    * Copyright (C) 2005-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
- * Copyright (C) 2012 by Andi Clemens <andi dot clemens at googlemail dot
com>
+ * Copyright (C) 2012 by Andi Clemens <andi dot clemens at gmail dot com>
    *
    * This program is free software; you can redistribute it
    * and/or modify it under the terms of the GNU General


-- 
Using Opera's revolutionary email client: http://www.opera.com/mail/



More information about the Digikam-devel mailing list