diff --git a/scripts/Game_Oneshot.rb b/scripts/Game_Oneshot.rb
index d349b65..9b29800 100644
--- a/scripts/Game_Oneshot.rb
+++ b/scripts/Game_Oneshot.rb
@@ -32,6 +32,23 @@ end
 
 module Wallpaper
   def self.set_persistent(name, color)
+  
+    if (name == 'save_w32')
+	  case $persistent.langcode
+	    when 'fr'
+          name = $persistent.langcode + "\\" + name
+	    when 'pt_BR'
+	      name = $persistent.langcode + "\\" + name
+	    when 'es'
+	      name = $persistent.langcode + "\\" + name
+	    when 'ja'
+	      name = $persistent.langcode + "\\" + name
+	    when 'ko'
+	      name = $persistent.langcode + "\\" + name
+	    when 'zh_CN'
+	      name = $persistent.langcode + "\\" + name
+      end
+	end
     $game_oneshot.wallpaper = name
     $game_oneshot.wallpaper_color = color
     Wallpaper.set(name, color)
diff --git a/scripts/Script.rb b/scripts/Script.rb
index 555ee38..88898f5 100644
--- a/scripts/Script.rb
+++ b/scripts/Script.rb
@@ -473,17 +473,27 @@ module Script
   end
   
   def self.password1
-    copy_file("Graphics\\Fogs\\_\\scenario1\\pw1.png", Oneshot::DOCS_PATH + "\\ONESHOT_password1.png")
-    copy_file("Graphics\\Fogs\\_\\scenario1\\pw2.png", Oneshot::DOCS_PATH + "\\ONESHOT_password2.png")
-    copy_file("Graphics\\Fogs\\_\\scenario1\\pw3.png", Oneshot::DOCS_PATH + "\\ONESHOT_password3.png")
-    copy_file("Graphics\\Fogs\\_\\scenario1\\pw4.png", Oneshot::DOCS_PATH + "\\ONESHOT_password4.png")
+    locale = $persistent.langcode
+	if !Language::LANGUAGES.include? locale
+	  locale = 'en'
+	end
+    source_dir = "Graphics\\Fogs\\_\\scenario1\\" + locale.downcase
+    copy_file(source_dir + "\\pw1.png", Oneshot::DOCS_PATH + "\\ONESHOT_password1.png")
+    copy_file(source_dir + "\\pw2.png", Oneshot::DOCS_PATH + "\\ONESHOT_password2.png")
+    copy_file(source_dir + "\\pw3.png", Oneshot::DOCS_PATH + "\\ONESHOT_password3.png")
+    copy_file(source_dir + "\\pw4.png", Oneshot::DOCS_PATH + "\\ONESHOT_password4.png")
   end
   
   def self.password2
-    copy_file("Graphics\\Fogs\\_\\scenario2\\pw1.png", Oneshot::DOCS_PATH + "\\ONESHOT_password1.png")
-    copy_file("Graphics\\Fogs\\_\\scenario2\\pw2.png", Oneshot::DOCS_PATH + "\\ONESHOT_password2.png")
-    copy_file("Graphics\\Fogs\\_\\scenario2\\pw3.png", Oneshot::DOCS_PATH + "\\ONESHOT_password3.png")
-    copy_file("Graphics\\Fogs\\_\\scenario2\\pw4.png", Oneshot::DOCS_PATH + "\\ONESHOT_password4.png")
+    locale = $persistent.langcode
+	if !Language::LANGUAGES.include? locale
+	  locale = 'en'
+	end
+    source_dir = "Graphics\\Fogs\\_\\scenario2\\" + locale.downcase
+    copy_file(source_dir + "\\pw1.png", Oneshot::DOCS_PATH + "\\ONESHOT_password1.png")
+    copy_file(source_dir + "\\pw2.png", Oneshot::DOCS_PATH + "\\ONESHOT_password2.png")
+    copy_file(source_dir + "\\pw3.png", Oneshot::DOCS_PATH + "\\ONESHOT_password3.png")
+    copy_file(source_dir + "\\pw4.png", Oneshot::DOCS_PATH + "\\ONESHOT_password4.png")
   end
   
 =begin