diff --git a/i18n/en.yml b/i18n/en.yml
index a81fced..5c36344 100644
--- a/i18n/en.yml
+++ b/i18n/en.yml
@@ -84,13 +84,13 @@ en:
       not_valid: "No data to import!"
     setup_config:
       title: "Setup a new config file"
-      lang: "Choose your language (en, fr, ...): "
-      gpg_key: "Enter the GPG key: " 
-      wallet_dir: "Enter the wallets's folder path [défaut=%{home}/wallets]: "
+      lang: "Choose your language (en, fr, ...) [default=%{lang}]: "
+      gpg_key: "Enter the GPG key [ex: test@host.local]: " 
+      wallet_dir: "Enter the wallets's folder path [default=%{home}/wallets]: "
       valid: "The config file has been created!"
     setup_wallet:
       title: "Wallet setup"
-      sync_type: "Synchronization type (mpw, ssh, ftp, or nil): "
+      sync_type: "Synchronization type (ssh, ftp, or nil): "
       sync_host: "Synchronization server: "
       sync_port: "Port of the synchronization server: "
       sync_user: "Username for the synchronization: "
@@ -126,11 +126,11 @@ en:
   display:
     comment: "Comment"
     error: "ERROR"
-    gpg_password: "Password GPG: "
+    gpg_password: "GPG passphrase: "
     group: "Group"
     login: "Login"
     name: "Name"
-    nothing: "Nothing result!"
+    nothing: "No matches!"
     password: "Password"
     port: "Port"
     protocol: "Protocol"
diff --git a/i18n/fr.yml b/i18n/fr.yml
index 22309f9..f273aff 100644
--- a/i18n/fr.yml
+++ b/i18n/fr.yml
@@ -85,7 +85,7 @@ fr:
     setup_config:
       title: "Création d'un nouveau fichier de configuration"
       lang: "Choisissez votre langue (en, fr, ...) [défaut=%{lang}]: "
-      gpg_key: "Entrez la clé GPG: " 
+      gpg_key: "Entrez la clé GPG [ex: test@host.local]: " 
       wallet_dir: "Entrez le chemin du répertoire qui contiendra les porte-feuilles de mot de passe [défaut=%{home}/wallets]: "
       valid: "Le fichier de configuration a bien été créé!"
     setup_wallet:
diff --git a/lib/mpw/ui/cli.rb b/lib/mpw/ui/cli.rb
index a41657f..a0d5b29 100644
--- a/lib/mpw/ui/cli.rb
+++ b/lib/mpw/ui/cli.rb
@@ -322,7 +322,7 @@ class Cli
 	def export(file)
 		@mpw.export(file)
 
-		puts "#{I18n.t('export.valid', file)}".green
+		puts "#{I18n.t('export.export.valid', file)}".green
 	rescue Exception => e
 		puts "#{I18n.t('display.error')} #17: #{e}".red
 	end