diff --git a/i18n/en.yml b/i18n/en.yml
index 69df6e8..3cfe0e0 100644
--- a/i18n/en.yml
+++ b/i18n/en.yml
@@ -20,6 +20,21 @@ en:
     update:
       id_no_exist: "Can't update the item, the item %{id} doesn't exist!"
   cli:
+    option:
+      usage: "Usage"
+      show: "Search and show the items"
+      show_all: "Show all items"
+      update: "Update an item"
+      remove: "Delete an item"
+      group: "Search the items with specified group"
+      add: "Add an item"
+      setup: "Create a new configuration file" 
+      protocol: "Select the items with the specified protocol"
+      export: "Export all items in a CSV file"
+      import: "Import item since a CSV file"
+      force: "Force an action"
+      format: "Change the display items format by an alternative format"
+      help: "Show this help message"
     form:
       add:
         title: "Add a new item"
diff --git a/i18n/fr.yml b/i18n/fr.yml
index 1812b8a..f76c69c 100644
--- a/i18n/fr.yml
+++ b/i18n/fr.yml
@@ -20,6 +20,21 @@ fr:
     update:
       id_no_exist: "Impossible de mettre à jour l'élément %{id}, car il n'existe pas!"
   cli:
+    option:
+      usage: "Utilisation"
+      show: "Recherche et affiche les éléments"
+      show_all: "Affiche tous les éléments"
+      update: "Met à jour un élément"
+      remove: "Supprime un élément"
+      group: "Recherche les éléments appartenant au groupe spécifié"
+      add: "Ajoute un élément"
+      setup: "Création d'un nouveau fichier de configuration" 
+      protocol: "Sélectionne les éléments ayant le protocole spécifié"
+      export: "Exporte tous les éléments dans un fichier au format CSV"
+      import: "Importe des éléments depuis un fichier au format CSV"
+      force: "Force une action, l'action ne demandera pas de confirmation"
+      format: "Change le format d'affichage des éléments par un alternatif"
+      help: "Affiche ce message d'aide"
     form:
       add:
         title: "Ajout d'un nouvel élément"
diff --git a/mpw b/mpw
index f2f90ab..002c2ea 100755
--- a/mpw
+++ b/mpw
@@ -27,58 +27,58 @@ options[:format] = false
 options[:group]  = nil
 
 OptionParser.new do |opts|
-	opts.banner = "Usage: mpw [options]"
+	opts.banner = "#{I18n.t('cli.option.usage')}: mpw [options]"
 
-	opts.on("-d", "--display [SEARCH]", "Display items") do |search|
+	opts.on('-d', '--display [SEARCH]', I18n.t('cli.option.show')) do |search|
 		search.nil? ? (options[:display]  = '')  : (options[:display] = search)
 	end
 
-	opts.on("-A", "--show-all", "Show all items") do |b|
+	opts.on('-A', '--show-all', I18n.t('cli.option.show_all')) do |b|
 		options[:type]    = nil
-		options[:display] = ""
+		options[:display] = ''
 	end
 
-	opts.on("-u", "--update ID", "Update an items") do |id|
+	opts.on('-u', '--update ID', I18n.t('cli.option.update')) do |id|
 		options[:update] = id
 	end
 
-	opts.on("-r", "--remove ID", "Remove an items") do |id|
+	opts.on('-r', '--remove ID', I18n.t('cli.option.remove')) do |id|
 		options[:remove] = id
 	end
 
-	opts.on("-g", "--group GROUP", "Select a group") do |group|
+	opts.on('-g', '--group GROUP', I18n.t('cli.option.group')) do |group|
 		options[:group] = group
 	end
 
-	opts.on("-a", "--add", "Add an items") do |b|
+	opts.on('-a', '--add', I18n.t('cli.option.add')) do |b|
 		options[:add] = true
 	end
 
-	opts.on("-S", "--setup", "Setup the config file") do |b|
+	opts.on('-S', '--setup', I18n.t('cli.option.setup')) do |b|
 		options[:setup] = true
 	end
 
-	opts.on("-p", "--protocol PROTOCOL", "Select a protocol") do |type|
+	opts.on('-p', '--protocol PROTOCOL', I18n.t('cli.option.protocol')) do |type|
 		options[:type] = type
 	end
 
-	opts.on("-e", "--export FILE", "Export to csv file") do |file|
+	opts.on('-e', '--export FILE', I18n.t('cli.option.export')) do |file|
 		options[:export] = file
 	end
 
-	opts.on("-i", "--import FILE", "Import from csv file") do |file|
+	opts.on('-i', '--import FILE', I18n.t('cli.option.import')) do |file|
 		options[:import] = file
 	end
 
-	opts.on("-f", "--force", "Force an action") do |b|
+	opts.on('-f', '--force', I18n.t('cli.option.force')) do |b|
 		options[:force] = true
 	end
 
-	opts.on("-F", "--format", "Change the display format by an alternatif") do |b|
+	opts.on('-F', '--format', I18n.t('cli.option.format')) do |b|
 		options[:format] = true
 	end
 
-	opts.on("-h", "--help", "Show this message") do |b|
+	opts.on('-h', '--help', I18n.t('cli.option.help')) do |b|
 		puts opts
 		exit 0
 	end