Inconsistency between "&" (ampersand) vs "and" in Options (Bug 1530771) r=jaws,flod
authorMauricio Araujo <mauricio.araujo@protonmail.com>
Wed, 13 Mar 2019 06:35:24 +0000
changeset 521762 e7cd2f1e7f66
parent 521761 48003b78de5a
child 521763 57387d4ed085
push id10867
push userdvarga@mozilla.com
push dateThu, 14 Mar 2019 15:20:45 +0000
treeherdermozilla-beta@abad13547875 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjaws, flod
bugs1530771
milestone67.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
Inconsistency between "&" (ampersand) vs "and" in Options (Bug 1530771) r=jaws,flod Bug 1530771 - Replaced instances where "&" (ampersand) was used instead of "and" to join two words in the preferences menu, and added Oxford comma where appropriate in certain labels to ensure consistency. r?jaws, r?flod Differential Revision: https://phabricator.services.mozilla.com/D21472
browser/extensions/formautofill/locales/en-US/formautofill.properties
browser/locales/en-US/browser/preferences/preferences.ftl
toolkit/locales/en-US/chrome/global/intl.properties
--- a/browser/extensions/formautofill/locales/en-US/formautofill.properties
+++ b/browser/extensions/formautofill/locales/en-US/formautofill.properties
@@ -75,17 +75,17 @@ phishingWarningMessage = Also autofills 
 phishingWarningMessage2 = Autofills %S
 # LOCALIZATION NOTE (insecureFieldWarningDescription): %S is brandShortName. This string is used in drop down
 # suggestion when users try to autofill credit card on an insecure website (without https).
 insecureFieldWarningDescription = %S has detected an insecure site. Form Autofill is temporarily disabled.
 # LOCALIZATION NOTE (clearFormBtnLabel2): Label for the button in the dropdown menu that used to clear the populated
 # form.
 clearFormBtnLabel2 = Clear Autofill Form
 
-autofillHeader = Forms & Autofill
+autofillHeader = Forms and Autofill
 # LOCALIZATION NOTE (autofillAddressesCheckbox): Label for the checkbox that enables autofilling addresses.
 autofillAddressesCheckbox = Autofill addresses
 # LOCALIZATION NOTE (learnMoreLabel): Label for the link that leads users to the Form Autofill SUMO page.
 learnMoreLabel = Learn more
 # LOCALIZATION NOTE (savedAddressesBtnLabel): Label for the button that opens a dialog that shows the
 # list of saved addresses.
 savedAddressesBtnLabel = Saved Addresses…
 # LOCALIZATION NOTE (autofillCreditCardsCheckbox): Label for the checkbox that enables autofilling credit cards.
--- a/browser/locales/en-US/browser/preferences/preferences.ftl
+++ b/browser/locales/en-US/browser/preferences/preferences.ftl
@@ -230,17 +230,17 @@ containers-remove-alert-msg =
 containers-remove-ok-button = Remove this Container
 containers-remove-cancel-button = Don’t remove this Container
 
 
 ## General Section - Language & Appearance
 
 language-and-appearance-header = Language and Appearance
 
-fonts-and-colors-header = Fonts & Colors
+fonts-and-colors-header = Fonts and Colors
 
 default-font = Default font
     .accesskey = D
 default-font-size = Size
     .accesskey = S
 
 advanced-fonts =
     .label = Advanced…
@@ -677,17 +677,17 @@ sync-tos-link = Terms of Service
 sync-fxa-privacy-notice = Privacy Notice
 
 ## Privacy Section
 
 privacy-header = Browser Privacy
 
 ## Privacy Section - Forms
 
-logins-header = Logins & Passwords
+logins-header = Logins and Passwords
 forms-ask-to-save-logins =
     .label = Ask to save logins and passwords for websites
     .accesskey = r
 forms-exceptions =
     .label = Exceptions…
     .accesskey = x
 forms-saved-logins =
     .label = Saved Logins…
@@ -717,17 +717,17 @@ history-remember-label = { -brand-short-
 
 history-remember-option-all =
     .label = Remember history
 history-remember-option-never =
     .label = Never remember history
 history-remember-option-custom =
     .label = Use custom settings for history
 
-history-remember-description = { -brand-short-name } will remember your browsing, download, form and search history.
+history-remember-description = { -brand-short-name } will remember your browsing, download, form, and search history.
 history-dontremember-description = { -brand-short-name } will use the same settings as private browsing, and will not remember any history as you browse the Web.
 
 history-private-browsing-permanent =
     .label = Always use private browsing mode
     .accesskey = p
 
 history-remember-browser-option =
     .label = Remember browsing and download history
@@ -753,17 +753,17 @@ history-clear-button =
 
 sitedata-header = Cookies and Site Data
 
 sitedata-total-size-calculating = Calculating site data and cache size…
 
 # Variables:
 #   $value (Number) - Value of the unit (for example: 4.6, 500)
 #   $unit (String) - Name of the unit (for example: "bytes", "KB")
-sitedata-total-size = Your stored cookies, site data and cache are currently using { $value } { $unit } of disk space.
+sitedata-total-size = Your stored cookies, site data, and cache are currently using { $value } { $unit } of disk space.
 
 sitedata-learn-more = Learn more
 
 sitedata-delete-on-close =
     .label = Delete cookies and site data when { -brand-short-name } is closed
     .accesskey = c
 
 sitedata-delete-on-close-private-browsing = In permanent private browsing mode, cookies and site data will always be cleared when { -brand-short-name } is closed.
--- a/toolkit/locales/en-US/chrome/global/intl.properties
+++ b/toolkit/locales/en-US/chrome/global/intl.properties
@@ -19,17 +19,17 @@
 # For example, the Breton [br] locale might consider including French and
 # British English in their list, since those languages are commonly spoken in
 # the same area as Breton:
 # intl.accept_languages=br, fr-FR, fr, en-GB, en
 intl.accept_languages=en-US, en
 
 # LOCALIZATION NOTE (font.language.group):
 # This preference controls the initial setting of the language drop-down menu
-# in the Content > Fonts & Colors > Advanced preference panel.
+# in the Fonts and Colors > Advanced preference panel.
 #
 # Set it to the value of one of the menuitems in the "selectLangs" menulist in
 # http://dxr.mozilla.org/mozilla-central/source/browser/components/preferences/fonts.xul
 font.language.group=x-western
 
 # LOCALIZATION NOTE (intl.charset.detector):
 # This preference controls the initial setting for the character encoding
 # detector. Valid values are ja_parallel_state_machine for Japanese, ruprob