diff --git a/i18n/en.yml b/i18n/en.yml
index c55bc49..2331b53 100644
--- a/i18n/en.yml
+++ b/i18n/en.yml
@@ -23,22 +23,22 @@ common-tor-create: Create /etc/tor/onions/ for tor config
 common-tor-config: Load onions from /etc/tor/onions
 # roles/.common/tasks/peering/main.yml
 common-peering-home: Create /home/peers
-common-peering-remote: "Configure peer server {{ item.name }}"
+common-peering-remote: Configure peer server
 # roles/.common/tasks/peering/setup_local.yml
 common-peering-local-account: Create account peer
 common-peering-local-ln: Create symbolic link to the local peer
 common-peering-local-genkey: Generate SSH key for local peer
 common-peering-local-confkey: Force SSH as ed25519 for local peer
 # roles/.common/tasks/peering/setup_peer.yml
-common-peering-remote-account: "Create account for peer server {{ item.name }}"
-common-peering-remote-key: "Configure SSH key for peer {{ item.name }}"
-common-peering-remote-known: "Declare key for server {{ item.name }} on account peer"
+common-peering-remote-account: Create account for peer server
+common-peering-remote-key: Configure SSH key for peer
+common-peering-remote-known: Declare key for peer server on account peer
 # roles/.common/tasks/users/main.yml
 common-users-tor-reload: Reload tor to generate new onions
 common-users-tor-wait: Wait for onions to be generated
 # roles/.common/tasks/users/setup_user.yml
-common-users-setup-account: "Create account {{ item.name }}"
-common-users-setup-sudo: "Give admin powers to {{ item.name }}"
+common-users-setup-account: Create account for new user
+common-users-setup-sudo: Give admin powers to new user
 common-users-setup-key: Authorize associated SSH key
 common-users-setup-onion: Generate a personal onion
 common-users-setup-irc: Welcome the user on IRC
diff --git a/i18n/fr.yml b/i18n/fr.yml
index 6e0a513..8fcbcb8 100644
--- a/i18n/fr.yml
+++ b/i18n/fr.yml
@@ -23,22 +23,22 @@ common-tor-create: Créer /etc/tor/onions pour la config Tor
 common-tor-config: Charger les onions tor depuis /etc/tor/onions
 # roles/.common/tasks/peering/main.yml
 common-peering-home: Créer /home/peers
-common-peering-remote: "Configurer le serveur pair {{ item.name }}"
+common-peering-remote: Configurer le serveur pair
 # roles/.common/tasks/peering/setup_local.yml
 common-peering-local-account: Créer un compte peer
 common-peering-local-ln: Créer un lien symbolique vers le pair local
 common-peering-local-genkey: Créer une clé SSH pour le compte peer
 common-peering-local-confkey: Forcer SSH en ed25519 sur le compte peer
 # roles/.common/tasks/peering/setup_peer.yml
-common-peering-remote-account: "Créer un compte pour le serveur pair {{ item.name }}"
-common-peering-remote-key: "Configurer la clé SSH autorisée pour {{ item.name }}"
-common-peering-remote-known: "Déclarer la clé de {{ item.name }} sur le compte peer"
+common-peering-remote-account: Créer un compte pour le serveur pair
+common-peering-remote-key: Configurer la clé SSH autorisée pour le pair
+common-peering-remote-known: Déclarer la clé du pair sur le compte peer
 # roles/.common/tasks/users/main.yml
 common-users-tor-reload: Redémarrer tor pour générer les nouveaux onions
 common-users-tor-wait: Attendre que les onions soient générés
 # roles/.common/tasks/users/setup_user.yml
-common-users-setup-account: "Create account {{ item.name }}"
-common-users-setup-sudo: "Give admin powers to {{ item.name }}"
+common-users-setup-account: Create account for new user
+common-users-setup-sudo: Give admin powers to new user
 common-users-setup-key: Authorize associated SSH key
 common-users-setup-onion: Generate a personal onion
 common-users-setup-irc: Welcome the user on IRC