--- a/security/manager/locales/en-US/chrome/pipnss/pipnss.properties
+++ b/security/manager/locales/en-US/chrome/pipnss/pipnss.properties
@@ -2,50 +2,70 @@
 # 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/.
 
 CertPassPrompt=Please enter the master password for the %S.
 
 CertPassPromptDefault=Please enter your master password.
 
-# the following strings have special requirements:
-# they must fit in a 32 or 64 byte buffer after being translated
-# to UTF8.  Note to translator. It's not easy for you to figure
-# whether the escaped unicode string you produce will fit in 
-# the space allocated.
+# The following strings have special requirements: they must fit in a 32 or 64
+# bytes buffer after being encoded to UTF-8.
+#
+# It's possible to verify the length of a translation using the Browser Console
+# in Firefox and evaluating the following code:
+#
+# (new TextEncoder('utf-8').encode('YOURSTRING')).length
 #
-# 64 bytes long after conversion to UTF8
+# Simply replace YOURSTRING with your translation.
+#
+# If it's not possible to produce an understandable translation withing these
+# limits, keeping the English text is an acceptable workaround.
+
+# LOCALIZATION NOTE (RootCertModuleName): string limit is 64 bytes after
+# conversion to UTF-8.
+# length_limit = 64 bytes
 RootCertModuleName=Builtin Roots Module
-#
-# 32 bytes long after conversion to UTF8
+# LOCALIZATION NOTE (ManufacturerID): string limit is 32 bytes after conversion
+# to UTF-8.
+# length_limit = 32 bytes
 ManufacturerID=Mozilla.org
-#
-# 32  bytes long after conversion to UTF8
+# LOCALIZATION NOTE (LibraryDescription): string limit is 32 bytes after
+# conversion to UTF-8.
+# length_limit = 32 bytes
 LibraryDescription=PSM Internal Crypto Services
-#
-# 32 bytes long after conversion to UTF8
+# LOCALIZATION NOTE (TokenDescription): string limit is 32 bytes after
+# conversion to UTF-8.
+# length_limit = 32 bytes
 TokenDescription=Generic Crypto Services
-#
-# 32 bytes long after conversion to UTF8
+# LOCALIZATION NOTE (PrivateTokenDescription): string limit is 32 bytes after
+# conversion to UTF-8.
+# length_limit = 32 bytes
 PrivateTokenDescription=Software Security Device
-#
-# 64 bytes long after conversion to UTF8
+# LOCALIZATION NOTE (SlotDescription): string limit is 64 bytes after conversion
+# to UTF-8.
+# length_limit = 64 bytes
 SlotDescription=PSM Internal Cryptographic Services
-#
-# 64 bytes long after conversion to UTF8
+# LOCALIZATION NOTE (PrivateSlotDescription): string limit is 64 bytes after
+# conversion to UTF-8.
+# length_limit = 64 bytes
 PrivateSlotDescription=PSM Private Keys
-#
-# 32
+# LOCALIZATION NOTE (Fips140TokenDescription): string limit is 32 bytes after
+# conversion to UTF-8.
+# length_limit = 32 bytes
 Fips140TokenDescription=Software Security Device (FIPS)
-# 64
+# LOCALIZATION NOTE (Fips140SlotDescription): string limit is 64 bytes after
+# conversion to UTF-8.
+# length_limit = 64 bytes
 Fips140SlotDescription=FIPS 140 Cryptographic, Key and Certificate Services
-# 32
+# LOCALIZATION NOTE (InternalToken): string limit is 32 bytes after conversion
+# to UTF-8.
+# length_limit = 32 bytes
 InternalToken=Software Security Device
-# End of size restriction.
+
 VerifySSLClient=SSL Client Certificate
 VerifySSLServer=SSL Server Certificate
 VerifySSLCA=SSL Certificate Authority
 VerifyEmailSigner=Email Signer Certificate
 VerifyEmailRecip=Email Recipient Certificate
 HighGrade=High Grade
 MediumGrade=Medium Grade
 # LOCALIZATION NOTE (nick_template): $1s is the common name from a cert (e.g. "Mozilla"), $2s is the CA name (e.g. VeriSign)