From 9bd0de611895a7739ed1c33c9b1c67e65cca97a3 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Thu, 22 Jan 2015 13:51:42 +0100 Subject: [PATCH] Some more cleanups in localizations --- lib/Vroom/Constants.pm | 6 ------ lib/Vroom/I18N/en.pm | 18 ++---------------- lib/Vroom/I18N/fr.pm | 17 +---------------- 3 files changed, 3 insertions(+), 38 deletions(-) diff --git a/lib/Vroom/Constants.pm b/lib/Vroom/Constants.pm index 5114451..01225e2 100644 --- a/lib/Vroom/Constants.pm +++ b/lib/Vroom/Constants.pm @@ -108,12 +108,6 @@ use constant JS_STRINGS => qw( CAM_SUSPENDED CAM_RESUMED SET_YOUR_NAME_TO_CHAT - ROOM_LOCKED_BY_s - ROOM_UNLOCKED_BY_s - PASSWORD_PROTECT_ON_BY_s - PASSWORD_PROTECT_OFF_BY_s - OWNER_PASSWORD_CHANGED_BY_s - OWNER_PASSWORD_REMOVED_BY_s SCREEN_s NO_SOUND_DETECTED DISPLAY_NAME_TOO_LONG diff --git a/lib/Vroom/I18N/en.pm b/lib/Vroom/I18N/en.pm index fdeb20d..fe1be76 100644 --- a/lib/Vroom/I18N/en.pm +++ b/lib/Vroom/I18N/en.pm @@ -37,14 +37,6 @@ our %Lexicon = ( "FROM" => "From", "GIVE_US_YOUR_FEEDBACK" => "Give us your feedback", "YOUR_FEEDBACK_HELPS_US" => "Your feedback (good or bad) can help us improve this application", - "ROOM_LOCKED" => "This room is now locked", - "ROOM_UNLOCKED" => "This room is now unlocked", - "ROOM_LOCKED_BY_s" => "%s locked the room", - "ROOM_UNLOCKED_BY_s" => "%s unlocked the room", - "PASSWORD_PROTECT_ON_BY_s" => "%s password protected the room", - "PASSWORD_PROTECT_OFF_BY_s" => "%s removed password protection", - "OWNER_PASSWORD_CHANGED_BY_s" => "%s changed the room manager password", - "OWNER_PASSWORD_REMOVED_BY_s" => "%s removed the room manager password, so this room isn't persistent anymore", "DATA_WIPED" => "Data has been wiped", "ROOM_DATA_WIPED_BY_s" => "Room data (chat history and pad content) has been wiped by %s", "NOT_ENABLED" => "This feature isn't enabled", @@ -90,8 +82,6 @@ our %Lexicon = ( "DISPLAY_NAME_TOO_LONG" => "This name is too long", "DISPLAY_NAME_REQUIRED" => "You need to enter your name", "SET_A_DISPLAY_NAME" => "Please set your name before you can join the room", - "FORCE_DISPLAY_NAME" => "Participants will be asked for their name before they can join the room", - "NAME_WONT_BE_ASKED" => "Participant won't have to type their name before they can join the room", "WIPE_CHAT_AND_PAD" => "Wipe chat history and pad content", "WIPE_CHAT" => "Wipe chat history", "WIPE_ROOM_DATA" => "Wipe room data", @@ -119,14 +109,10 @@ our %Lexicon = ( "YOU_CAN_PASSWORD_PROTECT_JOIN" => "You can protect this room with a password", "PASSWORD" => "Password", "PASSWORD_PROTECT" => "Password protect", - "PASSWORD_PROTECT_SET" => "A password will be needed to join this room", - "PASSWORD_PROTECT_UNSET" => "No password will be asked to join this room", - "ROOM_NOW_RESERVED" => "This room is now reserved", - "ROOM_NO_MORE_RESERVED" => "This room isn't reserved anymore", "PASSWORDS_DO_NOT_MATCH" => "Passwords do not match", "RESERVE_THIS_ROOM" => "Reserve this room", - "SET_OWNER_PASS" => "To reserve this room, you must set an owner password. Keep it carefully, " . - "it'll grant you access to the configuration menus next time you connect.", + "SET_OWNER_PASS" => "Keep this password carefully, it'll grant you access to the configuration menus ", + "next time you connect.", "A_STANDARD_ROOM_EXPIRES_AFTER_d" => "A standard room will be deleted after %d hour(s) without activity", "A_RESERVED_ROOM" => "A reserved room", "EXPIRE_AFTER_d" => "will be deleted after %d day(s) without activity", diff --git a/lib/Vroom/I18N/fr.pm b/lib/Vroom/I18N/fr.pm index ecffaae..ee59d96 100644 --- a/lib/Vroom/I18N/fr.pm +++ b/lib/Vroom/I18N/fr.pm @@ -41,14 +41,6 @@ our %Lexicon = ( "GIVE_US_YOUR_FEEDBACK" => "Parlez-nous de votre expérience", "YOUR_FEEDBACK_HELPS_US" => "Votre retour d'expérience (bonne ou mauvaise) peut nous aider à améliorer ce service", "INVITE_SENT_TO_s" => "Une invitation a été envoyée à %s", - "ROOM_LOCKED" => "Ce salon est maintenant verrouillé", - "ROOM_UNLOCKED" => "Ce salon est maintenant déverrouillé", - "ROOM_LOCKED_BY_s" => "%s a verrouillé le salon", - "ROOM_UNLOCKED_BY_s" => "%s a déverrouillé le salon", - "PASSWORD_PROTECT_ON_BY_s" => "%s a protégé le salon par un mot de passe", - "PASSWORD_PROTECT_OFF_BY_s" => "%s a supprimé la protection par mot de passe", - "OWNER_PASSWORD_CHANGED_BY_s" => "%s a modifié le mot de passe de gestionnaire du salon", - "OWNER_PASSWORD_REMOVED_BY_s" => "%s a supprimé le mot de passe de gestionnaire du salon. Ce salon n'est donc plus persistant", "DATA_WIPED" => "Les données ont été supprimées", "ROOM_DATA_WIPED_BY_s" => "Les données du salon (historique du tchat, prise de notes) ont été supprimées par %s", "NOT_ENABLED" => "Cette fonctionalité n'est pas activée", @@ -95,8 +87,6 @@ our %Lexicon = ( "DISPLAY_NAME_TOO_LONG" => "Ce nom est trop long", "DISPLAY_NAME_REQUIRED" => "Vous devez entrer votre nom", "SET_A_DISPLAY_NAME" => "Merci de saisir votre nom avant de pouvoir rejoindre le salon", - "FORCE_DISPLAY_NAME" => "Les participants doivent saisir leur nom avant de rejoindre le salon", - "NAME_WONT_BE_ASKED" => "La saisie du nom ne sera plus obligatoire pour rejoindre ce salon", "WIPE_CHAT_AND_PAD" => "Supprimer l'historique du tchat et les prises de notes", "WIPE_CHAT" => "Supprimer l'historique du tchat", "WIPE_ROOM_DATA" => "Suppression des données du salon", @@ -124,14 +114,9 @@ our %Lexicon = ( "YOU_CAN_PASSWORD_PROTECT_JOIN" => "Protéger l'accès au salon par un mot de passe", "PASSWORD" => "Mot de passe", "PASSWORD_PROTECT" => "Protéger par mot de passe", - "PASSWORD_PROTECT_SET" => "Un mot de passe sera demandé pour rejoindre ce salon", - "PASSWORD_PROTECT_UNSET" => "Aucun mot de passe ne sera demandé pour rejoindre ce salon", - "ROOM_NOW_RESERVED" => "Ce salon est maintenant réservé", - "ROOM_NO_MORE_RESERVED" => "Ce salon ne vous est plus réservé", "PASSWORDS_DO_NOT_MATCH" => "Les mots de passe ne correspondent pas", "RESERVE_THIS_ROOM" => "Réserver ce salon", - "SET_OWNER_PASS" => "Pour réserver ce salon, vous devez saisir un mot de passe. " . - "Conservez le soigneusement, il vous permettra de retrouver " . + "SET_OWNER_PASS" => "Conservez ce mot de passe soigneusement, il vous permettra de retrouver " . "l'accès aux menus de configuration quand vous vous reconnecterez.", "A_STANDARD_ROOM_EXPIRES_AFTER_d" => "Un salon classique sera détruit après %d heure(s) sans activité", "A_RESERVED_ROOM" => "Un salon réservé",