Merge branch 'master' into localization

.gitignore

@@ -16,3 +16,6 @@ Makefile*
 
 object_script.*
 rpgscript.bat
+oneshot_JA_2_merge.pot
+rpgscript - mklang.bat
+oneshot_JA_2_merge-jpn.pot

mklang.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/ruby
+#encoding: utf-8
 
 require 'get_pomo'
 require 'zlib'
@@ -11,7 +12,7 @@ end
 src_file = ARGV[0]
 dst_file = ARGV[1]
 
-po = GetPomo::PoFile.parse(File.read(src_file))
+po = GetPomo::PoFile.parse(File.read(src_file, :encoding => 'utf-8'))
 
 File.open(dst_file, 'wb') do |file|
   file.write(Marshal.dump(po.map do |t|

scripts/SaveLoad.rb

@@ -163,7 +163,7 @@ def load_perma_flags
   
 	begin
       read_perma_flags(PERMA_FLAGS_NAME)
-	rescue TypeError => e
+	rescue TypeError, ArgumentError => e
 	  puts "oops: #{e.message}"
 	  EdText.err("p-settings.dat corrupt. Attempting to load backup.")
 	  for i in 1..6
@@ -177,7 +177,7 @@ def load_perma_flags
 	    begin
 	      read_perma_flags(Oneshot::SAVE_PATH + "\\save_backups\\p-settings" + (i).to_s + ".bk")
 		  break
-	    rescue TypeError => e2
+	    rescue TypeError, ArgumentError => e2
 	      puts "oops: #{e2.message}"
 	      EdText.err("p-settings" + (i).to_s + ".bk corrupt. Attempting to load backup.")
 		end
@@ -210,7 +210,7 @@ def real_load
 #load save data
 	begin
       load(SAVE_FILE_NAME)
-	rescue TypeError => e
+	rescue TypeError, ArgumentError => e
 	  puts "oops: #{e.message}"
 	  EdText.err("save.dat corrupt. Attempting to load backup.")
 	  for i in 1..6
@@ -224,7 +224,7 @@ def real_load
 	    begin
 	      load(Oneshot::SAVE_PATH + "\\save_backups\\save" + (i).to_s + ".bk")
 		  break
-	    rescue TypeError => e2
+	    rescue TypeError, ArgumentError => e2
 	      puts "oops: #{e2.message}"
 	      EdText.err("save" + (i).to_s + ".bk corrupt. Attempting to load backup.")
 		end