Closed Bug 658523 Opened 9 years ago Closed 9 years ago

Update en-GB for SeaMonkey 2.1

Categories

(Mozilla Localizations :: en-GB / English (United Kingdom), defect)

defect
Not set
normal

Tracking

(Not tracked)

RESOLVED FIXED
mozilla2.0

People

(Reporter: iann_bugzilla, Assigned: iann_bugzilla)

References

Details

Attachments

(4 files, 1 obsolete file)

Attached patch The SM2.1 diff patch v1.0 (obsolete) — Splinter Review
This patch hopefully updates en-GB for SeaMonkey 2.1
Assignee: moz_en-gb → iann_bugzilla
Comment on attachment 533965 [details] [diff] [review]
Everything as well as help patch v1.1 [Checked in mozilla-2.0: comment 2]

pre-landed as http://hg.mozilla.org/releases/l10n-mozilla-2.0/en-GB/rev/df691edbbdbb so we can get builds, please have Mark review this officially and land on l10n-central/en-GB once you can.
Attachment #533965 - Flags: review?(moz_en-gb)
Blocks: 658525
Attachment #533970 - Flags: review?(moz_en-gb)
Comment on attachment 533970 [details] [diff] [review]
Patch for searchplugins [Checked in mozilla-2.0: comment 4]

I also landed this one as http://hg.mozilla.org/releases/l10n-mozilla-2.0/en-GB/rev/b71c6cb41106 as else nothing would successfully build.
Blocks: 658818
This patch:
* yze to yse
* center to centre
* enrollment to enrolment
* forward to forwards
* fiber to fibre
* gray to grey
* labeled/ing to labelled/ing
* neighbor to neighbour
* traveling to travelling
* license to licence
Attachment #534260 - Flags: review?(moz_en-gb)
Comment on attachment 533965 [details] [diff] [review]
Everything as well as help patch v1.1 [Checked in mozilla-2.0: comment 2]

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

Whoa! Big patch.

This is great, I have only minor nits.

kB vs KB: while we're using kB, MB, GB and not the official KiB, etc (abominations though they are), we should still follow the convention that kilo- is a lower-case prefix.
Synchronise: "sync" is ugly, and "synch" isn't much better (and may confuse wrt pronunciation).  Where we aren't talking about the branded service, we should use the unabbreviated word.  I think I caught all cases, but I couldn't grok context everywhere.

Access keys: what's here may be the best that's possible, but if not, let's change it.

tl;dr: let's land this and argue the nits after.

::: suite/chrome/browser/metadata.properties
@@ +5,5 @@
>  embeddedText=Embedded
>  unableToShowProps=No properties available.
>  altTextMissing=Missing
>  altTextBlank=Blank
> +imageSize=%S KB (%S bytes)

These were changed intentionally in en-GB

::: suite/chrome/browser/pageInfo.properties
@@ +53,5 @@
>  mediaObject=Object
>  mediaEmbed=Embed
>  mediaLink=Icon
>  mediaInput=Input
> +mediaFileSize=%S KB

ditto

::: suite/chrome/common/bookmarks/places.dtd
@@ +96,5 @@
> +
> +<!ENTITY cmd.find.key  "f">
> +
> +<!ENTITY backButton.tooltip  "Go back">
> +<!ENTITY forwardButton.tooltip  "Go forward">

forwards?
Oh, I see you've caught this in attachment 534260 [details] [diff] [review]!

::: suite/chrome/common/pref/pref-popups.dtd
@@ +18,5 @@
>  
>  <!ENTITY selectSound.label              "Browseâ¦">
>  <!ENTITY selectSound.accesskey          "o">
> +<!ENTITY playSoundButton.label          "Play">
> +<!ENTITY playSoundButton.accesskey      "l">

'l' is sub-optimal. Can we use 'a'? (Genuine question - I haven't seen the overall screen, so something else might be using it).

::: suite/chrome/common/pref/pref-sync.dtd
@@ +32,5 @@
> +<!-- Sync Settings -->
> +<!ENTITY syncComputerName.label       "Computer Name:">
> +<!ENTITY syncComputerName.accesskey   "N">
> +
> +<!ENTITY syncMy2.label              "Sync My:">

"Synchronise"

::: suite/chrome/common/pref/preferences.dtd
@@ +21,5 @@
>  <!ENTITY masterpass.label "Master Passwords">
>  <!ENTITY ssl.label "SSL">
>  <!ENTITY certs.label "Certificates">
>  <!ENTITY validation.label "Validation">
> +<!ENTITY sync.label "Sync">

Synchronisation

::: suite/chrome/common/sync/syncGenericChange.properties
@@ +16,5 @@
> +change.synckey.success      = Your Sync Key was successfully changed!
> +
> +change.synckey.introText   = SeaMonkey Cares About Your Privacy
> +change.synckey.introText2  = To ensure your total privacy, all of your data is encrypted prior to being uploaded. The key to decrypt your data is not uploaded.
> +change.synckey.warningText = Note: Changing this will erase all data stored on the Sync server and upload new data secured by this Sync Key. Your other devices will not sync until the new Sync Key is entered for that device.

Your other devices will not sync until... should be
Your other devices will not _synchronise_ until...

::: suite/chrome/common/sync/syncSetup.dtd
@@ +76,5 @@
> +<!ENTITY resetPassword.label          "Reset Password">
> +<!ENTITY resetSyncKey.label           "I have lost my other device.">
> +
> +<!-- Sync Options -->
> +<!ENTITY setup.optionsPage.title      "Sync Options">

Synchronisation Options

@@ +80,5 @@
> +<!ENTITY setup.optionsPage.title      "Sync Options">
> +<!ENTITY syncComputerName.label       "Computer Name:">
> +<!ENTITY syncComputerName.accesskey   "C">
> +
> +<!ENTITY syncMy.label               "Sync My">

Synchronise My:

::: suite/chrome/common/sync/syncSetup.properties
@@ +1,1 @@
> +button.syncOptions.label       = Sync Options

Synchronisation

@@ +30,5 @@
> +passwordsCount.label        = #1 password;#1 passwords
> +
> +save.synckey.title = Save Sync Key
> +
> +newAccount.action.label = SeaMonkey Sync is now set up to automatically sync all of your browser data.

synchronise

@@ +31,5 @@
> +
> +save.synckey.title = Save Sync Key
> +
> +newAccount.action.label = SeaMonkey Sync is now set up to automatically sync all of your browser data.
> +newAccount.change.label = You can choose exactly what to sync by selecting Sync Options below.

synchronise

@@ +35,5 @@
> +newAccount.change.label = You can choose exactly what to sync by selecting Sync Options below.
> +resetClient.change.label = SeaMonkey Sync will now merge all this computer's browser data into your Sync account.
> +wipeClient.change.label = SeaMonkey Sync will now replace all of the browser data on this computer with the data in your Sync account.
> +wipeRemote.change.label = SeaMonkey Sync will now replace all of the browser data in your Sync account with the data on this computer.
> +existingAccount.change.label = You can change this preference by selecting Sync Options below.

Synchronisation

::: suite/chrome/common/tasksOverlay.dtd
@@ +51,5 @@
> +     Only one of these will show at a time (based on setup state),
> +     so reusing accesskey is ok. -->
> +<!ENTITY syncSetup.label           "Set Up Syncâ¦">
> +<!ENTITY syncSetup.accesskey       "S">
> +<!ENTITY syncSyncNowItem.label     "Sync Now">

Synchronise Now

::: suite/chrome/mailnews/pref/am-server-top.dtd
@@ +24,5 @@
>  <!ENTITY connectionSecurityType-1.label "STARTTLS, if available">
>  <!ENTITY connectionSecurityType-2.label "STARTTLS">
>  <!ENTITY connectionSecurityType-3.label "SSL/TLS">
> +<!ENTITY authMethod.label "Authentication method:">
> +<!ENTITY authMethod.accesskey "i">

"i" is sub-optimal.

::: suite/chrome/mailnews/pref/pref-notifications.dtd
@@ +46,5 @@
>  <!ENTITY showTrayIcon.accesskey           "t">
>  <!ENTITY bounceSystemDockIcon.label       "Animate the Dock icon">
>  <!ENTITY bounceSystemDockIcon.accesskey   "A">
> +<!ENTITY playButton.label                 "Play">
> +<!ENTITY playButton.accesskey             "l">

'l' isn't great. Is 'y' better or worse?
Attachment #533965 - Flags: review?(moz_en-gb) → review+
Comment on attachment 533970 [details] [diff] [review]
Patch for searchplugins [Checked in mozilla-2.0: comment 4]

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

Slightly shorter!

Yeah, this is good.
Attachment #533970 - Flags: review?(moz_en-gb) → review+
Comment on attachment 534260 [details] [diff] [review]
A few more spelling corrections patch [Checked in moz-2.0: comment 12]

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

Great!
Attachment #534260 - Flags: review?(moz_en-gb) → review+
(In reply to comment #6)
> Comment on attachment 533965 [details] [diff] [review] [review]
> Everything as well as help patch v1.1
> 
> Review of attachment 533965 [details] [diff] [review] [review]:
> -----------------------------------------------------------------
> 
> Synchronise: "sync" is ugly, and "synch" isn't much better (and may confuse
> wrt pronunciation).  Where we aren't talking about the branded service, we
> should use the unabbreviated word.  I think I caught all cases, but I
> couldn't grok context everywhere.

Some can probably be changed but others Sync is the "brand" name, so I'll confirm which ones I can and cannot.

> 
> Access keys: what's here may be the best that's possible, but if not, let's
> change it.
> 
Unfortunately they were the best ones available as they are in busy pref panels.

I'll generate a patch with the various changes later on this afternoon (hopefully).
This patch:
* KB -> kB
* Fixes mailnews offline help file for sync -> synchronise
* Fixes sync dtd/properties files where appropriate - most places where it is capitalised are branding so things like "Setup Sync" and "Sync Options" have to stay as is, but "Sync My" can become "Synchronise My" and "Sync Now" can become "Synchronise Now". I have left the "Sync" toolbarbutton as it is due to available space for any longer word.
Attachment #534323 - Flags: review?(moz_en-gb)
Attachment #533965 - Attachment description: Everything as well as help patch v1.1 → Everything as well as help patch v1.1 [Checked in mozilla-2.0: comment 2]
Attachment #533970 - Attachment description: Patch for searchplugins → Patch for searchplugins [Checked in mozilla-2.0: comment 4]
Comment on attachment 534323 [details] [diff] [review]
Fix kB and sync patch [Checked in moz-2.0: comment 12]

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

Brilliant.
Attachment #534323 - Flags: review?(moz_en-gb) → review+
Blocks: 658987
Comment on attachment 534260 [details] [diff] [review]
A few more spelling corrections patch [Checked in moz-2.0: comment 12]

http://hg.mozilla.org/releases/l10n-mozilla-2.0/en-GB/rev/553751bfd1f4 - bustage fix on copyright entities
http://hg.mozilla.org/releases/l10n-mozilla-2.0/en-GB/rev/b53059473475 - more spelling corrections
http://hg.mozilla.org/releases/l10n-mozilla-2.0/en-GB/rev/b0d4d25b8478 - kB and sync fixes
Attachment #534260 - Attachment description: A few more spelling corrections patch → A few more spelling corrections patch [Checked in moz-2.0: comment 12]
Attachment #534323 - Attachment description: Fix kB and sync patch → Fix kB and sync patch [Checked in moz-2.0: comment 12]
Status: ASSIGNED → RESOLVED
Closed: 9 years ago
Flags: in-testsuite-
Resolution: --- → FIXED
Target Milestone: --- → mozilla2.0
Missed one last copyright entity causing broken help
http://hg.mozilla.org/releases/l10n-mozilla-2.0/en-GB/rev/46017e17a287
You need to log in before you can comment on or make changes to this bug.