wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1060525 - Various string changes for Loop based on UX feedback. rs=MattN

Browse Source
This commit is contained in:
Jared Wein 2014-09-01 01:14:03 -04:00
parent 677f184d94
commit 39b082a4bc
9 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
browser/components/loop/content/js/conversation.js
View File

@ -98,7 +98,7 @@ loop.conversation = (function(OT, mozL10n) {
React.DOM.button({className: btnClassDecline,
onClick: this._handleDecline},
__("incoming_call_decline_button")
__("incoming_call_cancel_button")
),
React.DOM.div({className: "btn-chevron",
onClick: this._toggleDeclineMenu}
@ -107,7 +107,7 @@ loop.conversation = (function(OT, mozL10n) {
React.DOM.ul({className: dropdownMenuClassesDecline},
React.DOM.li({className: "btn-block", onClick: this._handleDeclineBlock},
__("incoming_call_decline_and_block_button")
__("incoming_call_cancel_and_block_button")
)
)
@ -121,14 +121,14 @@ loop.conversation = (function(OT, mozL10n) {
React.DOM.button({className: btnClassAccept,
onClick: this._handleAccept("audio-video")},
React.DOM.span({className: "fx-embedded-answer-btn-text"},
__("incoming_call_answer_button")
__("incoming_call_accept_button")
),
React.DOM.span({className: "fx-embedded-btn-icon-video"}
)
),
React.DOM.div({className: "call-audio-only",
onClick: this._handleAccept("audio"),
title: __("incoming_call_answer_audio_only_tooltip")}
title: __("incoming_call_accept_audio_only_tooltip")}
)
)
),
@ -334,7 +334,7 @@ loop.conversation = (function(OT, mozL10n) {
* Call has ended, display a feedback form.
*/
feedback: function() {
document.title = mozL10n.get("call_has_ended");
document.title = mozL10n.get("conversation_has_ended");
var feebackAPIBaseUrl = navigator.mozLoop.getLoopCharPref(
"feedback.baseUrl");

10
browser/components/loop/content/js/conversation.jsx
View File

@ -98,7 +98,7 @@ loop.conversation = (function(OT, mozL10n) {
<button className={btnClassDecline}
onClick={this._handleDecline}>
{__("incoming_call_decline_button")}
{__("incoming_call_cancel_button")}
</button>
<div className="btn-chevron"
onClick={this._toggleDeclineMenu}>
@ -107,7 +107,7 @@ loop.conversation = (function(OT, mozL10n) {
<ul className={dropdownMenuClassesDecline}>
<li className="btn-block" onClick={this._handleDeclineBlock}>
{__("incoming_call_decline_and_block_button")}
{__("incoming_call_cancel_and_block_button")}
</li>
</ul>
@ -121,14 +121,14 @@ loop.conversation = (function(OT, mozL10n) {
<button className={btnClassAccept}
onClick={this._handleAccept("audio-video")}>
<span className="fx-embedded-answer-btn-text">
{__("incoming_call_answer_button")}
{__("incoming_call_accept_button")}
</span>
<span className="fx-embedded-btn-icon-video">
</span>
</button>
<div className="call-audio-only"
onClick={this._handleAccept("audio")}
title={__("incoming_call_answer_audio_only_tooltip")} >
title={__("incoming_call_accept_audio_only_tooltip")} >
</div>
</div>
</div>
@ -334,7 +334,7 @@ loop.conversation = (function(OT, mozL10n) {
* Call has ended, display a feedback form.
*/
feedback: function() {
document.title = mozL10n.get("call_has_ended");
document.title = mozL10n.get("conversation_has_ended");
var feebackAPIBaseUrl = navigator.mozLoop.getLoopCharPref(
"feedback.baseUrl");

4
browser/components/loop/content/js/panel.js
View File

@ -207,8 +207,8 @@ loop.panel = (function(_, mozL10n) {
_generateMailTo: function() {
return encodeURI([
"mailto:?subject=" + __("share_email_subject2") + "&",
"body=" + __("share_email_body2", {callUrl: this.state.callUrl})
"mailto:?subject=" + __("share_email_subject3") + "&",
"body=" + __("share_email_body3", {callUrl: this.state.callUrl})
].join(""));
},

4
browser/components/loop/content/js/panel.jsx
View File

@ -207,8 +207,8 @@ loop.panel = (function(_, mozL10n) {
_generateMailTo: function() {
return encodeURI([
"mailto:?subject=" + __("share_email_subject2") + "&",
"body=" + __("share_email_body2", {callUrl: this.state.callUrl})
"mailto:?subject=" + __("share_email_subject3") + "&",
"body=" + __("share_email_body3", {callUrl: this.state.callUrl})
].join(""));
},

2
browser/components/loop/standalone/content/js/webapp.js
View File

@ -73,7 +73,7 @@ loop.webapp = (function($, _, OT, webL10n) {
React.DOM.div({className: "info-panel"},
React.DOM.div({className: "firefox-logo"}),
React.DOM.h1(null, __("call_url_unavailable_notification_heading")),
React.DOM.h4(null, __("call_url_unavailable_notification_message"))
React.DOM.h4(null, __("call_url_unavailable_notification_message2"))
),
PromoteFirefoxView({helper: this.props.helper})
)

2
browser/components/loop/standalone/content/js/webapp.jsx
View File

@ -73,7 +73,7 @@ loop.webapp = (function($, _, OT, webL10n) {
<div className="info-panel">
<div className="firefox-logo" />
<h1>{__("call_url_unavailable_notification_heading")}</h1>
<h4>{__("call_url_unavailable_notification_message")}</h4>
<h4>{__("call_url_unavailable_notification_message2")}</h4>
</div>
<PromoteFirefoxView helper={this.props.helper} />
</div>

14
browser/components/loop/standalone/content/l10n/data.ini
View File

@ -1,6 +1,8 @@
## LOCALIZATION NOTE: In this file, don't translate the part between {{..}}
[en]
call_has_ended=Your call has ended.
restart_call=Rejoin
begin_call_prompt=Ready to start your conversation?
conversation_has_ended=Your conversation has ended.
call_timeout_notification_text=Your call did not go through.
missing_conversation_info=Missing conversation information.
network_disconnected=The network connection terminated abruptly.
@ -12,7 +14,8 @@ mute_local_audio_button_title=Mute your audio
unmute_local_audio_button_title=Unmute your audio
mute_local_video_button_title=Mute your video
unmute_local_video_button_title=Unmute your video
start_call=Start the call
start_call_no_identity=Start conversation?
start_call_identity=Conversation with {{incomingCallIdentity}}
welcome=Welcome to the {{clientShortname}} web client.
incompatible_browser=Incompatible Browser
powered_by_webrtc=The audio and video components of {{clientShortname}} are powered by WebRTC.
@ -22,14 +25,14 @@ sorry_device_unsupported=Sorry, {{clientShortname}} does not currently support y
use_firefox_windows_mac_linux=Please open this page using the latest {{brandShortname}} on Windows, Android, Mac or Linux.
connection_error_see_console_notification=Call failed; see console for details.
call_url_unavailable_notification_heading=Oops!
call_url_unavailable_notification_message=This URL is unavailable.
call_url_unavailable_notification_message2=Sorry, this URL is not available. It may be expired or entered incorrectly.
promote_firefox_hello_heading=Download {{brandShortname}} to make free audio and video calls!
get_firefox_button=Get {{brandShortname}}
call_url_unavailable_notification=This URL is unavailable.
initiate_call_button_label=Click Call to start a video chat
initiate_audio_video_call_button=Call
initiate_audio_video_call_tooltip=Start a video call
initiate_audio_call_button=Voice call
reject_incoming_call=Cancel
legal_text_and_links=By using this product 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
@ -39,7 +42,6 @@ clientShortname=WebRTC!
call_url_creation_date_label=(from {{call_url_creation_date}})
[fr]
call_has_ended=L'appel est terminé.
call_timeout_notification_text=Votre appel n'a pas abouti.
missing_conversation_info=Informations de communication manquantes.
network_disconnected=La connexion réseau semble avoir été interrompue.
@ -50,7 +52,6 @@ mute_local_audio_button_title=Couper la diffusion audio
unmute_local_audio_button_title=Reprendre la diffusion audio
mute_local_video_button_title=Couper la diffusion vidéo
unmute_local_video_button_title=Reprendre la diffusion vidéo
start_call=Démarrer l'appel
welcome=Bienvenue sur {{clientShortname}}.
incompatible_browser=Navigateur non supporté
powered_by_webrtc=Les fonctionnalités audio et vidéo de {{clientShortname}} utilisent WebRTC.
@ -59,6 +60,5 @@ incompatible_device=Plateforme non supportée
sorry_device_unsupported=Désolé, {{clientShortname}} ne fonctionne actuellement pas sur votre appareil.
use_firefox_windows_mac_linux=Merci d'ouvrir cette page avec une version récente de {{brandShortname}} pour Windows, Android, Mac ou Linux.
call_url_unavailable_notification_heading=Oups !
call_url_unavailable_notification_message=Cette URL n'est pas disponible.
promote_firefox_hello_heading=Téléchargez {{brandShortname}} pour passer des appels audio et vidéo gratuitement !
get_firefox_button=Téléchargez {{brandShortname}}

4
browser/components/loop/test/desktop-local/panel_test.js
View File

@ -264,9 +264,9 @@ describe("loop.panel", function() {
getStrings: function(key) {
var text;
if (key === "share_email_subject2")
if (key === "share_email_subject3")
text = "email-subject";
else if (key === "share_email_body2")
else if (key === "share_email_body3")
text = "{{callUrl}}";
return JSON.stringify({textContent: text});

18
browser/locales/en-US/chrome/browser/loop/loop.properties
View File

@ -14,12 +14,13 @@ unable_retrieve_url=Sorry, we were unable to retrieve a call url.
# Conversation Window Strings
begin_call_prompt=Ready to start your conversation?
incoming_call_title=Incoming Call…
incoming_call=Incoming call
incoming_call_answer_button=Answer
incoming_call_answer_audio_only_tooltip=Answer with voice
incoming_call_decline_button=Decline
incoming_call_decline_and_block_button=Decline and Block
incoming_call_accept_button=Accept
incoming_call_accept_audio_only_tooltip=Accept with voice
incoming_call_cancel_button=Cancel
incoming_call_cancel_and_block_button=Cancel and Block
incoming_call_block_button=Block
hangup_button_title=Hang up
hangup_button_caption=End Call
@ -29,7 +30,8 @@ mute_local_video_button_title=Mute your video
unmute_local_video_button_title=Unmute your video
peer_ended_conversation2=The person you were calling has ended the conversation.
call_has_ended=Your call has ended.
conversation_has_ended=Your conversation has ended.
restart_call=Rejoin
cannot_start_call_session_not_ready=Can't start call, session is not ready.
network_disconnected=The network connection terminated abruptly.
@ -61,10 +63,10 @@ feedback_back_button=Back
## In this item, don't translate the part between {{..}}
feedback_window_will_close_in2=This window will close in {{countdown}} second;This window will close in {{countdown}} seconds
share_email_subject2=Invitation to chat
## LOCALIZATION NOTE (share_email_body2): In this item, don't translate the
share_email_subject3=You have been invited to a conversation
## LOCALIZATION NOTE (share_email_body3): In this item, don't translate the
## part between {{..}} and leave the \r\n\r\n part alone
share_email_body2=Please click this link to call me:\r\n\r\n{{callUrl}}
share_email_body3=To accept this invitation, just copy or click this link to start your conversation:\r\n\r\n{{callUrl}}
share_button=Email
copy_url_button=Copy
copied_url_button=Copied!