Fix string ID conflict

master
Daniel Berteaud 11 years ago
parent 15ba0508fe
commit 80734145ac
  1. 4
      lib/Vroom/I18N/en.pm
  2. 4
      lib/Vroom/I18N/fr.pm
  3. 4
      templates/default/join.html.ep

@ -101,8 +101,8 @@ our %Lexicon = (
"MAKE_THIS_ROOM_PERSISTENT" => "Make this room persistent", "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, " . "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.", "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", "A_STANDARD_ROOM_EXPIRES_AFTER_d" => "A standard room will be deleted after %d hour(s) without activity",
"PERSISTENT_ROOMS" => "A persistant room", "A_PERSISTENT_ROOM" => "A persistant room",
"EXPIRE_AFTER_d" => "will be deleted after %d day(s) without activity", "EXPIRE_AFTER_d" => "will be deleted after %d day(s) without activity",
"NEVER_EXPIRE" => "will be kept forever", "NEVER_EXPIRE" => "will be kept forever",
"CONFIRM_PASSWORD" => "Confirm password", "CONFIRM_PASSWORD" => "Confirm password",

@ -109,8 +109,8 @@ our %Lexicon = (
"SET_OWNER_PASS_PERSISTENT" => "Pour rendre ce salon persistant, vous devez saisir un mot de passe " . "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 " . "de gestionnaire. Conservez le soigneusement, il vous permettra de retrouver " .
"l'accès aux menus de configuration quand vous vous reconnectez.", "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é", "A_STANDARD_ROOM_EXPIRES_AFTER_d" => "Un salon classique sera détruit après %d heure(s) sans activité",
"PERSISTENT_ROOMS" => "Un salon persistant", "A_PERSISTENT_ROOM" => "Un salon persistant",
"EXPIRE_AFTER_d" => "sera détruit après %d jour(s) sans activité", "EXPIRE_AFTER_d" => "sera détruit après %d jour(s) sans activité",
"NEVER_EXPIRE" => "est conservé indéfiniement", "NEVER_EXPIRE" => "est conservé indéfiniement",
"CONFIRM_PASSWORD" => "Confirmation du mot de passe", "CONFIRM_PASSWORD" => "Confirmation du mot de passe",

@ -290,9 +290,9 @@
<p> <p>
<%=l 'SET_OWNER_PASS_PERSISTENT' %> <%=l 'SET_OWNER_PASS_PERSISTENT' %>
<ul> <ul>
<li><%= sprintf($self->l('STANDARD_ROOMS_EXPIRE_AFTER_d'), int($config->{inactivityTimeout}/3600)) %></li> <li><%= sprintf($self->l('A_STANDARD_ROOM_EXPIRES_AFTER_d'), int($config->{inactivityTimeout}/3600)) %></li>
<li> <li>
<%=l 'PERSISTENT_ROOMS' %> <%=l 'A_PERSISTENT_ROOM' %>
<% if ($config->{persistentInactivityTimeout} > 0){ %> <% if ($config->{persistentInactivityTimeout} > 0){ %>
<%= sprintf($self->l('EXPIRE_AFTER_d'), int($config->{persistentInactivityTimeout}/(3600*24))) %> <%= sprintf($self->l('EXPIRE_AFTER_d'), int($config->{persistentInactivityTimeout}/(3600*24))) %>
<% } else{ %> <% } else{ %>

Loading…
Cancel
Save