Merge pull request #3964 from Autodesk/bailp/EMSUSD-0/fix-bad-registe…

…r-string-merge

EMSUSD-0 fix bad merge in string resources

lib/mayaUsd/resources/scripts/mayaUsdLibRegisterStrings.py

@@ -164,6 +164,13 @@ def mayaUsdLibUnregisterStrings():
     "kUsdASCIIFiles": "USD ASCII Files",
     "kUsdBinaryFiles": "USD Binary Files",
     "kUsdCompressedFiles": "USD Compressed Files",
+
+    # readJob.cpp
+    "kAboutToChangePrefs": "The USD import is about to change the Maya preferences.\n" +
+                           "Save your changes in the preferences window?",
+    "kAboutToChangePrefsTitle": "Save Preferences",
+    "kSavePrefsChange": "Save Preferences",
+    "kDiscardPrefsChange": "Discard Preferences",
 }
 
 
@@ -192,13 +199,6 @@ def unregisterPluginResource(pluginId, stringId):
         return
     cmds.displayString(fullId, delete=True)
 
-    # readJob.cpp
-    register("kAboutToChangePrefs", "The USD import is about to change the Maya preferences.\n" +
-                                    "Save your changes in the preferences window?")
-    register("kAboutToChangePrefsTitle", "Save Preferences")
-    register("kSavePrefsChange", "Save Preferences")
-    register("kDiscardPrefsChange", "Discard Preferences")
-
 
 def registerPluginResource(pluginId, stringId, resourceStr):
     '''See registerPluginResource.mel in Maya.