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/performance.properties | |
parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
download | UXP-fc61780b35af913801d72086456f493f63197da6.tar UXP-fc61780b35af913801d72086456f493f63197da6.tar.gz UXP-fc61780b35af913801d72086456f493f63197da6.tar.lz UXP-fc61780b35af913801d72086456f493f63197da6.tar.xz UXP-fc61780b35af913801d72086456f493f63197da6.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/performance.properties')
-rw-r--r-- | devtools/client/locales/en-US/performance.properties | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/devtools/client/locales/en-US/performance.properties b/devtools/client/locales/en-US/performance.properties index 86ddc29b5..14f45186c 100644 --- a/devtools/client/locales/en-US/performance.properties +++ b/devtools/client/locales/en-US/performance.properties @@ -62,7 +62,7 @@ graphs.memory=MB # These strings are displayed in the categories graph of the Performance Tools, # as the legend for each block in every bar. These labels should be kept # AS SHORT AS POSSIBLE so they don't obstruct important parts of the graph. -category.other=Gecko +category.other=Goanna category.css=Styles category.js=JIT category.gc=GC |