Merging Aurora to Central
authorTheo Chevalier <theo.chevalier11@gmail.com>
Wed, 11 Nov 2015 03:46:49 +0100
changeset 5532 76116d325923dc623009a1885497124b04d61e96
parent 5530 1b8ddbf884db6bbf50275e71d04af9af9c79abdd (current diff)
parent 5531 4b7ab846e94a87201fbb48a362864ac9b6ddb44f (diff)
child 5533 b98e5dd7c7abd3d3f8961a1f85baaf6deeee2678
push id4248
push usertheo.chevalier11@gmail.com
push dateWed, 11 Nov 2015 02:46:56 +0000
Merging Aurora to Central
browser/chrome/browser/loop/loop.properties
--- a/browser/chrome/browser/loop/loop.properties
+++ b/browser/chrome/browser/loop/loop.properties
@@ -19,16 +19,18 @@ sign_in_again_title_line_one=Veuillez vous connecter à nouveau
 sign_in_again_title_line_two2=pour continuer à utiliser {{clientShortname2}}
 sign_in_again_button=Se connecter
 ## LOCALIZATION_NOTE(sign_in_again_use_as_guest_button2): {{clientSuperShortname}}
 ## will be replaced by the super short brandname.
 sign_in_again_use_as_guest_button2=Utiliser {{clientSuperShortname}} en tant qu'invité
 
 panel_browse_with_friend_button=Consulter cette page avec un ami
 panel_stop_sharing_tabs_button=Arrêter de partager les onglets
+panel_start_conversation_button=Lancer une conversation
+panel_end_conversation_button=Terminer la conversation
 
 first_time_experience_button_label=Démarrer
 ## LOCALIZATION_NOTE(first_time_experience_subheading): Message inviting the
 ## user to create his or her first conversation.
 first_time_experience_subheading=Rejoignez la conversation
 
 invite_header_text2=Invitez un ami à vous rejoindre
 ## LOCALIZATION_NOTE(invite_copy_link_button, invite_copied_link_button,
@@ -194,16 +196,22 @@ tour_label=Visite guidée
 
 rooms_leave_button_label=Quitter
 ## LOCALIZATION NOTE (rooms_list_recently_browsed): String is in all caps
 ## for emphasis reasons, it is a heading. Proceed as appropriate for locale.
 rooms_list_recently_browsed=NAVIGATION RÉCENTE
 ## LOCALIZATION NOTE (rooms_list_currently_browsing): String is in all caps
 ## for emphasis reasons, it is a heading. Proceed as appropriate for locale.
 rooms_list_currently_browsing=NAVIGATION EN COURS
+## LOCALIZATION NOTE (rooms_list_all_conversations_header): String is in all caps
+## for emphasis reasons, it is a heading. Proceed as appropriate for locale.
+rooms_list_all_conversations_header=CONVERSATIONS EN COURS
+## LOCALIZATION NOTE (rooms_list_opened_conversation_header): String is in all caps
+## for emphasis reasons, it is a heading. Proceed as appropriate for locale.
+rooms_list_opened_conversation_header=CONVERSATION EN COURS
 rooms_change_failed_label=La conversation ne peut pas être mise à jour
 rooms_panel_title=Sélectionnez une conversation ou démarrez-en une nouvelle
 rooms_room_full_label=Il y a deux personnes dans cette conversation.
 rooms_room_full_call_to_action_nonFx_label=Téléchargez {{brandShortname}} pour lancer la vôtre
 rooms_room_full_call_to_action_label=En savoir plus sur {{clientShortname}} »
 rooms_room_joined_label=Quelqu'un a rejoint la conversation.
 rooms_room_join_label=Rejoindre la conversation
 rooms_signout_alert=Les conversations ouvertes vont être fermées