diff --git a/src/includes/class/class.LSattr_html_sambaAcctFlags.php b/src/includes/class/class.LSattr_html_sambaAcctFlags.php
index a36a7854..00273312 100644
--- a/src/includes/class/class.LSattr_html_sambaAcctFlags.php
+++ b/src/includes/class/class.LSattr_html_sambaAcctFlags.php
@@ -42,12 +42,16 @@ class LSattr_html_sambaAcctFlags extends LSattr_html_select_box {
    *               la valeur des balises option et en valeur ce qui sera affiché.
    */
   public static function _getPossibleValues($options=false, $name=false, &$ldapObject=false) {
+    $translate_labels = LSconfig :: get('translate_labels', true, 'bool', $options);
     $retInfos = array();
     if (!LSsession :: loadLSclass('LSattr_ldap_sambaAcctFlags', null, true))
       return $retInfos;
     foreach(LSattr_ldap_sambaAcctFlags :: get_available_flags() as $group_label => $flags) {
+      if ($translate_labels)
+        foreach ($flags as $flag => $label)
+          $flags[$flag] = _($label);
       $retInfos[] = array(
-        'label' => $group_label,
+        'label' => ($translate_labels?_($group_label):$group_label),
         'possible_values' => $flags,
       );
     }
diff --git a/src/includes/class/class.LSlang.php b/src/includes/class/class.LSlang.php
index f5a142b3..b409daa7 100644
--- a/src/includes/class/class.LSlang.php
+++ b/src/includes/class/class.LSlang.php
@@ -407,7 +407,7 @@ function cli_generate_lang_file($command_args) {
           fwrite(STDERR, " - q: quit interactive mode and ignore all following untranslated messages\n");
           fwrite(STDERR, " - ?: Show this message\n");
           fwrite(STDERR, "Or leave empty to $empty_action.\n");
-          continue;
+          break;
         case "": // Empty
           // On copy orignal value mode, return $msg
           if ($copyoriginalvalue)