--- a/toolkit/components/viewconfig/content/config.js
+++ b/toolkit/components/viewconfig/content/config.js
@@ -21,17 +21,17 @@ const gPrefBranch = Services.prefs;
 const gClipboardHelper = Components.classes[nsClipboardHelper_CONTRACTID].getService(nsIClipboardHelper);
 
 var gLockProps = ["default", "user", "locked"];
 // we get these from a string bundle
 var gLockStrs = [];
 var gTypeStrs = [];
 
 const PREF_IS_DEFAULT_VALUE = 0;
-const PREF_IS_USER_SET = 1;
+const PREF_IS_MODIFIED = 1;
 const PREF_IS_LOCKED = 2;
 
 var gPrefHash = {};
 var gPrefArray = [];
 var gPrefView = gPrefArray; // share the JS array
 var gSortedColumn = "prefCol";
 var gSortFunction = null;
 var gSortDirection = 1; // 1 is ascending; -1 is descending
@@ -274,17 +274,17 @@ function fetchPref(prefName, prefIndex) 
   var pref = new prefObject(prefName);
 
   gPrefHash[prefName] = pref;
   gPrefArray[prefIndex] = pref;
 
   if (gPrefBranch.prefIsLocked(prefName))
     pref.lockCol = PREF_IS_LOCKED;
   else if (gPrefBranch.prefHasUserValue(prefName))
-    pref.lockCol = PREF_IS_USER_SET;
+    pref.lockCol = PREF_IS_MODIFIED;
 
   try {
     switch (gPrefBranch.getPrefType(prefName)) {
       case gPrefBranch.PREF_BOOL:
         pref.typeCol = gPrefBranch.PREF_BOOL;
         // convert to a string
         pref.valueCol = gPrefBranch.getBoolPref(prefName).toString();
         break;
@@ -308,17 +308,17 @@ function fetchPref(prefName, prefIndex) 
   }
 }
 
 function onConfigLoad() {
   // Load strings
   gConfigBundle = document.getElementById("configBundle");
 
   gLockStrs[PREF_IS_DEFAULT_VALUE] = gConfigBundle.getString("default");
-  gLockStrs[PREF_IS_USER_SET] = gConfigBundle.getString("user");
+  gLockStrs[PREF_IS_MODIFIED] = gConfigBundle.getString("modified");
   gLockStrs[PREF_IS_LOCKED] = gConfigBundle.getString("locked");
 
   gTypeStrs[nsIPrefBranch.PREF_STRING] = gConfigBundle.getString("string");
   gTypeStrs[nsIPrefBranch.PREF_INT] = gConfigBundle.getString("int");
   gTypeStrs[nsIPrefBranch.PREF_BOOL] = gConfigBundle.getString("bool");
 
   var showWarning = gPrefBranch.getBoolPref("general.warnOnAboutConfig");
 
@@ -487,17 +487,17 @@ function updateContextMenu() {
 
   var copyName = document.getElementById("copyName");
   copyName.setAttribute("disabled", copyDisabled);
 
   var copyValue = document.getElementById("copyValue");
   copyValue.setAttribute("disabled", copyDisabled);
 
   var resetSelected = document.getElementById("resetSelected");
-  resetSelected.setAttribute("disabled", lockCol != PREF_IS_USER_SET);
+  resetSelected.setAttribute("disabled", lockCol != PREF_IS_MODIFIED);
 
   var canToggle = typeCol == nsIPrefBranch.PREF_BOOL && valueCol != "";
   // indicates that a pref is locked or no pref is selected at all
   var isLocked = lockCol == PREF_IS_LOCKED;
 
   var modifySelected = document.getElementById("modifySelected");
   modifySelected.setAttribute("disabled", isLocked);
   modifySelected.hidden = canToggle;

--- a/toolkit/locales/en-US/chrome/global/config.properties
+++ b/toolkit/locales/en-US/chrome/global/config.properties
@@ -1,15 +1,15 @@
 # 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/.
 
 # Lock column values
 default=default
-user=user set
+modified=modified
 locked=locked
 
 # Type column values
 string=string
 int=integer
 bool=boolean
 
 # Preference prompts