diff options
author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
---|---|---|
committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
commit | fc61780b35af913801d72086456f493f63197da6 (patch) | |
tree | f85891288a7bd988da9f0f15ae64e5c63f00d493 /devtools/client/locales/en-US/scratchpad.properties | |
parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
download | UXP-2018.07.18.tar UXP-2018.07.18.tar.gz UXP-2018.07.18.tar.lz UXP-2018.07.18.tar.xz UXP-2018.07.18.zip |
Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18
# Conflicts:
# browser/app/profile/firefox.js
# browser/components/preferences/jar.mn
Diffstat (limited to 'devtools/client/locales/en-US/scratchpad.properties')
-rw-r--r-- | devtools/client/locales/en-US/scratchpad.properties | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/devtools/client/locales/en-US/scratchpad.properties b/devtools/client/locales/en-US/scratchpad.properties index 250b0cb2f..ae8d08891 100644 --- a/devtools/client/locales/en-US/scratchpad.properties +++ b/devtools/client/locales/en-US/scratchpad.properties @@ -64,12 +64,12 @@ confirmRevert=Do you want to revert the changes you made to this scratchpad? # you try to revert unsaved content of scratchpad. confirmRevert.title=Revert Changes -# LOCALIZATION NOTE (scratchpadIntro): This is a multi-line comment explaining +# LOCALIZATION NOTE (scratchpadIntro1): This is a multi-line comment explaining # how to use the Scratchpad. Note that this should be a valid JavaScript # comment inside /* and */. scratchpadIntro1=/*\n * This is a JavaScript Scratchpad.\n *\n * Enter some JavaScript, then Right Click or choose from the Execute Menu:\n * 1. Run to evaluate the selected text (%1$S),\n * 2. Inspect to bring up an Object Inspector on the result (%2$S), or,\n * 3. Display to insert the result in a comment after the selection. (%3$S)\n */\n\n -# LOCALIZATION NOTE (notification.browserContext): This is the message displayed +# LOCALIZATION NOTE (browserContext.notification): This is the message displayed # over the top of the editor when the user has switched to browser context. browserContext.notification=This scratchpad executes in the Browser context. @@ -82,7 +82,7 @@ help.openDocumentationPage=https://developer.mozilla.org/en/Tools/Scratchpad # Scratchpad. scratchpad.statusBarLineCol = Line %1$S, Col %2$S -# LOCALIZATION NOTE (fileExists.notification): This is the message displayed +# LOCALIZATION NOTE (fileNoLongerExists.notification): This is the message displayed # over the top of the the editor when a file does not exist. fileNoLongerExists.notification=This file no longer exists. @@ -99,7 +99,7 @@ connectionTimeout=Connection timeout. Check the Error Console on both ends for p # %1 is the text of selfxss.okstring selfxss.msg=Scam Warning: Take care when pasting things you don’t understand. This could allow attackers to steal your identity or take control of your computer. Please type ‘%S’ in the scratchpad below to allow pasting. -# LOCALIZATION NOTE (selfxss.msg): the string to be typed +# LOCALIZATION NOTE (selfxss.okstring): the string to be typed # in by a new user of the developer tools when they receive the sefxss.msg prompt. # Please avoid using non-keyboard characters here selfxss.okstring=allow pasting |