merge fx-team to mozilla-central a=merge

This commit is contained in:
Carsten "Tomcat" Book 2014-10-13 13:16:05 +02:00
commit 4ade16bc2f
3 changed files with 5 additions and 5 deletions

View File

@ -117,8 +117,7 @@ loop.webapp = (function($, _, OT, mozL10n) {
render: function() {
return (
React.DOM.h1({className: "standalone-header-title"},
React.DOM.strong(null, mozL10n.get("brandShortname")),
mozL10n.get("clientShortname2")
React.DOM.strong(null, mozL10n.get("clientShortname2"))
)
);
}
@ -457,6 +456,7 @@ loop.webapp = (function($, _, OT, mozL10n) {
var privacyNoticeName = mozL10n.get("privacy_notice_link_text");
var tosHTML = mozL10n.get("legal_text_and_links", {
"clientShortname": mozL10n.get("clientShortname2"),
"terms_of_use_url": "<a target=_blank href='" +
mozL10n.get("legal_website") + "'>" +
tosLinkName + "</a>",

View File

@ -117,8 +117,7 @@ loop.webapp = (function($, _, OT, mozL10n) {
render: function() {
return (
<h1 className="standalone-header-title">
<strong>{mozL10n.get("brandShortname")}</strong>
{mozL10n.get("clientShortname2")}
<strong>{mozL10n.get("clientShortname2")}</strong>
</h1>
);
}
@ -457,6 +456,7 @@ loop.webapp = (function($, _, OT, mozL10n) {
var privacyNoticeName = mozL10n.get("privacy_notice_link_text");
var tosHTML = mozL10n.get("legal_text_and_links", {
"clientShortname": mozL10n.get("clientShortname2"),
"terms_of_use_url": "<a target=_blank href='" +
mozL10n.get("legal_website") + "'>" +
tosLinkName + "</a>",

View File

@ -38,7 +38,7 @@ initiate_audio_video_call_button2=Start
initiate_audio_video_call_tooltip2=Start a video conversation
initiate_audio_call_button2=Voice conversation
initiate_call_cancel_button=Cancel
legal_text_and_links=By using this product you agree to the {{terms_of_use_url}} and {{privacy_notice_url}}
legal_text_and_links=By using {{clientShortname}} you agree to the {{terms_of_use_url}} and {{privacy_notice_url}}
terms_of_use_link_text=Terms of use
privacy_notice_link_text=Privacy notice
invite_header_text=Invite someone to join you.