589468 - Change "computer" to "device" in all strings regarding Firefox Sync

Status: RESOLVED FIXED

(Firefox :: Sync, defect)

Description

[Hubert Gajewski]

In Firefox Sync we use "computer" word in many places.

Since I can use Sync on mobile devices I assume that we should change a word "computer" to "device" in all places regarding Firefox Sync

An example:
browser/locales/en-US/chrome/browser/syncSetup.dtd

Actual Result:
<!ENTITY setup.choicePage.existing.label  "I'm already using &syncBrand.shortName.label; on another computer">

Expected Result:
<!ENTITY setup.choicePage.existing.label  "I'm already using &syncBrand.shortName.label; on another device">

Comment 1

[Allison Naaktgeboren :ally]

I have double checked the android dtd & the desktop dtd and there is no longer any mention of computer. If you find a particular instance, please reopen and I will fix. :)

Comment 2

[Hubert Gajewski]

Hmm... http://mxr.mozilla.org/mozilla-central/search?string=computer&find={dtd%2Cproperties}&findi=&filter=[sS]ync&hitlimit=&tree=mozilla-central

In most of cases it should be changed.

Comment 3

[Allison Naaktgeboren :ally]

and now it is my problem. :)

Note that some of that mobile xul is deprecated so I do not intend to update those.

Comment 4

[Allison Naaktgeboren :ally]

Attachment: string renaming, part 1/1, v0

liuche: this contains android string changes, as discussed in irc

NB: 
- The naming in the list may look inconsistent, but I tried to keep within the style of a given file, and they are non consistent with each other.
- I updated references in comments to particular entities that need to be manually kept identical so that future localizers will not be confused. 
- String list & their transformations:
  1 syncTabsMenu.label -> syncTabsMenu2.label
  2 tabs.otherComputers.label -> tabs.otherDevices.label
  3 syncKey.page.description -> syncKey.page.description2
  4 syncKey.keepItSafe4.description ->syncKey.keepItSafe4a.description
  5 syncComputerName.label -> syncDeviceName.label;"
  6 syncComputerName.accesskey -> syncDeviceName.accesskey;"
  7 tabs.otherComputers.label -> tabs.otherDevices.label
  8 syncTabsMenu.label -> syncTabsMenu2.label): 
  9 syncComputerName.label -> syncDeviceName.label
 10 syncComputerName.accesskey ->  syncDeviceName.accesskey
 11 syncKey.page.description ->  syncKey.page.description2 
 12 localizations notes comment was changed so as not to confuse future readers
 13 setup.choicePage.existing.label -> setup.choicePage.existing2.label 
 14 choice2.merge.main.label -> choice2a.merge.main.label       
 15 choice2.client.main.label  ->   choice2a.client.main.label  
 16 choice2.server.main.label  -> choice2a.server.main.label    
 17 confirm.merge.label  ->   confirm.merge2.label    
 18 confirm.client2.label  ->   confirm.client3.label 
 19 confirm.client.moreinfo.label -> confirm.client2.moreinfo.label
 20 resetClient.change.label -> resetClient.change2.label 
 21 wipeClient.change.label -> wipeClient.change2.label   
 22 wipeRemote.change.label -> wipeRemote.change2.label   
 23 remote.missing.label -> remote.missing2.label 
 24 sync.subtitle.header.label -> sync.subtitle.header2.label
 25 sync.fallback -> sync.fallback2
 26 sync.update.remote -> sync.update.remote2
 27 sync.message.notabs -> sync.message.notabs2

Comment 5

[Allison Naaktgeboren :ally]

Comment on attachment 653646 [details] [diff] [review]
string renaming, part 1/1, v0

liuche & rnewman are on pto. Hey nalexander, want to look over the mobile strings? :D

Comment 6

[Nick Alexander :nalexander [he/him]]

Comment on attachment 653646 [details] [diff] [review]
string renaming, part 1/1, v0

Review of attachment 653646 [details] [diff] [review]:
-----------------------------------------------------------------

Everything looks fine but this needs to be landed on a-s github separately.  I'll prepare that and then we can land this as two patches, one for desktop, one for mobile.  Cool?

Comment 7

[Nick Alexander :nalexander [he/him]]

Hi ally, moving on the Android Sync side of this.  How do we feel about:

<!ENTITY sync.subtitle.connectlocation.label 'Select “&sync.title.pair.label;” in the &syncBrand.shortName.label; section of your desktop Firefox options.'>

Strictly speaking, we should probably update this label to be device neutral as well.  How about:

'Select “&sync.title.pair.label;” in the &syncBrand.shortName.label; section of your other device's Firefox options.'

Comment 8

[Nick Alexander :nalexander [he/him]]

See https://github.com/mozilla-services/android-sync/pull/249 for a-s github.

Comment 9

[Richard Newman [:rnewman]]

That works for me. It's a compromise, inevitably.

Comment 10

[Nick Alexander :nalexander [he/him]]

(In reply to Nick Alexander :nalexander from comment #8)
> See https://github.com/mozilla-services/android-sync/pull/249 for a-s github.

ally: you want to r+ this?  I'll land on github and post the patch as part 1/2 here, then you can update your patch as 2/2 and we can land on m-i?

Comment 11

[Allison Naaktgeboren :ally]

Nick, I can't r+ your patch, as I don't have peership, and my patch has yet to get an r+ from a desktop reviewer (in this case, mconnor).

Your changes sound fine to me, but my opinion doesn't mean anything official. :)

Comment 12

[Richard Newman [:rnewman]]

(In reply to Nick Alexander :nalexander from comment #10)
> (In reply to Nick Alexander :nalexander from comment #8)
> > See https://github.com/mozilla-services/android-sync/pull/249 for a-s github.
> 
> ally: you want to r+ this?  I'll land on github and post the patch as part
> 1/2 here, then you can update your patch as 2/2 and we can land on m-i?

r+.

Comment 13

[Nick Alexander :nalexander [he/him]]

Attachment: Patch against m-i

Here's the Sync part of this.  It's been checked into github but hasn't been merged into m-i.

Comment 14

[Nick Alexander :nalexander [he/him]]

I tried to update your patch on top of this, but it really doesn't apply to m-i.  I'll let you handle that.

Comment 15

[Mike Connor [:mconnor]]

Comment on attachment 653646 [details] [diff] [review]
string renaming, part 1/1, v0

Review of attachment 653646 [details] [diff] [review]:
-----------------------------------------------------------------

::: browser/locales/en-US/chrome/browser/syncSetup.dtd
@@ +102,2 @@
>  
>  <!-- Confirm Merge Options -->

There's probably a followup in here about how this and the syncSetup.properties changes make inconsistent use of the brand substitution stuff.  not a priority, but should file for when we revisit this UI.

::: mobile/android/locales/en-US/chrome/sync.properties
@@ +30,4 @@
>  sync.setup.tryagain=Try again
>  sync.setup.manual=Manual setup
>  
> +sync.message.notabs2=No tabs from your other device(s).

I think "devices" is sufficient here.  The (s) seems awkward, and I'd skip it.

Comment 16

[Mike Connor [:mconnor]]

Please note that Nick landed the string I asked to be changed, so please fix before that merges to m-i

Comment 17

[Nick Alexander :nalexander [he/him]]

(In reply to Mike Connor [:mconnor] from comment #16)
> Please note that Nick landed the string I asked to be changed, so please fix
> before that merges to m-i

Just to be clear: I did not land anything on any HG tree.  The patch I posted has landed on android-sync github and needs to be committed to m-i (or s-c, I suppose) with the desktop changes.

Comment 18

[Allison Naaktgeboren :ally]

I pulled the mobile changes from my patch, and marked my patch as 1/2. Nick, when gps gets in, we'll try the coordination dance.

Comment 19

[Allison Naaktgeboren :ally]

Attachment: hg friendly version

since my account is currently disabled, someone else will have to land

Comment 20

[Nick Alexander :nalexander [he/him]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/82bf0d1d370b
https://hg.mozilla.org/integration/mozilla-inbound/rev/e874ca7eba4a

Comment 21

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/82bf0d1d370b
https://hg.mozilla.org/mozilla-central/rev/e874ca7eba4a

Comment 22

[Francesco Lodolo [:flod]]

http://mxr.mozilla.org/mozilla-central/source/browser/locales/en-US/chrome/browser/syncSetup.dtd#105

confirm.merge2.label    "&syncBrand.fullName.label; will now merge all this device's browser data into your Sync account.

Shouldn't it be &syncBrand.fullName.label; instead of Sync here?

Comment 23

[Richard Newman [:rnewman]]

(In reply to Francesco Lodolo [:flod] from comment #22)

> Shouldn't it be &syncBrand.fullName.label; instead of Sync here?

shortName, perhaps. But this bug was quite limited in scope.