diff --git a/build.py b/build.py
index 085f1712..9d83d2aa 100644
--- a/build.py
+++ b/build.py
@@ -146,7 +146,7 @@ def build_pe_modules(ui):
 def build_normal(edition, ui, dev):
     print("Building dupeGuru {0} with UI {1}".format(edition.upper(), ui))
     add_to_pythonpath('.')
-    build_help(edition, ui, dev)
+    build_help(edition)
     print("Building dupeGuru")
     if edition == 'pe':
         build_pe_modules(ui)
diff --git a/cocoa/base/AppDelegate.h b/cocoa/base/AppDelegate.h
index b9739a98..7012c077 100644
--- a/cocoa/base/AppDelegate.h
+++ b/cocoa/base/AppDelegate.h
@@ -18,6 +18,7 @@ http://www.hardcoded.net/licenses/bsd_license
 {
     IBOutlet PyDupeGuruBase *py;
     IBOutlet NSMenu *recentResultsMenu;
+    IBOutlet NSMenu *actionsMenu;
     IBOutlet NSMenu *columnsMenu;
     
     ResultWindowBase *_resultWindow;
diff --git a/cocoa/base/en.lproj/MainMenu.xib b/cocoa/base/en.lproj/MainMenu.xib
index 05e8726d..e5aa02f9 100644
--- a/cocoa/base/en.lproj/MainMenu.xib
+++ b/cocoa/base/en.lproj/MainMenu.xib
@@ -12,7 +12,7 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="57"/>
+			<integer value="598"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1061,6 +1061,14 @@
 					</object>
 					<int key="connectionID">1274</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">actionsMenu</string>
+						<reference key="source" ref="91622651"/>
+						<reference key="destination" ref="600111647"/>
+					</object>
+					<int key="connectionID">1275</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -1907,7 +1915,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">1274</int>
+			<int key="maxID">1275</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2001,6 +2009,7 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>actionsMenu</string>
 							<string>columnsMenu</string>
 							<string>py</string>
 							<string>recentResultsMenu</string>
@@ -2008,6 +2017,7 @@
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>NSMenu</string>
+							<string>NSMenu</string>
 							<string>PyDupeGuruBase</string>
 							<string>NSMenu</string>
 						</object>
@@ -2016,12 +2026,17 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>actionsMenu</string>
 							<string>columnsMenu</string>
 							<string>py</string>
 							<string>recentResultsMenu</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBToOneOutletInfo">
+								<string key="name">actionsMenu</string>
+								<string key="candidateClassName">NSMenu</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">columnsMenu</string>
 								<string key="candidateClassName">NSMenu</string>
diff --git a/cocoa/base/fr.lproj/MainMenu.xib b/cocoa/base/fr.lproj/MainMenu.xib
index ddc514f4..d455f4f7 100644
--- a/cocoa/base/fr.lproj/MainMenu.xib
+++ b/cocoa/base/fr.lproj/MainMenu.xib
@@ -1058,6 +1058,14 @@
 					</object>
 					<int key="connectionID">1274</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">actionsMenu</string>
+						<reference key="source" ref="91622651"/>
+						<reference key="destination" ref="600111647"/>
+					</object>
+					<int key="connectionID">1275</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -1904,7 +1912,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">1274</int>
+			<int key="maxID">1275</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1998,6 +2006,7 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>actionsMenu</string>
 							<string>columnsMenu</string>
 							<string>py</string>
 							<string>recentResultsMenu</string>
@@ -2005,6 +2014,7 @@
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>NSMenu</string>
+							<string>NSMenu</string>
 							<string>PyDupeGuruBase</string>
 							<string>NSMenu</string>
 						</object>
@@ -2013,12 +2023,17 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>actionsMenu</string>
 							<string>columnsMenu</string>
 							<string>py</string>
 							<string>recentResultsMenu</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBToOneOutletInfo">
+								<string key="name">actionsMenu</string>
+								<string key="candidateClassName">NSMenu</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">columnsMenu</string>
 								<string key="candidateClassName">NSMenu</string>
diff --git a/cocoa/me/AppDelegate.m b/cocoa/me/AppDelegate.m
index 6eee2e77..6dc51f77 100644
--- a/cocoa/me/AppDelegate.m
+++ b/cocoa/me/AppDelegate.m
@@ -77,7 +77,6 @@ http://www.hardcoded.net/licenses/bsd_license
 //Delegate
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 {
-    NSMenu *actionsMenu = [[[NSApp mainMenu] itemWithTitle:@"Actions"] submenu];
     // index 3 is just after "Export Results to XHTML"
     NSMenuItem *mi = [actionsMenu insertItemWithTitle:TR(@"Remove Dead Tracks in iTunes")
         action:@selector(removeDeadTracks:) keyEquivalent:@"" atIndex:3];
diff --git a/cocoa/me/fr.lproj/Preferences.xib b/cocoa/me/fr.lproj/Preferences.xib
index bda8db4f..8b1c02e6 100644
--- a/cocoa/me/fr.lproj/Preferences.xib
+++ b/cocoa/me/fr.lproj/Preferences.xib
@@ -335,7 +335,7 @@
 													<reference key="NSControlView" ref="102571342"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<object class="NSCustomResource" key="NSNormalImage" id="589599360">
+													<object class="NSCustomResource" key="NSNormalImage" id="161291571">
 														<string key="NSClassName">NSImage</string>
 														<string key="NSResourceName">NSSwitch</string>
 													</object>
@@ -362,7 +362,7 @@
 													<reference key="NSControlView" ref="527948380"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="589599360"/>
+													<reference key="NSNormalImage" ref="161291571"/>
 													<reference key="NSAlternateImage" ref="150447483"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -465,7 +465,7 @@
 													<reference key="NSControlView" ref="996173927"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="589599360"/>
+													<reference key="NSNormalImage" ref="161291571"/>
 													<reference key="NSAlternateImage" ref="150447483"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -487,7 +487,7 @@
 													<reference key="NSControlView" ref="147113892"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="589599360"/>
+													<reference key="NSNormalImage" ref="161291571"/>
 													<reference key="NSAlternateImage" ref="150447483"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -509,7 +509,7 @@
 													<reference key="NSControlView" ref="367077416"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="589599360"/>
+													<reference key="NSNormalImage" ref="161291571"/>
 													<reference key="NSAlternateImage" ref="150447483"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -547,7 +547,7 @@
 													<reference key="NSControlView" ref="24386232"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="589599360"/>
+													<reference key="NSNormalImage" ref="161291571"/>
 													<reference key="NSAlternateImage" ref="150447483"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -569,7 +569,7 @@
 													<reference key="NSControlView" ref="28878355"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="589599360"/>
+													<reference key="NSNormalImage" ref="161291571"/>
 													<reference key="NSAlternateImage" ref="150447483"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -591,7 +591,7 @@
 													<reference key="NSControlView" ref="964877114"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="589599360"/>
+													<reference key="NSNormalImage" ref="161291571"/>
 													<reference key="NSAlternateImage" ref="150447483"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -613,7 +613,7 @@
 													<reference key="NSControlView" ref="144566514"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="589599360"/>
+													<reference key="NSNormalImage" ref="161291571"/>
 													<reference key="NSAlternateImage" ref="150447483"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -635,7 +635,7 @@
 													<reference key="NSControlView" ref="180911463"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="589599360"/>
+													<reference key="NSNormalImage" ref="161291571"/>
 													<reference key="NSAlternateImage" ref="150447483"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -657,7 +657,7 @@
 													<reference key="NSControlView" ref="422320464"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="589599360"/>
+													<reference key="NSNormalImage" ref="161291571"/>
 													<reference key="NSAlternateImage" ref="150447483"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -694,7 +694,7 @@
 													<reference key="NSControlView" ref="836095588"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="589599360"/>
+													<reference key="NSNormalImage" ref="161291571"/>
 													<reference key="NSAlternateImage" ref="150447483"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -848,7 +848,7 @@
 													<reference key="NSControlView" ref="1065764374"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="589599360"/>
+													<reference key="NSNormalImage" ref="161291571"/>
 													<reference key="NSAlternateImage" ref="150447483"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
diff --git a/cocoa/pe/AppDelegate.m b/cocoa/pe/AppDelegate.m
index e86306ea..2cc0e6fd 100644
--- a/cocoa/pe/AppDelegate.m
+++ b/cocoa/pe/AppDelegate.m
@@ -60,8 +60,6 @@ http://www.hardcoded.net/licenses/bsd_license
 //Delegate
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 {
-    // XXX The line below could be broken by a localization...
-    NSMenu *actionsMenu = [[[NSApp mainMenu] itemWithTitle:@"Actions"] submenu];
     // index 2 is just after "Clear Ingore List"
     NSMenuItem *mi = [actionsMenu insertItemWithTitle:TR(@"Clear Picture Cache")
         action:@selector(clearPictureCache:) keyEquivalent:@"P" atIndex:2];
diff --git a/cocoa/pe/fr.lproj/Preferences.xib b/cocoa/pe/fr.lproj/Preferences.xib
index 2d0c87c6..66527f51 100644
--- a/cocoa/pe/fr.lproj/Preferences.xib
+++ b/cocoa/pe/fr.lproj/Preferences.xib
@@ -209,7 +209,7 @@
 													<reference key="NSControlView" ref="488256664"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<object class="NSCustomResource" key="NSNormalImage" id="1034215999">
+													<object class="NSCustomResource" key="NSNormalImage" id="517313390">
 														<string key="NSClassName">NSImage</string>
 														<string key="NSResourceName">NSSwitch</string>
 													</object>
@@ -236,7 +236,7 @@
 													<reference key="NSControlView" ref="722670516"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="1034215999"/>
+													<reference key="NSNormalImage" ref="517313390"/>
 													<reference key="NSAlternateImage" ref="990345653"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -258,7 +258,7 @@
 													<reference key="NSControlView" ref="472028782"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="1034215999"/>
+													<reference key="NSNormalImage" ref="517313390"/>
 													<reference key="NSAlternateImage" ref="990345653"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -280,7 +280,7 @@
 													<reference key="NSControlView" ref="279087998"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="1034215999"/>
+													<reference key="NSNormalImage" ref="517313390"/>
 													<reference key="NSAlternateImage" ref="990345653"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -398,7 +398,7 @@
 													<reference key="NSControlView" ref="1018598123"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="1034215999"/>
+													<reference key="NSNormalImage" ref="517313390"/>
 													<reference key="NSAlternateImage" ref="990345653"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -420,7 +420,7 @@
 													<reference key="NSControlView" ref="519470955"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="1034215999"/>
+													<reference key="NSNormalImage" ref="517313390"/>
 													<reference key="NSAlternateImage" ref="990345653"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
diff --git a/cocoa/se/fr.lproj/Preferences.xib b/cocoa/se/fr.lproj/Preferences.xib
index 1642b928..38457029 100644
--- a/cocoa/se/fr.lproj/Preferences.xib
+++ b/cocoa/se/fr.lproj/Preferences.xib
@@ -290,7 +290,7 @@
 													<reference key="NSControlView" ref="637819333"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<object class="NSCustomResource" key="NSNormalImage" id="751058253">
+													<object class="NSCustomResource" key="NSNormalImage" id="368466860">
 														<string key="NSClassName">NSImage</string>
 														<string key="NSResourceName">NSSwitch</string>
 													</object>
@@ -317,7 +317,7 @@
 													<reference key="NSControlView" ref="1067721243"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="751058253"/>
+													<reference key="NSNormalImage" ref="368466860"/>
 													<reference key="NSAlternateImage" ref="589920880"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -339,7 +339,7 @@
 													<reference key="NSControlView" ref="290008886"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="751058253"/>
+													<reference key="NSNormalImage" ref="368466860"/>
 													<reference key="NSAlternateImage" ref="589920880"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -361,7 +361,7 @@
 													<reference key="NSControlView" ref="551239185"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="751058253"/>
+													<reference key="NSNormalImage" ref="368466860"/>
 													<reference key="NSAlternateImage" ref="589920880"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -383,7 +383,7 @@
 													<reference key="NSControlView" ref="208488736"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="751058253"/>
+													<reference key="NSNormalImage" ref="368466860"/>
 													<reference key="NSAlternateImage" ref="589920880"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -405,7 +405,7 @@
 													<reference key="NSControlView" ref="427690895"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="751058253"/>
+													<reference key="NSNormalImage" ref="368466860"/>
 													<reference key="NSAlternateImage" ref="589920880"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -621,7 +621,7 @@
 													<reference key="NSControlView" ref="724127338"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="751058253"/>
+													<reference key="NSNormalImage" ref="368466860"/>
 													<reference key="NSAlternateImage" ref="589920880"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -643,7 +643,7 @@
 													<reference key="NSControlView" ref="647216699"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="751058253"/>
+													<reference key="NSNormalImage" ref="368466860"/>
 													<reference key="NSAlternateImage" ref="589920880"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
diff --git a/core/engine.py b/core/engine.py
index 8e3cca05..80d50c1e 100644
--- a/core/engine.py
+++ b/core/engine.py
@@ -24,9 +24,8 @@ NO_FIELD_ORDER) = range(3)
 JOB_REFRESH_RATE = 100
 
 def getwords(s):
-    if isinstance(s, str):
-        # XXX is this really needed?
-        s = normalize('NFD', s)
+    # We decompose the string so that ascii letters with accents can be part of the word.
+    s = normalize('NFD', s)
     s = multi_replace(s, "-_&+():;\\[]{}.,<>/?~!@#$*", ' ').lower()
     s = ''.join(c for c in s if c in string.ascii_letters + string.digits + string.whitespace)
     return [_f for _f in s.split(' ') if _f] # remove empty elements
diff --git a/qt/base/directories_dialog.py b/qt/base/directories_dialog.py
index d1f09f15..e9bcc03f 100644
--- a/qt/base/directories_dialog.py
+++ b/qt/base/directories_dialog.py
@@ -154,9 +154,6 @@ class DirectoriesDialog(QMainWindow):
             self.removeFolderButton.setEnabled(False)
             return
         self.removeFolderButton.setEnabled(True)
-        index = indexes[0]
-        node = index.internalPointer()
-        # label = 'Remove' if node.parent is None else 'Exclude'
     
     def _updateLoadResultsButton(self):
         if self.app.recentResults.isEmpty():
@@ -209,8 +206,7 @@ class DirectoriesDialog(QMainWindow):
     
     def scanButtonClicked(self):
         title = tr("Start a new scan")
-        # XXX must be triggered on unsaved results
-        if len(self.app.results.groups) > 0:
+        if self.app.results.is_modified:
             msg = trmsg("ReallyWantToContinueMsg")
             if not self.app.confirm(title, msg):
                 return