+++ This bug was initially created as a clone of Bug #1219259 +++ STR: 1. Launch Browser 2. Sign in with Firefox account and password Expected Result: - The new string is "Success! Your Firefox Account is ready to go! In the future, you can access and manage your account from Settings." Actual Result: - The string is "Sync enabled. Firefox will begin syncing bookmarks momentarily. You can choose what to sync in browser settings."

This screenshot shows the dialog with the correct message.

Both master and v2.5 branches work for me ========== master ============ commit 4d59fbe7aeac4a3fd16135d2f52be47f4b189b43 Merge: c1eb5b2 e243549 Author: Hubert Figuière <hub@figuiere.net> Date: Wed Nov 25 15:00:25 2015 -0500 Merge pull request #33339 from hfiguiere/bug1218520-radio-favs-test-part2 Bug 1218520 - Part 2: Test more favourite/bookmarks. Remove scrollIntoView() r=justindarc

It is incorrect message. Please check the document "TV 2.5 New string". The new string should be "Success! Your Firefox Account is ready to go! In the future, you can access and manage your account from Settings." (In reply to Sean Lee [:seanlee][:weilonge] from comment #1) > Created attachment 8692277 [details] > Screen Shot 2015-11-26 at 10.30.52.png > > This screenshot shows the dialog with the correct message.

@Josh, string changes here. Should we inform our partner?

Comment on attachment 8692323 [details] [gaia] weilonge:seanlee/TVBrowser/master/Bug1227860 > mozilla-b2g:master Just string change.

Merged into master: https://github.com/mozilla-b2g/gaia/commit/6946abd0302f0506334e13ec2d14945c4c04f978

Comment on attachment 8692323 [details] [gaia] weilonge:seanlee/TVBrowser/master/Bug1227860 > mozilla-b2g:master [Approval Request Comment] [Bug caused by] (feature/regressing bug #): bug 1223379 [User impact] if declined: Incorrect wording [Testing completed]: Test on b2g desktop [Risk to taking this patch] (and alternatives if risky): none [String changes made]: Yes

Comment on attachment 8692323 [details] [gaia] weilonge:seanlee/TVBrowser/master/Bug1227860 > mozilla-b2g:master Approve for TV Datasync 2.5

problems during uplift: Tomcats-MacBook-Pro-2:gaia Tomcat$ git cherry-pick 93f6c20cf2093159fed7cff18598c19a33855b49 error: could not apply 93f6c20... Bug 1227860 - Fix the l10n string in Success page. r=danhuang hint: after resolving the conflicts, mark the corrected paths hint: with 'git add <paths>' or 'git rm <paths>'

Hey Tomcat, Please uplift the patch in bug 1219259, then uplift the one in this bug. Thank you.

(In reply to Sean Lee [:seanlee][:weilonge] from comment #11) > Hey Tomcat, Please uplift the patch in bug 1219259, then uplift the one in > this bug. Thank you. yeah only that 1219259 has problems itself to apply

Hi Josh, Could you please find someone to fix this issue in v2.5? Thank you. ======= Passed in Master branch ==================== commit ff662257263e9d71f8202d9d61a1b2035944e346 Merge: af7fe55 ae5cbee Author: Johan Lorenzo <jlorenzo@mozilla.com> Date: Fri Dec 4 12:26:37 2015 +0100 ======= Failed in v2.5 branch ==================== Commit 2d54c29f429bed790b5d8284633812dc2b782518 Author: Fischer.json <foxbrush@Fischerjsons-MacBook-Pro.local> Date: Mon Nov 30 15:06:13 2015 +0800 Bug 1228929 - [TV] Seperate the Send-to-TV offline content from the iframe. r=rexboy, a=jocheng

https://github.com/mozilla-b2g/gaia/commit/325ba55ae771a83c36d7469a452d4e5a31d9edca for 2.5 was able to uplift now that the conflict in bug 1219259 is resolved :)

Hi Cynthia, Could you verify this again on 2.5? Thanks

Verified on: Branch v2.5 Commit 062e0fa48c1b5d5156f6911a5a4519128fac3231 Author: danhuang1202 <danhuang1202@gmail.com> Date: Fri Nov 27 16:53:24 2015 +0800