From 80734145ac67d3abeafa59f029f35b79e9587c3e Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Fri, 30 May 2014 12:06:12 +0200 Subject: [PATCH] Fix string ID conflict --- lib/Vroom/I18N/en.pm | 4 ++-- lib/Vroom/I18N/fr.pm | 4 ++-- templates/default/join.html.ep | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/Vroom/I18N/en.pm b/lib/Vroom/I18N/en.pm index ae90059..466c5ef 100644 --- a/lib/Vroom/I18N/en.pm +++ b/lib/Vroom/I18N/en.pm @@ -101,8 +101,8 @@ our %Lexicon = ( "MAKE_THIS_ROOM_PERSISTENT" => "Make this room persistent", "SET_OWNER_PASS_PERSISTENT" => "To make this room persistent, you must set a manager password. Keep it carefully, " . "it'll grant you access to the configuration menus next time you connect.", - "STANDARD_ROOMS_EXPIRE_AFTER_d" => "A standard room will be deleted after %d hour(s) without activity", - "PERSISTENT_ROOMS" => "A persistant room", + "A_STANDARD_ROOM_EXPIRES_AFTER_d" => "A standard room will be deleted after %d hour(s) without activity", + "A_PERSISTENT_ROOM" => "A persistant room", "EXPIRE_AFTER_d" => "will be deleted after %d day(s) without activity", "NEVER_EXPIRE" => "will be kept forever", "CONFIRM_PASSWORD" => "Confirm password", diff --git a/lib/Vroom/I18N/fr.pm b/lib/Vroom/I18N/fr.pm index cca1c2c..a808c0b 100644 --- a/lib/Vroom/I18N/fr.pm +++ b/lib/Vroom/I18N/fr.pm @@ -109,8 +109,8 @@ our %Lexicon = ( "SET_OWNER_PASS_PERSISTENT" => "Pour rendre ce salon persistant, vous devez saisir un mot de passe " . "de gestionnaire. Conservez le soigneusement, il vous permettra de retrouver " . "l'accès aux menus de configuration quand vous vous reconnectez.", - "STANDARD_ROOMS_EXPIRE_AFTER_d" => "Un salon classique sera détruit après %d heure(s) sans activité", - "PERSISTENT_ROOMS" => "Un salon persistant", + "A_STANDARD_ROOM_EXPIRES_AFTER_d" => "Un salon classique sera détruit après %d heure(s) sans activité", + "A_PERSISTENT_ROOM" => "Un salon persistant", "EXPIRE_AFTER_d" => "sera détruit après %d jour(s) sans activité", "NEVER_EXPIRE" => "est conservé indéfiniement", "CONFIRM_PASSWORD" => "Confirmation du mot de passe", diff --git a/templates/default/join.html.ep b/templates/default/join.html.ep index 4f77d5f..91514ff 100644 --- a/templates/default/join.html.ep +++ b/templates/default/join.html.ep @@ -290,9 +290,9 @@

<%=l 'SET_OWNER_PASS_PERSISTENT' %>