Merge branch 'azerothcore:master' into Playerbot

src/server/scripts/Commands/cs_character.cpp

@@ -891,7 +891,7 @@ public:
         }
 
         // Original TC Notes from Refactor vvv
-        //ToDo: use a new trinity_string for this commands
+        //ToDo: use a new acore_string for this commands
         handler->PSendSysMessage(LANG_COMMAND_IMPORT_SUCCESS);
 
         return true;