--- a/toolkit/locales/en-US/chrome/global/aboutTelemetry.properties
+++ b/toolkit/locales/en-US/chrome/global/aboutTelemetry.properties
@@ -1,139 +1,113 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# Note to translators:
-# - %1$S will be replaced by brandFullName
-# - %2$S will be replaced with the value of the toolkit.telemetry.server_owner preference
+# LOCALIZATION NOTE(pageSubtitle):
+# - %1$S is replaced by brandFullName
+# - %2$S is replaced by the value of the toolkit.telemetry.server_owner preference
 pageSubtitle = This page shows the information about performance, hardware, usage and customizations collected by Telemetry. This information is submitted to %1$S to help improve %2$S.
 
-# Note to translators:
-# - %1$S will be replaced by either telemetryEnabled or telemetryDisabled
-# - %2$S will be replaced by either extendedTelemetryEnabled or extendedTelemetryDisabled
+# LOCALIZATION NOTE(homeExplanation):
+# - %1$S is either telemetryEnabled or telemetryDisabled
+# - %2$S is either extendedTelemetryEnabled or extendedTelemetryDisabled
 homeExplanation = Telemetry is %1$S and extended telemetry is %2$S.
-
-# Note to translators:
-# - %1$S will be replaced by a link with pingExplanationLink
-# - %2$S will be replaced by the namedPing
-pingDetails = Each piece of information is sent bundled into “%1$S”. You are looking at the %2$S ping.
-
-# Note to translators:
-# - %1$S will be replaced by the ping timestamp, e.g. "2017/07/08 10:40:46"
-# - %2$S will be replaced by the ping name, e.g. "saved-session"
-namedPing = %1$S, %2$S
-
-# Note to translators:
-# - %1$S will be replaced by a link with pingExplanationLink
-# - %2$S will be replaced by currentPing
-pingDetailsCurrent = Each piece of information is sent bundled into “%1$S“. You are looking at the %2$S ping.
-
-pingExplanationLink = pings
-
 telemetryEnabled = enabled
-
 telemetryDisabled = disabled
-
 extendedTelemetryEnabled = enabled
-
 extendedTelemetryDisabled = disabled
 
+# LOCALIZATION NOTE(pingDetails):
+# - %1$S is replaced by a link with pingExplanationLink as text
+# - %2$S is replaced by namedPing
+pingDetails = Each piece of information is sent bundled into “%1$S”. You are looking at the %2$S ping.
+# LOCALIZATION NOTE(namedPing):
+# - %1$S is replaced by the ping localized timestamp, e.g. “2017/07/08 10:40:46”
+# - %2$S is replaced by the ping name, e.g. “saved-session”
+namedPing = %1$S, %2$S
+# LOCALIZATION NOTE(pingDetailsCurrent):
+# - %1$S is replaced by a link with pingExplanationLink as text
+# - %2$S is replaced by currentPing
+pingDetailsCurrent = Each piece of information is sent bundled into “%1$S“. You are looking at the %2$S ping.
+pingExplanationLink = pings
 currentPing = current
 
-# Used as a tooltip for the "current" ping title in the sidebar
-currentPingSidebar = current ping
-
-# Note to translators:
-# - %1$S will be replaced by the current text in the search input
-resultsForSearch = Results for “%1$S”
-
-# Note to translators:
-# - %1$S will be replaced by the section name from the structure of the ping. More info about it can be found here : https://firefox-source-docs.mozilla.org/toolkit/components/telemetry/telemetry/data/main-ping.html
-# - %2$S will be replaced by the current text in the search input
-noSearchResults = Sorry! There are no results in %1$S for “%2$S”
-
-# Note to translators:
-# - %S is replaced by the searched terms
-noSearchResultsAll = Sorry! There are no results in any sections for “%S”
-
-telemetryPingTypeAll = all
-
-telemetryLogTitle = Telemetry Log
-
-telemetryLogHeadingId = Id
-
-telemetryLogHeadingTimestamp = Timestamp
-
-telemetryLogHeadingData = Data
-
-# Note to translators:
-# - %1$S will be replaced by the section name from the structure of the ping. More info about it can be found here : https://firefox-source-docs.mozilla.org/toolkit/components/telemetry/telemetry/data/main-ping.html
+# LOCALIZATION NOTE(filterPlaceholder): string used as a placeholder for the
+# search field, %1$S is replaced by the section name from the structure of the
+# ping. More info about it can be found here:
+# https://firefox-source-docs.mozilla.org/toolkit/components/telemetry/telemetry/data/main-ping.html
 filterPlaceholder = Find in %1$S
 filterAllPlaceholder = Find in all sections
 
-slowSqlMain = Slow SQL Statements on Main Thread
+# LOCALIZATION NOTE(resultsForSearch): %1$S is replaced by the searched terms
+resultsForSearch = Results for “%1$S”
+# LOCALIZATION NOTE(noSearchResults):
+# - %1$S is replaced by the section name from the structure of the ping.
+# More info about it can be found here: https://firefox-source-docs.mozilla.org/toolkit/components/telemetry/telemetry/data/main-ping.html
+# - %2$S is replaced by the current text in the search input
+noSearchResults = Sorry! There are no results in %1$S for “%2$S”
+# LOCALIZATION NOTE(noSearchResultsAll): %S is replaced by the searched terms
+noSearchResultsAll = Sorry! There are no results in any sections for “%S”
 
-slowSqlOther = Slow SQL Statements on Helper Threads
+# LOCALIZATION NOTE(currentPingSidebar): used as a tooltip for the “current”
+# ping title in the sidebar
+currentPingSidebar = current ping
+# LOCALIZATION NOTE(telemetryPingTypeAll): used in the “Ping Type” select
+telemetryPingTypeAll = all
 
-slowSqlHits = Hits
+# LOCALIZATION NOTE(histogram*): these strings are used in the “Histograms” section
+histogramSamples = samples
+histogramAverage = average
+histogramSum = sum
+# LOCALIZATION NOTE(histogramCopy): button label to copy the histogram
+histogramCopy = Copy
 
+# LOCALIZATION NOTE(telemetryLog*): these strings are used in the “Telemetry Log” section
+telemetryLogTitle = Telemetry Log
+telemetryLogHeadingId = Id
+telemetryLogHeadingTimestamp = Timestamp
+telemetryLogHeadingData = Data
+
+# LOCALIZATION NOTE(slowSql*): these strings are used in the “Slow SQL Statements” section
+slowSqlMain = Slow SQL Statements on Main Thread
+slowSqlOther = Slow SQL Statements on Helper Threads
+slowSqlHits = Hits
 slowSqlAverage = Avg. Time (ms)
-
 slowSqlStatement = Statement
 
-# Note to translators:
-# - The %1$S will be replaced with the number of the hang
-# - The %2$S will be replaced with the duration of the hang
-chrome-hangs-title = Hang Report #%1$S (%2$S seconds)
+# LOCALIZATION NOTE(histogram*): these strings are used in the “Add-on Details” section
+addonTableID = Add-on ID
+addonTableDetails = Details
+# LOCALIZATION NOTE(addonProvider):
+# - %1$S is replaced by the name of an Add-on Provider (e.g. “XPI”, “Plugin”)
+addonProvider = %1$S Provider
+
+keysHeader = Property
+namesHeader = Name
+valuesHeader = Value
 
-# Note to translators:
-# - The %1$S will be replaced with the string key for this stack.
-# - The %2$S will be replaced with the number of times this stack was captured.
+# LOCALIZATION NOTE(chrome-hangs-title):
+# - %1$S is replaced by the number of the hang
+# - %2$S is replaced by the duration of the hang
+chrome-hangs-title = Hang Report #%1$S (%2$S seconds)
+# LOCALIZATION NOTE(captured-stacks-title):
+# - %1$S is replaced by the string key for this stack
+# - %2$S is replaced by the number of times this stack was captured
 captured-stacks-title = %1$S (capture count: %2$S)
-
-# Note to translators:
-# - The %1$S will be replaced with the number of the late write
+# LOCALIZATION NOTE(late-writes-title):
+# - %1$S is replaced by the number of the late write
 late-writes-title = Late Write #%1$S
 
 stackTitle = Stack:
-
 memoryMapTitle = Memory map:
 
 errorFetchingSymbols = An error occurred while fetching symbols. Check that you are connected to the Internet and try again.
 
-histogramSamples = samples
-
-histogramAverage = average
-
-histogramSum = sum
-
-histogramCopy = Copy
-
-keysHeader = Property
-
-namesHeader = Name
-
-valuesHeader = Value
-
-addonTableID = Add-on ID
-
-addonTableDetails = Details
-
-# Note to translators:
-# - The %1$S will be replaced with the name of an Add-on Provider (e.g. "XPI", "Plugin")
-addonProvider = %1$S Provider
-
 parentPayload = Parent Payload
-
-# Note to translators:
-# - The %1$S will be replaced with the number of the child payload (e.g. "1", "2")
+# LOCALIZATION NOTE(childPayloadN):
+# - %1$S is replaced by the number of the child payload (e.g. “1”, “2”)
 childPayloadN = Child Payload %1$S
-
 timestampHeader = timestamp
-
 categoryHeader = category
-
 methodHeader = method
-
 objectHeader = object
-
 extraHeader = extra