Merge branch 'dev' into ai

Data/Scripts/020_Debug/003_Debug menus/002_Debug_MenuCommands.rb

@@ -1180,18 +1180,6 @@ MenuHandlers.add(:debug_menu, :rename_files, {
   }
 })
 
-MenuHandlers.add(:debug_menu, :collate_script_and_event_text, {
-  "name"        => _INTL("Collate Script/Event Texts For Translation"),
-  "parent"      => :files_menu,
-  "description" => _INTL("Find translatable text in scripts/map events. Do this before extracting text."),
-  "effect"      => proc {
-    Translator.gather_script_and_event_texts
-    MessageTypes.save_default_messages
-    MessageTypes.load_default_messages if safeExists?("Data/messages_core.dat")
-    pbMessage(_INTL("Translatable text gathered from scripts and map events and saved in data files."))
-  }
-})
-
 MenuHandlers.add(:debug_menu, :extract_text, {
   "name"        => _INTL("Extract Text For Translation"),
   "parent"      => :files_menu,

Data/Scripts/020_Debug/003_Debug menus/004_Debug_BattleCommands.rb

@@ -467,14 +467,14 @@ MenuHandlers.add(:battle_debug_menu, :position_effects, {
       if battler && !battler.fainted?
         text = "[#{i}] #{battler.name}"
       else
-        text = _INTL("[#{i}] (empty)", i)
+        text = "[#{i}] " + _INTL("(empty)")
       end
       if battler.pbOwnedByPlayer?
-        text += " (yours)"
+        text += " " + _INTL("(yours)")
       elsif battle.opposes?(i)
-        text += " (opposing)"
+        text += " " + _INTL("(opposing)")
       else
-        text += " (ally's)"
+        text += " " + _INTL("(ally's)")
       end
       cmds.push(text)
     end