diff -cr ninix.old/config.py ninix/config.py
*** ninix.old/config.py	Thu Dec 27 21:30:13 2001
--- ninix/config.py	Fri Dec 28 23:02:21 2001
***************
*** 4,10 ****
  import string
  import UserDict
  
- import kanjilib
  
  builtin_open = open
  
--- 4,9 ----
***************
*** 68,74 ****
          if not string.strip(line):
              continue
          try:
!             key, value = string.split(kanjilib.sjis2euc(line), ',', 1)
          except ValueError:
              continue
          dict[string.strip(key)] = string.strip(value)
--- 67,73 ----
          if not string.strip(line):
              continue
          try:
!             key, value = string.split(line, ',', 1)
          except ValueError:
              continue
          dict[string.strip(key)] = string.strip(value)
diff -cr ninix.old/kawari.py ninix/kawari.py
*** ninix.old/kawari.py	Thu Dec 27 21:30:13 2001
--- ninix/kawari.py	Fri Dec 28 23:02:02 2001
***************
*** 12,18 ****
  import time
  import whrandom
  
- import kanjilib
  
  builtin_open = open
  
--- 12,17 ----
***************
*** 32,38 ****
             line[:6] == ":crypt" or \
             line[:9] == ":endcrypt":
              continue
-         line = kanjilib.sjis2euc(line)
          pos = string.find(line, ":")
          if pos < 0:
              if debug & 4:
--- 31,36 ----
***************
*** 258,265 ****
          if not line:
              break
          if line[0] == '#':
!             rdict[kanjilib.sjis2euc(string.strip(line))] = \
!                  [kanjilib.sjis2euc(string.strip(file.readline()))]
      return rdict, kdict
  
  ###   KAWARI   ###
--- 256,263 ----
          if not line:
              break
          if line[0] == '#':
!             rdict[string.strip(line)] = \
!                  [string.strip(file.readline())]
      return rdict, kdict
  
  ###   KAWARI   ###
***************
*** 700,707 ****
                  buffer = []
                  for segments in self.enumerate(name):
                      buffer.append(string.join(segments, ''))
!                 line = kanjilib.euc2sjis(
!                     name + " : " + string.join(buffer, " , "))
                  if crypt:
                      line = encrypt(line)
                  file.write("# Entry %s\r\n%s\r\n" % (name, line))
--- 698,704 ----
                  buffer = []
                  for segments in self.enumerate(name):
                      buffer.append(string.join(segments, ''))
!                 line = name + " : " + string.join(buffer, " , ")
                  if crypt:
                      line = encrypt(line)
                  file.write("# Entry %s\r\n%s\r\n" % (name, line))
***************
*** 733,739 ****
              if not line:
                  self.clear(entry)
              else:
!                 self.set(entry, kanjilib.sjis2euc(line, "replace"))
          self.set(name + ".size", str(n))
          return ""
      def exec_escape(self, argv):
--- 730,736 ----
              if not line:
                  self.clear(entry)
              else:
!                 self.set(entry, line)
          self.set(name + ".size", str(n))
          return ""
      def exec_escape(self, argv):
diff -cr ninix.old/main.py ninix/main.py
*** ninix.old/main.py	Thu Dec 27 21:30:13 2001
--- ninix/main.py	Sat Dec 29 01:34:13 2001
***************
*** 23,29 ****
  
  VERSION = "0.5.29"
  VERSION_INFO = (r'\h\s[0]\w8ninix %s\n' % VERSION +
!                 r'¤¢¤ì°Ê³°¤Î²¿¤« with "Ç¤°Õ" for X\n'
                  r'Copyright (c) 2001 Tamito KAJIYAMA\e')
  
  WM_NAME = "ninix"
--- 23,29 ----
  
  VERSION = "0.5.29"
  VERSION_INFO = (r'\h\s[0]\w8ninix %s\n' % VERSION +
!                 r'ª¢ªìì¤èâªÎù¼ª« with "ìòëò" for X\n'
                  r'Copyright (c) 2001 Tamito KAJIYAMA\e')
  
  WM_NAME = "ninix"
***************
*** 253,268 ****
          #
          menu = gtk.GtkMenu()
          menu.set_name("popup menu")
!         add_command(menu, "¥Í¥Ã¥È¥ï¡¼¥¯¹¹¿·", self.update)
!         add_command(menu, "ºÆÆÉ¤ß¹þ¤ß", self.reload)
          add_separator(menu)
!         add_command(menu, "ÀßÄê...", self.edit_preferences)
          add_separator(menu)
!         add_command(menu, "»ÈÍÑÎ¨¥°¥é¥Õ", self.show_usage)
!         add_command(menu, "¥Ð¡¼¥¸¥ç¥ó¾ðÊó", self.about)
          add_separator(menu)
!         add_command(menu, "½ªÎ»", self.close)
!         item = gtk.GtkMenuItem("¥Õ¥¡¥¤¥ë")
          item.set_name("popup menu item")
          item.set_submenu(menu)
          item.show()
--- 253,268 ----
          #
          menu = gtk.GtkMenu()
          menu.set_name("popup menu")
!         add_command(menu, "³×Æ®¿öÅ© °»½Å", self.update)
!         add_command(menu, "´Ù½ÃÀÐ±â", self.reload)
          add_separator(menu)
!         add_command(menu, "¼³Á¤...", self.edit_preferences)
          add_separator(menu)
!         add_command(menu, "»ç¿ëÀ² ±×·¡ÇÁ", self.show_usage)
!         add_command(menu, "¹öÀü Á¤º¸", self.about)
          add_separator(menu)
!         add_command(menu, "Á¾·á", self.close)
!         item = gtk.GtkMenuItem("È­ÀÏ")
          item.set_name("popup menu item")
          item.set_submenu(menu)
          item.show()
***************
*** 276,282 ****
          for i in range(len(self.ghosts)):
              desc, shiori_dir, use_makoto, surface_set, balloon, prefix = \
                    self.ghosts[i]
!             name = desc.get("name", "¥´¡¼¥¹¥È#%d" % (i + 1))
              if len(surface_set) <= 1:
                  value = (type, i, 0)
                  item = group = gtk.GtkRadioMenuItem(group, name)
--- 276,282 ----
          for i in range(len(self.ghosts)):
              desc, shiori_dir, use_makoto, surface_set, balloon, prefix = \
                    self.ghosts[i]
!             name = desc.get("name", "°í½ºÆ®#%d" % (i + 1))
              if len(surface_set) <= 1:
                  value = (type, i, 0)
                  item = group = gtk.GtkRadioMenuItem(group, name)
***************
*** 306,312 ****
                          item.set_active(1)
                      submenu.append(item)
                      self.sakura_menu[value] = item
!         item = gtk.GtkMenuItem("¥´¡¼¥¹¥È")
          item.set_name("popup menu item")
          item.set_submenu(menu)
          item.show()
--- 306,312 ----
                          item.set_active(1)
                      submenu.append(item)
                      self.sakura_menu[value] = item
!         item = gtk.GtkMenuItem("°í½ºÆ®")
          item.set_name("popup menu item")
          item.set_submenu(menu)
          item.show()
***************
*** 318,324 ****
          for i in range(len(self.shells)):
              name, surface_set, balloon = self.shells[i]
              if name is None:
!                 name = "¥·¥§¥ë#%d" % (i + 1)
              if len(surface_set) == 1:
                  value = (type, i, 0)
                  item = group = gtk.GtkRadioMenuItem(group, name)
--- 318,324 ----
          for i in range(len(self.shells)):
              name, surface_set, balloon = self.shells[i]
              if name is None:
!                 name = "½©#%d" % (i + 1)
              if len(surface_set) == 1:
                  value = (type, i, 0)
                  item = group = gtk.GtkRadioMenuItem(group, name)
***************
*** 348,354 ****
                          item.set_active(1)
                      submenu.append(item)
                      self.sakura_menu[value] = item
!         item = gtk.GtkMenuItem("¥·¥§¥ë")
          item.set_name("popup menu item")
          item.set_submenu(menu)
          item.show()
--- 348,354 ----
                          item.set_active(1)
                      submenu.append(item)
                      self.sakura_menu[value] = item
!         item = gtk.GtkMenuItem("½©")
          item.set_name("popup menu item")
          item.set_submenu(menu)
          item.show()
***************
*** 361,367 ****
          group = None
          for i in range(len(self.balloons)):
              desc, balloon = self.balloons[i]
!             name = desc.get("name", "¥Ð¥ë¡¼¥ó#%d" % (i + 1))
              item = group = gtk.GtkRadioMenuItem(group, name)
              item.set_name("popup menu item")
              item.connect("activate", self.select_balloon, i)
--- 361,367 ----
          group = None
          for i in range(len(self.balloons)):
              desc, balloon = self.balloons[i]
!             name = desc.get("name", "¸»Ç³¼±#%d" % (i + 1))
              item = group = gtk.GtkRadioMenuItem(group, name)
              item.set_name("popup menu item")
              item.connect("activate", self.select_balloon, i)
***************
*** 370,376 ****
                  item.set_active(1)
              menu.append(item)
              self.balloon_menu.append(item)
!         item = gtk.GtkMenuItem("¥Ð¥ë¡¼¥ó")
          item.set_name("popup menu item")
          item.set_submenu(menu)
          item.show()
--- 370,376 ----
                  item.set_active(1)
              menu.append(item)
              self.balloon_menu.append(item)
!         item = gtk.GtkMenuItem("¸»Ç³¼±")
          item.set_name("popup menu item")
          item.set_submenu(menu)
          item.show()
***************
*** 382,395 ****
          menu = gtk.GtkMenu()
          menu.set_name("popup menu")
          group = None
!         for label, value in [("¤Ê¤·",    -1),
!                              ("1 (Â®¤¤)", 0),
                               ("2",        1),
                               ("3",        2),
                               ("4",        3),
                               ("5",        4),
                               ("6",        6),
!                              ("7 (ÃÙ¤¤)", 8)]:
              item = group = gtk.GtkRadioMenuItem(group, label)
              item.set_name("popup menu item")
              item.connect("activate", self.select_script_speed, value)
--- 382,395 ----
          menu = gtk.GtkMenu()
          menu.set_name("popup menu")
          group = None
!         for label, value in [("¾øÀ½",    -1),
!                              ("1 (ºü¸§)", 0),
                               ("2",        1),
                               ("3",        2),
                               ("4",        3),
                               ("5",        4),
                               ("6",        6),
!                              ("7 (´À¸²)", 8)]:
              item = group = gtk.GtkRadioMenuItem(group, label)
              item.set_name("popup menu item")
              item.connect("activate", self.select_script_speed, value)
***************
*** 397,403 ****
              if value == speed:
                  item.set_active(1)
              menu.append(item)
!         item = gtk.GtkMenuItem("É½¼¨¥¦¥§¥¤¥È")
          item.set_name("popup menu item")
          item.set_submenu(menu)
          item.show()
--- 397,403 ----
              if value == speed:
                  item.set_active(1)
              menu.append(item)
!         item = gtk.GtkMenuItem("Ç¥½Ã¿þÀÌÆ®")
          item.set_name("popup menu item")
          item.set_submenu(menu)
          item.show()
***************
*** 432,438 ****
                      item.connect("activate", self.select_plugin, (i, j))
                      item.show()
                      submenu.append(item)
!         item = gtk.GtkMenuItem("¥×¥é¥°¥¤¥ó")
          item.set_name("popup menu item")
          item.set_submenu(menu)
          item.show()
--- 432,438 ----
                      item.connect("activate", self.select_plugin, (i, j))
                      item.show()
                      submenu.append(item)
!         item = gtk.GtkMenuItem("ÇÃ·¯±×ÀÎ")
          item.set_name("popup menu item")
          item.set_submenu(menu)
          item.show()
***************
*** 456,462 ****
          if not surface_set:
              surface_name = None
          elif len(surface_set) == 1:
!             surface_name = "¥Þ¥¹¥¿¡¼"
          else:
              surface_name = name
          self.ghost.new(desc, shiori_dir, use_makoto, prefix)
--- 456,462 ----
          if not surface_set:
              surface_name = None
          elif len(surface_set) == 1:
!             surface_name = "¸¶½ºÅÍ"
          else:
              surface_name = name
          self.ghost.new(desc, shiori_dir, use_makoto, prefix)
***************
*** 672,678 ****
          if not surface_set:
              surface_name = None
          elif len(surface_set) == 1:
!             surface_name = "¥Þ¥¹¥¿¡¼"
          else:
              surface_name = name
          self.current_sakura = (type, i, j)
--- 672,678 ----
          if not surface_set:
              surface_name = None
          elif len(surface_set) == 1:
!             surface_name = "¸¶½ºÅÍ"
          else:
              surface_name = name
          self.current_sakura = (type, i, j)
***************
*** 855,865 ****
          self.window.vbox.pack_start(self.notebook)
          self.notebook.show()
          for name, constructor in [
!             ("¤ª¤·¤ã¤Ù¤ê", self.make_page_ai_talk),
!             ("¥¤¥Ù¥ó¥È",   self.make_page_events),
!             ("¥Õ¥©¥ó¥È",   self.make_page_fonts),
!             ("¥Þ¥¦¥¹",     self.make_page_mouse),
!             ("¥Ø¥ë¥Ñ¡¼",   self.make_page_helper),
              ]:
              self.notebook.append_page(constructor(), gtk.GtkLabel(name))
          box = gtk.GtkHButtonBox()
--- 855,865 ----
          self.window.vbox.pack_start(self.notebook)
          self.notebook.show()
          for name, constructor in [
!             ("¶°µé±â", self.make_page_ai_talk),
!             ("ÀÌº¥Æ®",   self.make_page_events),
!             ("ÆùÆ®",   self.make_page_fonts),
!             ("¸¶¿ì½º",     self.make_page_mouse),
!             ("µµ¿ò¸»",   self.make_page_helper),
              ]:
              self.notebook.append_page(constructor(), gtk.GtkLabel(name))
          box = gtk.GtkHButtonBox()
***************
*** 892,898 ****
      def hide(self):
          self.window.hide()
      def make_page_ai_talk(self):
!         frame = gtk.GtkFrame("¤ª¤·¤ã¤Ù¤ê¤ÎÀ©¸æ")
          frame.set_usize(450, 250)
          frame.set_border_width(5)
          frame.show()
--- 892,898 ----
      def hide(self):
          self.window.hide()
      def make_page_ai_talk(self):
!         frame = gtk.GtkFrame("¶°µé±â Á¶Àý")
          frame.set_usize(450, 250)
          frame.set_border_width(5)
          frame.show()
***************
*** 900,912 ****
          box.set_border_width(5)
          frame.add(box)
          box.show()
!         self.frame_intervals = gtk.GtkFrame("¤ª¤·¤ã¤Ù¤ê¤ÎÉÑÅÙ")
          self.frame_intervals.set_border_width(5)
!         button1 = gtk.GtkRadioButton(None, "¥´¡¼¥¹¥ÈÂ¦¤ÇÀ©¸æ¤¹¤ë")
          button1.connect("clicked", self.select_ai_talk_control, gtk.FALSE)
          box.pack_start(button1, gtk.FALSE)
          button1.show()
!         button2 = gtk.GtkRadioButton(button1, "ninix Â¦¤ÇÀ©¸æ¤¹¤ë")
          button2.connect("clicked", self.select_ai_talk_control, gtk.TRUE)
          box.pack_start(button2, gtk.FALSE)
          button2.show()
--- 900,912 ----
          box.set_border_width(5)
          frame.add(box)
          box.show()
!         self.frame_intervals = gtk.GtkFrame("¶°µé±â ºóµµ")
          self.frame_intervals.set_border_width(5)
!         button1 = gtk.GtkRadioButton(None, "°í½ºÆ®¿¡¼­ Á¦¾î")
          button1.connect("clicked", self.select_ai_talk_control, gtk.FALSE)
          box.pack_start(button1, gtk.FALSE)
          button1.show()
!         button2 = gtk.GtkRadioButton(button1, "ninix¿¡¼­ Á¦¾î")
          button2.connect("clicked", self.select_ai_talk_control, gtk.TRUE)
          box.pack_start(button2, gtk.FALSE)
          button2.show()
***************
*** 920,935 ****
          box2.set_border_width(5)
          self.frame_intervals.add(box2)
          box2.show()
!         button1 = gtk.GtkRadioButton(None, "¤ª¤·¤ã¤Ù¤ê¤Ê¤·")
          box2.pack_start(button1, gtk.FALSE)
          button1.show()
!         button2 = gtk.GtkRadioButton(button1, "¤¿¤Þ¤Ë¤·¤ã¤Ù¤ë (2Ê¬´Ö³Ö)")
          box2.pack_start(button2, gtk.FALSE)
          button2.show()
!         button3 = gtk.GtkRadioButton(button1, "¤è¤¯¤·¤ã¤Ù¤ë¡¡ (1Ê¬´Ö³Ö)")
          box2.pack_start(button3, gtk.FALSE)
          button3.show()
!         button4 = gtk.GtkRadioButton(button1, "¤«¤Ê¤ê¤·¤ã¤Ù¤ë (30ÉÃ´Ö³Ö)")
          box2.pack_start(button4, gtk.FALSE)
          button4.show()
          self.ai_talk_interval = {
--- 920,935 ----
          box2.set_border_width(5)
          self.frame_intervals.add(box2)
          box2.show()
!         button1 = gtk.GtkRadioButton(None, "¶°µéÁö ¾ÊÀ½")
          box2.pack_start(button1, gtk.FALSE)
          button1.show()
!         button2 = gtk.GtkRadioButton(button1, "°¡²û ¸»ÇÑ´Ù(2ºÐ °£°Ý)")
          box2.pack_start(button2, gtk.FALSE)
          button2.show()
!         button3 = gtk.GtkRadioButton(button1, "ÀÚÁÖ ¶°µç´Ù(1ºÐ °£°Ý)")
          box2.pack_start(button3, gtk.FALSE)
          button3.show()
!         button4 = gtk.GtkRadioButton(button1, "¸Å¿ì ¶°µç´Ù(30ÃÊ °£°Ý)")
          box2.pack_start(button4, gtk.FALSE)
          button4.show()
          self.ai_talk_interval = {
***************
*** 942,948 ****
      def select_ai_talk_control(self, widget, value):
          self.frame_intervals.set_sensitive(value)
      def make_page_events(self):
!         frame = gtk.GtkFrame("È¯À¸¤òÍÞÀ©¤¹¤ë¥¤¥Ù¥ó¥È")
          frame.set_usize(450, 250)
          frame.set_border_width(5)
          frame.show()
--- 942,948 ----
      def select_ai_talk_control(self, widget, value):
          self.frame_intervals.set_sensitive(value)
      def make_page_events(self):
!         frame = gtk.GtkFrame("¹ß»ýÀ» ¾ïÁ¦ÇÒ ÀÌº¥Æ®")
          frame.set_usize(450, 250)
          frame.set_border_width(5)
          frame.show()
***************
*** 972,978 ****
              self.event_kill_list[events[i]] = button
          return frame
      def make_page_fonts(self):
!         frame = gtk.GtkFrame("¥Ð¥ë¡¼¥ó¥Õ¥©¥ó¥È")
          frame.set_usize(450, 250)
          frame.set_border_width(5)
          frame.show()
--- 972,978 ----
              self.event_kill_list[events[i]] = button
          return frame
      def make_page_fonts(self):
!         frame = gtk.GtkFrame("¸»Ç³¼± ÆùÆ®")
          frame.set_usize(450, 250)
          frame.set_border_width(5)
          frame.show()
***************
*** 991,1001 ****
          scrollbar = gtk.GtkVScrollbar(self.fonts.get_vadjustment())
          hbox.pack_start(scrollbar, gtk.FALSE)
          scrollbar.show()
!         label = gtk.GtkLabel("¡¦¥Õ¥©¥ó¥È¥»¥Ã¥È¤ò¹½À®¤¹¤ë¥Õ¥©¥ó¥È¤ò³Æ¹Ô¤Ë°ì¤Ä¤º¤Äµ­½Ò¤·¤Þ¤¹")
          label.set_alignment(0, -1)
          vbox.pack_start(label, gtk.FALSE)
          label.show()
!         label = gtk.GtkLabel("¡¦%d ¤Ï¥Õ¥©¥ó¥È¥µ¥¤¥º¤ËÃÖ¤­´¹¤¨¤é¤ì¤Þ¤¹")
          label.set_alignment(0, -1)
          vbox.pack_start(label, gtk.FALSE)
          label.show()
--- 991,1001 ----
          scrollbar = gtk.GtkVScrollbar(self.fonts.get_vadjustment())
          hbox.pack_start(scrollbar, gtk.FALSE)
          scrollbar.show()
!         label = gtk.GtkLabel("ÆùÆ®ÁýÇÕÀ» ±¸¼ºÇÏ´Â ÆùÆ®¸¦ °¢Çà¿¡ ÇÏ³ª¾¿ ±â¼úÇÕ´Ï´Ù.")
          label.set_alignment(0, -1)
          vbox.pack_start(label, gtk.FALSE)
          label.show()
!         label = gtk.GtkLabel("%d ´Â ÆùÆ® Å©±â·Î º¯È¯µË´Ï´Ù")
          label.set_alignment(0, -1)
          vbox.pack_start(label, gtk.FALSE)
          label.show()
***************
*** 1003,1009 ****
      def make_page_mouse(self):
          page = gtk.GtkVBox(spacing=5)
          page.set_border_width(5)
!         frame = gtk.GtkFrame("º¸¥¯¥ê¥Ã¥¯¤ÎÆ°ºî")
          frame.set_usize(400, 125)
          frame.show()
          page.pack_start(frame)
--- 1003,1009 ----
      def make_page_mouse(self):
          page = gtk.GtkVBox(spacing=5)
          page.set_border_width(5)
!         frame = gtk.GtkFrame("ÁÂÅ¬¸¯ÀÇ µ¿ÀÛ")
          frame.set_usize(400, 125)
          frame.show()
          page.pack_start(frame)
***************
*** 1011,1023 ****
          frame.add(box)
          box.show()
          box.set_border_width(5)
!         button1 = gtk.GtkRadioButton(None, "¥Ð¥ë¡¼¥ó¤ò¾Ãµî")
          box.pack_start(button1, gtk.FALSE)
          button1.show()
!         button2 = gtk.GtkRadioButton(button1, "Á´¥¦¥£¥ó¥É¥¦¤òÁ°ÌÌ¤Ø°ÜÆ°")
          box.pack_start(button2, gtk.FALSE)
          button2.show()
!         button3 = gtk.GtkRadioButton(button1, "Á´¥¦¥£¥ó¥É¥¦¤ò¸åÌÌ¤Ø°ÜÆ°")
          box.pack_start(button3, gtk.FALSE)
          button3.show()
          self.mouse_button1 = {
--- 1011,1023 ----
          frame.add(box)
          box.show()
          box.set_border_width(5)
!         button1 = gtk.GtkRadioButton(None, "¸»Ç³¼±À» ¼Ò°Å")
          box.pack_start(button1, gtk.FALSE)
          button1.show()
!         button2 = gtk.GtkRadioButton(button1, "¸ðµç À©µµ¿ì¸¦ Àü¸éÀ¸·Î ÀÌµ¿")
          box.pack_start(button2, gtk.FALSE)
          button2.show()
!         button3 = gtk.GtkRadioButton(button1, "¸ðµç À©µµ¿ì¸¦ ÈÄ¸éÀ¸·Î ÀÌµ¿")
          box.pack_start(button3, gtk.FALSE)
          button3.show()
          self.mouse_button1 = {
***************
*** 1025,1031 ****
              ninix.sakura.BUTTON1_RAISE: button2,
              ninix.sakura.BUTTON1_LOWER: button3,
              }
!         frame = gtk.GtkFrame("±¦¥¯¥ê¥Ã¥¯¤ÎÆ°ºî")
          frame.set_usize(400, 125)
          frame.show()
          page.pack_start(frame)
--- 1025,1031 ----
              ninix.sakura.BUTTON1_RAISE: button2,
              ninix.sakura.BUTTON1_LOWER: button3,
              }
!         frame = gtk.GtkFrame("¿ìÅ¬¸¯ÀÇ µ¿ÀÛ")
          frame.set_usize(400, 125)
          frame.show()
          page.pack_start(frame)
***************
*** 1033,1045 ****
          box.set_border_width(5)
          frame.add(box)
          box.show()
!         button1 = gtk.GtkRadioButton(None, "¥Ð¥ë¡¼¥ó¤ò¾Ãµî")
          box.pack_start(button1, gtk.FALSE)
          button1.show()
!         button2 = gtk.GtkRadioButton(button1, "Á´¥¦¥£¥ó¥É¥¦¤òÁ°ÌÌ¤Ø°ÜÆ°")
          box.pack_start(button2, gtk.FALSE)
          button2.show()
!         button3 = gtk.GtkRadioButton(button1, "Á´¥¦¥£¥ó¥É¥¦¤ò¸åÌÌ¤Ø°ÜÆ°")
          box.pack_start(button3, gtk.FALSE)
          button3.show()
          self.mouse_button3 = {
--- 1033,1045 ----
          box.set_border_width(5)
          frame.add(box)
          box.show()
!         button1 = gtk.GtkRadioButton(None, "¸»Ç³¼±À» ¼Ò°Å")
          box.pack_start(button1, gtk.FALSE)
          button1.show()
!         button2 = gtk.GtkRadioButton(button1, "¸ðµç À©µµ¿ì¸¦ Àü¸éÀ¸·Î ÀÌµ¿")
          box.pack_start(button2, gtk.FALSE)
          button2.show()
!         button3 = gtk.GtkRadioButton(button1, "¸ðµç À©µµ¿ì¸¦ ÈÄ¸éÀ¸·Î ÀÌµ¿")
          box.pack_start(button3, gtk.FALSE)
          button3.show()
          self.mouse_button3 = {
***************
*** 1050,1056 ****
          page.show()
          return page
      def make_page_helper(self):
!         frame = gtk.GtkFrame("¥Ö¥é¥¦¥¶")
          frame.set_usize(450, 250)
          frame.set_border_width(5)
          frame.show()
--- 1050,1056 ----
          page.show()
          return page
      def make_page_helper(self):
!         frame = gtk.GtkFrame("ºê¶ó¿ìÀú")
          frame.set_usize(450, 250)
          frame.set_border_width(5)
          frame.show()
***************
*** 1061,1071 ****
          self.browser = gtk.GtkEntry()
          box.pack_start(self.browser, gtk.FALSE)
          self.browser.show()
!         label = gtk.GtkLabel("¡¦%s ¤Ï URL ¤ËÃÖ¤­´¹¤¨¤é¤ì¤Þ¤¹")
          label.set_alignment(0, -1)
          box.pack_start(label, gtk.FALSE)
          label.show()
!         label = gtk.GtkLabel("¡¦ËöÈø¤Ë & ¤òÉÕ¤±¤ëÉ¬Í×¤Ï¤¢¤ê¤Þ¤»¤ó (¼«Æ°Åª¤ËÉÕ²Ã¤µ¤ì¤Þ¤¹)")
          label.set_alignment(0, -1)
          box.pack_start(label, gtk.FALSE)
          label.show()
--- 1061,1071 ----
          self.browser = gtk.GtkEntry()
          box.pack_start(self.browser, gtk.FALSE)
          self.browser.show()
!         label = gtk.GtkLabel("%s ´Â URL·Î ´ëÄ¡µË´Ï´Ù.")
          label.set_alignment(0, -1)
          box.pack_start(label, gtk.FALSE)
          label.show()
!         label = gtk.GtkLabel("¸Ç µÚ¿¡ &¸¦ ºÙÀÏ ÇÊ¿ä°¡ ¾ø½À´Ï´Ù. (ÀÚµ¿ÀûÀ¸·Î Ãß°¡µË´Ï´Ù.)")
          label.set_alignment(0, -1)
          box.pack_start(label, gtk.FALSE)
          label.show()
***************
*** 1132,1138 ****
  
  class UsageDialog:
      fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1," \
!               "-*-fixed-medium-r-normal--12-*-*-*-*-*-jisx0208.1983-0"
      def __init__(self):
          self.window = gtk.GtkDialog()
          self.window.set_title("Usage")
--- 1132,1138 ----
  
  class UsageDialog:
      fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1," \
!               "-*-gulim-medium-r-normal--12-*-*-*-*-*-ksc5601.1987-0"
      def __init__(self):
          self.window = gtk.GtkDialog()
          self.window.set_title("Usage")
diff -cr ninix.old/niseshiori.py ninix/niseshiori.py
*** ninix.old/niseshiori.py	Fri Dec 28 22:31:00 2001
--- ninix/niseshiori.py	Fri Dec 28 23:01:53 2001
***************
*** 8,14 ****
  import string
  import StringIO
  
- import kanjilib
  
  try:
      import _niseshiori
--- 8,13 ----
***************
*** 122,128 ****
              definitions.append(string.join(lines, ''))
          # parse each line
          for line in definitions:
-             line = kanjilib.sjis2euc(line, "replace")
              # special case: words in a category
              match = self.re_category.match(line)
              if match:
--- 121,126 ----
*** ninix.old/sstp.py	Thu Dec 27 21:30:13 2001
--- ninix/sstp.py	Sat Dec 29 22:19:52 2001
***************
*** 25,31 ****
          self.request_handler = None
      def send_answer(self, value):
          self.send_response(200, # OK
!                            kanjilib.euc2sjis(value) + "\r\n")
      def send_no_content(self):
          self.send_response(204) # No Content
      def send_sstp_break(self):
--- 25,31 ----
          self.request_handler = None
      def send_answer(self, value):
          self.send_response(200, # OK
!                            value + "\r\n")
      def send_no_content(self):
          self.send_response(204) # No Content
      def send_sstp_break(self):
***************
*** 197,203 ****
              return None
          return handle
      def get_converter(self):
!         charset = self.headers.get("charset", "Shift_JIS")
          converter = kanjilib.get_converter(charset, "EUC-JP")
          if converter is None:
              self.send_response(420, "Refuse (unsupported charset)")
--- 197,203 ----
              return None
          return handle
      def get_converter(self):
!         charset = self.headers.get("charset", "EUC-JP")
          converter = kanjilib.get_converter(charset, "EUC-JP")
          if converter is None:
              self.send_response(420, "Refuse (unsupported charset)")
***************
*** 249,255 ****
              return
          elif command == "getname":
              self.send_response(200)
!             self.wfile.write(kanjilib.euc2sjis(self.ghost_names()) + "\r\n")
          elif command == "getversion":
              self.send_response(200)
              self.wfile.write("ninix %s\r\n" % ninix.main.VERSION)
--- 249,255 ----
              return
          elif command == "getname":
              self.send_response(200)
!             self.wfile.write(self.ghost_names() + "\r\n")
          elif command == "getversion":
              self.send_response(200)
              self.wfile.write("ninix %s\r\n" % ninix.main.VERSION)
diff -cr config.old/fontrc config/fontrc
*** config.old/fontrc	Sat Dec 29 21:31:02 2001
--- config/fontrc	Sat Dec 29 21:30:14 2001
***************
*** 1,3 ****
--- 1,4 ----
  # fontrc for ninix
  -*-helvetica-medium-r-normal--%d-*-*-*-*-*-iso8859-1,
+ -*-gulim-medium-r-normal--%d-*-*-*-*-*-ksc5601.1987-0,
  -*-fixed-medium-r-normal--%d-*-*-*-*-*-jisx0208.1983-0
