Bug 750746 - Correct pairing instructions in Sync setup. r=rnewman
authorChenxia Liu <liuche@mozilla.com>
Tue, 15 May 2012 12:32:03 -0700
changeset 98556 9a5c5f2202fc71a7a25334c208502df24ebfe1a0
parent 98555 8ffae46336ed8c0cc6c48d461c212b501d5e6265
child 98557 cdbc3312ae802ef3f9807091844894554394b922
push id173
push userlsblakk@mozilla.com
push dateFri, 24 Aug 2012 15:39:16 +0000
treeherdermozilla-release@bcc45eb1fb41 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrnewman
bugs750746
milestone15.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 750746 - Correct pairing instructions in Sync setup. r=rnewman
mobile/android/base/locales/en-US/sync_strings.dtd
mobile/android/base/resources/layout/sync_setup_pair.xml
mobile/android/sync/strings.xml.in
--- a/mobile/android/base/locales/en-US/sync_strings.dtd
+++ b/mobile/android/base/locales/en-US/sync_strings.dtd
@@ -41,16 +41,17 @@
 <!-- Setup Success -->
 <!ENTITY sync.title.success.label 'Setup Complete'>
 <!ENTITY sync.subtitle.success.label 'Your data is now being downloaded in the background. You can go to Settings to manage your account.'>
 <!ENTITY sync.settings.label 'Settings'>
 <!ENTITY sync.subtitle.manage.label 'Your &syncBrand.fullName.label; account is already set up. Go to Settings to manage your account.'>
 
 <!-- Pair Device -->
 <!ENTITY sync.pair.tryagain.label 'Please try again.'>
+<!ENTITY sync.pair.connectlocation.label 'To activate your new device, select “Set up &syncBrand.shortName.label;” on the device, and then select “I Have an Account.”'>
 
 <!-- Firefox SyncAdapter Settings Screen -->
 <!ENTITY sync.settings.options.label 'Options'>
 <!ENTITY sync.summary.pair.label 'Link another device to your &syncBrand.shortName.label; account'>
 
 <!-- Common text -->
 <!ENTITY sync.button.cancel.label 'Cancel'>
 <!ENTITY sync.button.connect.label 'Connect'>
--- a/mobile/android/base/resources/layout/sync_setup_pair.xml
+++ b/mobile/android/base/resources/layout/sync_setup_pair.xml
@@ -21,17 +21,17 @@
       android:gravity="center"
       android:padding="10dp" >
 
       <TextView
         android:id="@+id/setup_subtitle"
         style="@style/SyncTextItem"
         android:layout_marginTop="20dp"
         android:layout_marginBottom="10dp"
-        android:text="@string/sync_subtitle_connect" />
+        android:text="@string/sync_subtitle_pair" />
 
       <TextView
         style="@style/SyncLinkItem"
         android:layout_marginBottom="10dp"
         android:onClick="showClickHandler"
         android:text="@string/sync_link_show" />
 
       <LinearLayout
--- a/mobile/android/sync/strings.xml.in
+++ b/mobile/android/sync/strings.xml.in
@@ -1,16 +1,16 @@
   <string name="sync_app_name">&sync.app.name.label;</string>
   <string name="sync_title_connect">&sync.title.adddevice.label;</string>
   <string name="sync_title_pair">&sync.title.pair.label;</string>
 
   <!-- J-PAKE PIN Screen -->
   <string name="sync_subtitle_header">&sync.subtitle.header.label;</string>
   <string name="sync_subtitle_connect">&sync.subtitle.connectlocation.label;</string>
-  <string name="sync_subtitle_pair">&sync.subtitle.pair.label;</string>
+  <string name="sync_subtitle_pair">&sync.pair.connectlocation.label;</string>
   <string name="sync_pin_default">&sync.pin.oneline.label;</string>
   <string name="sync_link_show"><u>&sync.link.show.label;</u></string>
   <string name="sync_link_advancedsetup"><u>&sync.link.advancedsetup.label;</u></string>
 
   <!-- J-PAKE Waiting Screen -->
   
   <string name="sync_jpake_subtitle_waiting">&sync.jpake.subtitle.waiting.label;</string>