gettext 2.1.0 → 2.2.0

data/lib/gettext/tools/pomessage.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module GetText
   class ParseError < StandardError
   end
@@ -25,7 +27,7 @@ module GetText
     end
 
     # Required
-    attr_accessor :type          # :normal, :plural, :msgctxt, :msgctxt_plural 
+    attr_accessor :type          # :normal, :plural, :msgctxt, :msgctxt_plural
     attr_accessor :msgid
     # Options
     attr_accessor :msgid_plural
@@ -33,7 +35,7 @@ module GetText
     attr_accessor :sources    # ["file1:line1", "file2:line2", ...]
     attr_accessor :comment
 
-    # Create the object. +type+ should be :normal, :plural, :msgctxt or :msgctxt_plural. 
+    # Create the object. +type+ should be :normal, :plural, :msgctxt or :msgctxt_plural.
     def initialize(type)
       @type = type
       @sources = []
@@ -60,7 +62,7 @@ module GetText
     # Checks if the other translation target is mergeable with
     # the current one. Relevant are msgid and translation context (msgctxt).
     def ==(other)
-      other.msgid == self.msgid && other.msgctxt == self.msgctxt
+      other && other.msgid == self.msgid && other.msgctxt == self.msgctxt
     end
 
     # Merges two translation targets with the same msgid and returns the merged
@@ -125,7 +127,7 @@ module GetText
     end
 
     # Returns true if the type is kind of msgctxt.
-    # And if this is a kind of msgctxt and msgctxt property 
+    # And if this is a kind of msgctxt and msgctxt property
     # is nil, then raise an RuntimeException.
     def msgctxt?
       if [:msgctxt, :msgctxt_plural].include? @type
@@ -135,7 +137,7 @@ module GetText
     end
 
     # Returns true if the type is kind of plural.
-    # And if this is a kind of plural and msgid_plural property 
+    # And if this is a kind of plural and msgid_plural property
     # is nil, then raise an RuntimeException.
     def plural?
       if [:plural, :msgctxt_plural].include? @type
@@ -164,7 +166,7 @@ module GetText
       type = :normal
       msgctxt = nil
       msgid_plural = nil
-      
+
       if msgid.include? "\004"
         msgctxt, msgid = msgid.split(/\004/)
         type = :msgctxt
@@ -193,5 +195,5 @@ module GetText
       send param
     end
   end
-  
+
 end

data/lib/gettext/tools/poparser.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 =begin
   poparser.rb - Generate a .mo
 
@@ -28,7 +30,7 @@ module_eval(<<'...end poparser.ry/module_eval...', 'poparser.ry', 108)
     ret.gsub!(/\\"/, "\"")
     ret
   end
-  
+
   def parse(str, data, ignore_fuzzy = true)
     @comments = []
     @data = data
@@ -41,39 +43,39 @@ module_eval(<<'...end poparser.ry/module_eval...', 'poparser.ry', 108)
     until str.empty? do
       case str
       when /\A\s+/
-	str = $'
+  str = $'
       when /\Amsgctxt/
-	@q.push [:MSGCTXT, $&]
-	str = $'
+  @q.push [:MSGCTXT, $&]
+  str = $'
       when /\Amsgid_plural/
-	@q.push [:MSGID_PLURAL, $&]
-	str = $'
+  @q.push [:MSGID_PLURAL, $&]
+  str = $'
       when /\Amsgid/
-	@q.push [:MSGID, $&]
-	str = $'
+  @q.push [:MSGID, $&]
+  str = $'
       when /\Amsgstr/
-	@q.push [:MSGSTR, $&]
-	str = $'
+  @q.push [:MSGSTR, $&]
+  str = $'
       when /\A\[(\d+)\]/
-	@q.push [:PLURAL_NUM, $1]
-	str = $'
+  @q.push [:PLURAL_NUM, $1]
+  str = $'
       when /\A\#~(.*)/
-	$stderr.print _("Warning: obsolete msgid exists.\n")
-	$stderr.print "         #{$&}\n"
-	@q.push [:COMMENT, $&]
-	str = $'
+  $stderr.print _("Warning: obsolete msgid exists.\n")
+  $stderr.print "         #{$&}\n"
+  @q.push [:COMMENT, $&]
+  str = $'
       when /\A\#(.*)/
-	@q.push [:COMMENT, $&]
-	str = $'      
+  @q.push [:COMMENT, $&]
+  str = $'
       when /\A\"(.*)\"/
-	@q.push [:STRING, $1]
-	str = $'
+  @q.push [:STRING, $1]
+  str = $'
       else
-	#c = str[0,1]
-	#@q.push [:STRING, c]
-	str = str[1..-1]
+  #c = str[0,1]
+  #@q.push [:STRING, c]
+  str = str[1..-1]
       end
-    end 
+    end
     @q.push [false, '$end']
     if $DEBUG
       @q.each do |a,b|
@@ -88,7 +90,7 @@ module_eval(<<'...end poparser.ry/module_eval...', 'poparser.ry', 108)
     end
     @data
   end
-  
+
   def next_token
     @q.shift
   end
@@ -101,11 +103,11 @@ module_eval(<<'...end poparser.ry/module_eval...', 'poparser.ry', 108)
     @comments.clear
     @msgctxt = ""
   end
-      
+
   def on_comment(comment)
     @fuzzy = true if (/fuzzy/ =~ comment)
     @comments << comment
-  end 
+  end
 
   def parse_file(po_file, data, ignore_fuzzy = true)
     args = [ po_file ]
@@ -253,7 +255,7 @@ Racc_debug_parser = true
 module_eval(<<'.,.,', 'poparser.ry', 23)
   def _reduce_5(val, _values, result)
         @msgctxt = unescape(val[1]) + "\004"
-  
+
     result
   end
 .,.,
@@ -264,7 +266,7 @@ module_eval(<<'.,.,', 'poparser.ry', 23)
 
 module_eval(<<'.,.,', 'poparser.ry', 35)
   def _reduce_8(val, _values, result)
-        if @fuzzy and $ignore_fuzzy 
+        if @fuzzy and $ignore_fuzzy
       if val[1] != ""
         $stderr.print _("Warning: fuzzy message was ignored.\n")
         $stderr.print "  #{@po_file}: msgid '#{val[1]}'\n"
@@ -276,7 +278,7 @@ module_eval(<<'.,.,', 'poparser.ry', 35)
       on_message(@msgctxt + unescape(val[1]), unescape(val[3]))
     end
     result = ""
-  
+
     result
   end
 .,.,
@@ -295,7 +297,7 @@ module_eval(<<'.,.,', 'poparser.ry', 52)
       on_message(@msgctxt + unescape(val[1]) + "\000" + unescape(val[3]), unescape(val[4]))
     end
     result = ""
-  
+
     result
   end
 .,.,
@@ -307,7 +309,7 @@ module_eval(<<'.,.,', 'poparser.ry', 70)
     else
       result = ""
     end
-  
+
     result
   end
 .,.,
@@ -317,7 +319,7 @@ module_eval(<<'.,.,', 'poparser.ry', 70)
 module_eval(<<'.,.,', 'poparser.ry', 82)
   def _reduce_12(val, _values, result)
         result = val[2]
-  
+
     result
   end
 .,.,
@@ -325,7 +327,7 @@ module_eval(<<'.,.,', 'poparser.ry', 82)
 module_eval(<<'.,.,', 'poparser.ry', 89)
   def _reduce_13(val, _values, result)
         on_comment(val[0])
-  
+
     result
   end
 .,.,
@@ -333,7 +335,7 @@ module_eval(<<'.,.,', 'poparser.ry', 89)
 module_eval(<<'.,.,', 'poparser.ry', 97)
   def _reduce_14(val, _values, result)
         result = val.delete_if{|item| item == ""}.join
-  
+
     result
   end
 .,.,
@@ -341,7 +343,7 @@ module_eval(<<'.,.,', 'poparser.ry', 97)
 module_eval(<<'.,.,', 'poparser.ry', 101)
   def _reduce_15(val, _values, result)
         result = val[0]
-  
+
     result
   end
 .,.,

data/lib/gettext/tools/rgettext.rb

@@ -2,12 +2,12 @@
 =begin
   rgettext.rb - Generate a .pot file.
 
-  Copyright (C) 2003-2009  Masao Mutoh
+  Copyright (C) 2003-2010  Masao Mutoh
   Copyright (C) 2001,2002  Yasushi Shoji, Masao Mutoh
- 
+
       Yasushi Shoji   <yashi at atmark-techno.com>
       Masao Mutoh     <mutomasa at gmail.com>
- 
+
   You may redistribute it and/or modify it under the same
   license terms as Ruby or LGPL.
 =end
@@ -25,7 +25,7 @@ module GetText
 
     # constant values
     VERSION = GetText::VERSION
- 
+
     @ex_parsers = []
     [
       ["glade.rb", "GladeParser"],
@@ -46,19 +46,45 @@ module GetText
 
     # Add an option parser
     # the option parser module requires to have target?(file) and parser(file, ary) method.
-    # 
+    #
     #  require 'gettext/tools/rgettext'
     #  module FooParser
     #    module_function
     #    def target?(file)
     #      File.extname(file) == '.foo'  # *.foo file only.
     #    end
-    #    def parse(file, ary)
+    #    def parse(file)
     #      :
-    #      return ary # [["msgid1", "foo.rb:200"], ["msgid2", "bar.rb:300", "baz.rb:400"], ...]
+    #      ary = []
+    #      # Simple message
+    #      po = PoMessage.new(:normal)
+    #      po.msgid = "hello"
+    #      po.sources = ["foo.rb:200", "bar.rb:300"]
+    #      po.add_comment("Comment for the message")
+    #      ary << po
+    #      # Plural message
+    #      po = PoMessage.new(:plural)
+    #      po.msgid = "An apple"
+    #      po.msgid_plural = "Apples"
+    #      po.sources = ["foo.rb:200", "bar.rb:300"]
+    #      ary << po
+    #      # Simple message with the message context
+    #      po = PoMessage.new(:msgctxt)
+    #      po.msgctxt = "context"
+    #      po.msgid = "hello"
+    #      po.sources = ["foo.rb:200", "bar.rb:300"]
+    #      ary << po
+    #      # Plural message with the message context.
+    #      po = PoMessage.new(:msgctxt_plural)
+    #      po.msgctxt = "context"
+    #      po.msgid = "An apple"
+    #      po.msgid_plural = "Apples"
+    #      po.sources = ["foo.rb:200", "bar.rb:300"]
+    #      ary << po
+    #      return ary
     #    end
     #  end
-    #  
+    #
     #  GetText::RGetText.add_parser(FooParser)
     def add_parser(klass)
       @ex_parsers.insert(0, klass)
@@ -102,6 +128,7 @@ TITLE
 
     def parse(paths) # :nodoc:
       pomessages = []
+      paths = [paths] if paths.kind_of? String
       paths.each do |path|
         begin
           @ex_parsers.each do |klass|
@@ -119,7 +146,7 @@ TITLE
                 end
 
                 # Save the previous target.
-                existing = pomessages.find_index {|t| t == pomessage}
+                existing = pomessages.empty? ? nil : pomessages.index(pomessages.find {|t| t == pomessage})
                 if existing
                   pomessage = pomessages[existing].merge(pomessage)
                   pomessages[existing] = pomessage
@@ -187,11 +214,9 @@ TITLE
       elsif ! paths
         paths, out = check_options
       end
-
       if paths.size == 0
         raise ArgumentError, _("no input files")
       end
-
       if out.is_a? String
         File.open(File.expand_path(out), "w+") do |file|
           file.puts generate_pot_header
@@ -205,8 +230,8 @@ TITLE
     end
   end
   extend self
-  # Creates a po-file from targetfiles(ruby-script-files, .rhtml files, glade-2 XML files), 
-  # then output the result to out. If no parameter is set, it behaves same as command line tools(rgettet). 
+  # Creates a po-file from targetfiles(ruby-script-files, .rhtml files, glade-2 XML files),
+  # then output the result to out. If no parameter is set, it behaves same as command line tools(rgettet).
   #
   # This function is a part of GetText.create_pofiles.
   # Usually you don't need to call this function directly.

data/lib/gettext/tools/rmsgfmt.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 =begin
   rmsgfmt.rb - Generate a .mo
 
@@ -23,13 +25,13 @@ module GetText
 
     def run(targetfile = nil, output_path = nil) # :nodoc:
       unless targetfile
-	targetfile, output_path = check_options
+  targetfile, output_path = check_options
       end
       unless targetfile
-	raise ArgumentError, _("no input files")
+  raise ArgumentError, _("no input files")
       end
       unless output_path
-	output_path = "messages.mo"
+  output_path = "messages.mo"
       end
 
       parser = PoParser.new
@@ -68,8 +70,8 @@ module GetText
       [ARGV[0], output]
     end
   end
-  
-  # Creates a mo-file from a targetfile(po-file), then output the result to out. 
+
+  # Creates a mo-file from a targetfile(po-file), then output the result to out.
   # If no parameter is set, it behaves same as command line tools(rmsgfmt).
   # * targetfile: An Array of po-files or nil.
   # * output_path: output path.

data/lib/gettext/tools/rmsgmerge.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 =begin
   rmsgmerge.rb - Merge old .po to new .po
 
@@ -14,60 +16,60 @@ require 'gettext/tools/poparser'
 require 'rbconfig'
 
 module GetText
-    
+
   module RMsgMerge
-    
-    class PoData  #:nodoc:  
-      
+
+    class PoData  #:nodoc:
+
       attr_reader :msgids
-      
+
       def initialize
         @msgid2msgstr = {}
         @msgid2comment = {}
         @msgids = []
       end
-      
+
       def set_comment(msgid_or_sym, comment)
-        @msgid2comment[msgid_or_sym] = comment      
+        @msgid2comment[msgid_or_sym] = comment
       end
-      
+
       def msgstr(msgid)
         @msgid2msgstr[msgid]
       end
-      
+
       def comment(msgid)
         @msgid2comment[msgid]
       end
-      
+
       def [](msgid)
         @msgid2msgstr[msgid]
       end
-      
+
       def []=(msgid, msgstr)
         # Retain the order
         unless @msgid2msgstr[msgid]
           @msgids << msgid
         end
-        
+
         @msgid2msgstr[msgid] = msgstr
       end
-      
+
       def each_msgid
         arr = @msgids.delete_if{|i| Symbol === i or i == ''}
         arr.each do |i|
           yield i
         end
       end
-      
+
       def msgid?(msgid)
         !(Symbol === msgid) and  @msgid2msgstr[msgid] and (msgid != '')
       end
-      
+
       # Is it necessary to implement this method?
       def search_msgid_fuzzy(msgid, used_msgids)
         nil
       end
-      
+
       def nplural
         unless @msgid2msgstr['']
           return 0
@@ -77,53 +79,53 @@ module GetText
           else
             return 0
           end
-          
+
         end
       end
-      
+
       def generate_po
         str = ''
         str << generate_po_header
-        
+
         self.each_msgid do |id|
-          str << self.generate_po_entry(id)          
+          str << self.generate_po_entry(id)
         end
-        
-        str << @msgid2comment[:last]        
-        str        
+
+        str << @msgid2comment[:last]
+        str
       end
-      
+
       def generate_po_header
         str = ""
-        
+
         str << @msgid2comment[''].strip << "\n"
-        str << 'msgid ""'  << "\n"                
+        str << 'msgid ""'  << "\n"
         str << 'msgstr ""' << "\n"
         msgstr = @msgid2msgstr[''].gsub(/"/, '\"').gsub(/\r/, '')
         msgstr = msgstr.gsub(/^(.*)$/, '"\1\n"')
         str << msgstr
         str << "\n"
-        
+
         str
       end
-      
+
       def generate_po_entry(msgid)
         str = ""
         str << @msgid2comment[msgid]
         if str[-1] != "\n"[0]
           str << "\n"
         end
-        
+
         id = msgid.gsub(/"/, '\"').gsub(/\r/, '')
         msgstr = @msgid2msgstr[msgid].gsub(/"/, '\"').gsub(/\r/, '')
 
         if id.include?("\000")
-          ids = id.split(/\000/)          
+          ids = id.split(/\000/)
           str << "msgid " << __conv(ids[0]) << "\n"
           ids[1..-1].each do |single_id|
             str << "msgid_plural " << __conv(single_id) << "\n"
           end
-          
+
           msgstr.split("\000").each_with_index do |m, n|
             str << "msgstr[#{n}] " << __conv(m) << "\n"
           end
@@ -131,11 +133,11 @@ module GetText
           str << "msgid "  << __conv(id) << "\n"
           str << "msgstr " << __conv(msgstr) << "\n"
         end
-        
+
         str << "\n"
         str
       end
-      
+
       def __conv(str)
         s = ''
 
@@ -145,34 +147,34 @@ module GetText
         else
           s << '"' << str.sub("\n", "\\n") << '"'
         end
-        
+
         s.rstrip
       end
-      
+
     end
-    
+
     class Merger #:nodoc:
-      
+
       # From GNU gettext source.
-      # 
+      #
       # Merge the reference with the definition: take the #. and
-      #	#: comments from the reference, take the # comments from
-	  # the definition, take the msgstr from the definition.  Add
-	  # this merged entry to the output message list.      
+      #  #: comments from the reference, take the # comments from
+    # the definition, take the msgstr from the definition.  Add
+    # this merged entry to the output message list.
       DOT_COMMENT_RE = /\A#\./
       SEMICOLON_COMMENT_RE = /\A#\:/
       FUZZY_RE = /\A#\,/
       NOT_SPECIAL_COMMENT_RE = /\A#([^:.,]|\z)/
-      
+
       CRLF_RE = /\r?\n/
       POT_DATE_EXTRACT_RE = /POT-Creation-Date:\s*(.*)?\s*$/
       POT_DATE_RE = /POT-Creation-Date:.*?$/
-      
+
       def merge(definition, reference)
         # deep copy
-        result = Marshal.load( Marshal.dump(reference) )        
-        
-        used = []        
+        result = Marshal.load( Marshal.dump(reference) )
+
+        used = []
         merge_header(result, definition)
 
         result.each_msgid do |msgid|
@@ -181,18 +183,18 @@ module GetText
             merge_message(msgid, result, msgid, definition)
           elsif other_msgid = definition.search_msgid_fuzzy(msgid, used)
             used << other_msgid
-            merge_fuzzy_message(msgid, result, other_msgid, definition) 
+            merge_fuzzy_message(msgid, result, other_msgid, definition)
           elsif msgid.index("\000") and ( reference.msgstr(msgid).gsub("\000", '') == '' )
             # plural
             result[msgid] = "\000" * definition.nplural
           else
             change_reference_comment(msgid, result)
-          end          
+          end
         end
-        
+
         ###################################################################
         # msgids which are not used in reference are handled as obsolete. #
-        ################################################################### 
+        ###################################################################
         last_comment = result.comment(:last) || ''
         definition.each_msgid do |msgid|
           unless used.include?(msgid)
@@ -202,13 +204,13 @@ module GetText
           end
         end
         result.set_comment(:last, last_comment)
-        
+
         result
       end
-      
+
       def merge_message(msgid, target, def_msgid, definition)
         merge_comment(msgid, target, def_msgid, definition)
-        
+
         ############################################
         # check mismatch of msgid and msgid_plural #
         ############################################
@@ -216,10 +218,10 @@ module GetText
         if msgid.index("\000")
           if def_msgstr.index("\000")
             # OK
-            target[msgid] = def_msgstr			
+            target[msgid] = def_msgstr
           else
             # NG
-            s = ''            
+            s = ''
             definition.nplural.times {
               s << def_msgstr
               s << "\000"
@@ -236,29 +238,29 @@ module GetText
           end
         end
       end
-      
+
       # for the future
       def merge_fuzzy_message(msgid, target, def_msgid, definition)
         merge_message(msgid, target, def_msgid, definition)
       end
-      
+
       def merge_comment(msgid, target, def_msgid, definition)
         ref_comment = target.comment(msgid)
         def_comment = definition.comment(def_msgid)
-        
+
         normal_comment = []
         dot_comment = []
         semi_comment = []
         is_fuzzy = false
-        
-        def_comment.split(CRLF_RE).each do |l| 
+
+        def_comment.split(CRLF_RE).each do |l|
           if NOT_SPECIAL_COMMENT_RE =~ l
             normal_comment << l
-          end           
+          end
         end
-        
+
         ref_comment.split(CRLF_RE).each do |l|
-          if DOT_COMMENT_RE =~ l 
+          if DOT_COMMENT_RE =~ l
             dot_comment << l
           elsif SEMICOLON_COMMENT_RE =~ l
             semi_comment << l
@@ -266,19 +268,19 @@ module GetText
             is_fuzzy = true
           end
         end
-        
+
         str = format_comment(normal_comment, dot_comment, semi_comment, is_fuzzy)
         target.set_comment(msgid, str)
       end
-      
+
       def change_reference_comment(msgid, podata)
         normal_comment = []
         dot_comment = []
         semi_comment = []
         is_fuzzy = false
-        
+
         podata.comment(msgid).split(CRLF_RE).each do |l|
-          if DOT_COMMENT_RE =~ l 
+          if DOT_COMMENT_RE =~ l
             dot_comment << l
           elsif SEMICOLON_COMMENT_RE =~ l
             semi_comment << l
@@ -288,14 +290,14 @@ module GetText
             normal_comment << l
           end
         end
-        
+
         str = format_comment(normal_comment, dot_comment, semi_comment, is_fuzzy)
-        podata.set_comment(msgid, str)        
+        podata.set_comment(msgid, str)
       end
-      
+
       def format_comment(normal_comment, dot_comment, semi_comment, is_fuzzy)
         str = ''
-        
+
         str << normal_comment.join("\n").gsub(/^#(\s*)/){|sss|
           if $1 == ""
             "# "
@@ -306,7 +308,7 @@ module GetText
         if normal_comment.size > 0
           str << "\n"
         end
-        
+
         str << dot_comment.join("\n").gsub(/^#.(\s*)/){|sss|
           if $1 == ""
             "#. "
@@ -317,48 +319,48 @@ module GetText
         if dot_comment.size > 0
           str << "\n"
         end
-        
+
         str << semi_comment.join("\n").gsub(/^#:\s*/, "#: ")
         if semi_comment.size > 0
           str << "\n"
         end
-        
+
         if is_fuzzy
           str << "#, fuzzy\n"
         end
-        
+
         str
       end
-      
+
       def merge_header(target, definition)
         merge_comment('', target, '', definition)
-        
+
         msg = target.msgstr('')
         def_msg = definition.msgstr('')
         if POT_DATE_EXTRACT_RE =~ msg
           time = $1
           def_msg = def_msg.sub(POT_DATE_RE, "POT-Creation-Date: #{time}")
         end
-        
+
         target[''] = def_msg
       end
-      
+
     end
-    
-  end  
-  
+
+  end
+
 end
 
 module GetText::RMsgMerge #:nodoc:
 
   class Config #:nodoc:
-    
+
     attr_accessor :defpo, :refpot, :output, :fuzzy, :update
-    
+
     # update mode options
     attr_accessor :backup, :suffix
-    
-=begin      
+
+=begin
 The result is written back to def.po.
       --backup=CONTROL        make a backup of def.po
       --suffix=SUFFIX         override the usual backup suffix
@@ -370,8 +372,8 @@ the VERSION_CONTROL environment variable.  Here are the values:
   simple, never   always make simple backups
 The backup suffix is `~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX
 environment variable.
-=end      
-      
+=end
+
     def initialize
       @output = STDOUT
       @fuzzy = nil
@@ -380,23 +382,23 @@ environment variable.
       @suffix= ENV["SIMPLE_BACKUP_SUFFIX"] || "~"
       @input_dirs = ["."]
     end
-    
+
   end
-  
+
 end
 
 module GetText
-  
+
   module RMsgMerge
     extend GetText
     extend self
 
     bindtextdomain("rgettext")
-    
+
     # constant values
     VERSION = GetText::VERSION
     DATE = %w($Date: 2007/07/21 15:03:05 $)[1]
-    
+
     def check_options(config)
       opts = OptionParser.new
       opts.banner = _("Usage: %s def.po ref.pot [-o output.pot]") % $0
@@ -405,7 +407,7 @@ module GetText
       opts.separator(_("Merges two Uniforum style .po files together. The def.po file is an existing PO file with translations. The ref.pot file is the last created PO file with up-to-date source references. ref.pot is generally created by rgettext."))
       opts.separator("")
       opts.separator(_("Specific options:"))
-      
+
       opts.on("-o", "--output=FILE", _("write output to specified file")) do |out|
         unless FileTest.exist? out
           config.output = out
@@ -414,49 +416,49 @@ module GetText
           #exit 1
         end
       end
-      
+
       #opts.on("-F", "--fuzzy-matching")
-      
+
       opts.on_tail("--version", _("display version information and exit")) do
         puts "#{$0} #{VERSION} (#{DATE})"
-	puts "#{File.join(::Config::CONFIG["bindir"], ::Config::CONFIG["RUBY_INSTALL_NAME"])} #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+  puts "#{File.join(::Config::CONFIG["bindir"], ::Config::CONFIG["RUBY_INSTALL_NAME"])} #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
         exit
       end
-      
+
       opts.parse!(ARGV)
-      
+
       if ARGV.size != 2
         puts opts.help
         exit 1
       end
-      
+
       config.defpo = ARGV[0]
       config.refpot = ARGV[1]
     end
-    
+
     def run(reference = nil, definition = nil, out = STDOUT)
       config = GetText::RMsgMerge::Config.new
       config.refpot = reference
       config.defpo = definition
       config.output = out
-      
+
       check_options(config)
-      
+
       if config.defpo.nil?
         raise ArgumentError, _("definition po is not given.")
-      elsif config.refpot.nil? 
+      elsif config.refpot.nil?
         raise ArgumentError, _("reference pot is not given.")
       end
-      
+
       parser = PoParser.new
       defpo = parser.parse_file(config.defpo, PoData.new, false)
       refpot = parser.parse_file(config.refstrrefstr, PoData.new, false)
-      
+
       m = Merger.new
-      result = m.merge(defpo, refpot)      
+      result = m.merge(defpo, refpot)
       p result if $DEBUG
       print result.generate_po if $DEBUG
-      
+
       begin
         if out.is_a? String
           File.open(File.expand_path(out), "w+") do |file|
@@ -468,16 +470,16 @@ module GetText
       ensure
         out.close
       end
-    end    
-    
+    end
+
   end
-  
+
 end
 
 
 
 module GetText
-  
+
   # Experimental
   def rmsgmerge(reference = nil, definition = nil, out = STDOUT)
     RMsgMerge.run(reference, definition, out)
@@ -489,10 +491,10 @@ end
 
 if $0 == __FILE__ then
   require 'pp'
-  
+
   #parser = GetText::RMsgMerge::PoParser.new;
   #parser = GetText::PoParser.new;
   #pp parser.parse(ARGF.read)
-  
+
   GetText.rmsgmerge
 end