diff --git a/EasyCustomLabeling/EasyCustomLabeling.py b/EasyCustomLabeling/EasyCustomLabeling.py
index f4e2bc7..e74edf1 100644
--- a/EasyCustomLabeling/EasyCustomLabeling.py
+++ b/EasyCustomLabeling/EasyCustomLabeling.py
@@ -378,9 +378,10 @@ def runLabel(self):
                 self.iface.mapCanvas().freeze(0)
                 # print 'dialog keep selection: ' + str(ret)
                 return
-            # elif ret == 65536  :  # No button65536  use entire layer
-                
-            #elif ret == 16384 :
+            elif ret == 65536  :  # No button65536  use entire layer
+                print 'use entire layer'
+            elif ret == 16384 :
+                print 'use selection'
                
                 
         nbSelectedObjects = sourceLayer.selectedFeatureCount()
@@ -391,8 +392,12 @@ def runLabel(self):
             msgBox.setText(QtGui.QApplication.translate("EasyCustomLabeling","Your layer contains many objects. Continue anyway?", None, QtGui.QApplication.UnicodeUTF8))
             msgBox.setStandardButtons(QMessageBox.Ok | QMessageBox.Cancel)
             msgBox.setDefaultButton(QMessageBox.Ok) # This function was introduced in Qt 4.3.
-            ret = msgBox.exec_() #ret_val = 1024 si OK, 4194304 sinon
+            ret2 = msgBox.exec_() #ret_val = 1024 si OK, 4194304 sinon
             # print 'dialog many objects: ' + str(ret)
+            if ret2 != 1024:
+                print 'user cancel on too many object question'
+                return
+
 
                 
               
diff --git a/EasyCustomLabeling/i18n/EasyCustomLabeling_fr.qm b/EasyCustomLabeling/i18n/EasyCustomLabeling_fr.qm
index 24d7c6c..99853b6 100644
Binary files a/EasyCustomLabeling/i18n/EasyCustomLabeling_fr.qm and b/EasyCustomLabeling/i18n/EasyCustomLabeling_fr.qm differ
diff --git a/EasyCustomLabeling/i18n/EasyCustomLabeling_fr.ts b/EasyCustomLabeling/i18n/EasyCustomLabeling_fr.ts
index 503de98..a50858a 100644
--- a/EasyCustomLabeling/i18n/EasyCustomLabeling_fr.ts
+++ b/EasyCustomLabeling/i18n/EasyCustomLabeling_fr.ts
@@ -64,9 +64,9 @@ Cliquer sur la couche vectorielle à étiqueter</translation>
     <message numerus="yes">
         <location filename="EasyCustomLabeling.py" line="276"/>
         <source>Use %n selected object(s) only for labeling ?</source>
-        <translation>
-            <numerusform>Créer une couche uniquement avec le(s) %n objets(s) sélectionné(s)?</numerusform>
-            <numerusform></numerusform>
+        <translation type="unfinished">
+            <numerusform>Utilisez uniquement %n objet sélectionné ? </numerusform>
+            <numerusform>Utilisez uniquement les %n objets sélectionnés ? </numerusform>
         </translation>
     </message>
 </context>
diff --git a/EasyCustomLabeling/i18n/EasyCustomLabeling_fr_FR.qm b/EasyCustomLabeling/i18n/EasyCustomLabeling_fr_FR.qm
index 24d7c6c..99853b6 100644
Binary files a/EasyCustomLabeling/i18n/EasyCustomLabeling_fr_FR.qm and b/EasyCustomLabeling/i18n/EasyCustomLabeling_fr_FR.qm differ