Bug 1105537 - Add string in prepartion for upcoming Loop improvements. r=MattN

browser/components/loop/content/js/contacts.js

@@ -635,7 +635,7 @@ loop.contacts = (function(_, mozL10n) {
           React.DOM.input({ref: "email", type: "email", required: phoneOrEmailRequired, 
                  className: cx({pristine: this.state.pristine}), 
                  valueLink: this.linkState("email")}), 
-          React.DOM.label(null, mozL10n.get("new_contact_phone_placeholder")), 
+          React.DOM.label(null, mozL10n.get("new_contact_fxos_phone_placeholder")), 
           React.DOM.input({ref: "tel", type: "tel", required: phoneOrEmailRequired, 
                  className: cx({pristine: this.state.pristine}), 
                  valueLink: this.linkState("tel")}), 

browser/components/loop/content/js/contacts.jsx

@@ -635,7 +635,7 @@ loop.contacts = (function(_, mozL10n) {
           <input ref="email" type="email" required={phoneOrEmailRequired}
                  className={cx({pristine: this.state.pristine})}
                  valueLink={this.linkState("email")} />
-          <label>{mozL10n.get("new_contact_phone_placeholder")}</label>
+          <label>{mozL10n.get("new_contact_fxos_phone_placeholder")}</label>
           <input ref="tel" type="tel" required={phoneOrEmailRequired}
                  className={cx({pristine: this.state.pristine})}
                  valueLink={this.linkState("tel")} />

browser/locales/en-US/chrome/browser/loop/loop.properties

@@ -97,7 +97,8 @@ new_contact_button=New Contact
 ## and click the 'New Contact' button to see the fields.
 new_contact_name_placeholder=Name
 new_contact_email_placeholder=Email
-new_contact_phone_placeholder=Firefox OS Phone
+new_contact_fxos_phone_placeholder=Firefox OS Phone
+new_contact_phone_placeholder2=Phone
 
 contacts_blocked_contacts=Blocked Contacts
 
@@ -122,17 +123,13 @@ importing_contacts_progress_button=Importing…
 ## LOCALIZATION NOTE(sync_contacts_button): This button is displayed in place of
 ## importing_contacts_button once contacts have been imported once.
 sync_contacts_button=Sync Contacts
+
 ## LOCALIZATION NOTE(import_failed_description simple): Displayed when an import of
 ## contacts fails. This is displayed in the error field here:
 ## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#error
 import_failed_description_simple=Sorry, contact import failed
-## LOCALIZATION NOTE(import_failed_description): Displayed when an import of contacts
-## fails and the user may need more help. In this item, don't translate the part between
-## {{..}} because this will be replaced by the label from import_failed_support_link_label.
-## This is displayed in the error field here:
-## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#error
-import_failed_description=Sorry, contact import failed, please see our {{import_failed_support_link_label}} for help
-import_failed_support_link_label=support site
+import_failed_description_some=Some contacts could not be imported
+import_failed_support_button=Help
 
 ## LOCALIZATION NOTE(remove_contact_menu_button): Displayed in the contact list in
 ## a pop-up menu next to the contact's name.
@@ -309,6 +306,8 @@ rooms_list_delete_tooltip=Delete conversation
 rooms_list_deleteConfirmation_label=Are you sure?
 rooms_list_no_current_conversations=No current conversations
 rooms_name_this_room_label=Name this conversation
+rooms_name_this_room_tooltip=Click to edit the room name
+rooms_name_change_failed_label=Conversation cannot be renamed
 rooms_new_room_button_label=Start a conversation
 rooms_only_occupant_label=You're the first one here.
 rooms_panel_title=Choose a conversation or start a new one
@@ -317,3 +316,4 @@ rooms_room_full_call_to_action_nonFx_label=Download {{brandShortname}} to start
 rooms_room_full_call_to_action_label=Learn more about {{clientShortname}} »
 rooms_room_joined_label=Someone has joined the conversation!
 rooms_room_join_label=Join the conversation
+rooms_signout_alert=Open conversations will be closed