twine 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebc7f372d107cb4c3b9a12da92b792c510209d59
-  data.tar.gz: 72ccda8290612adfc0f7ac75f86756bc1d945333
+  metadata.gz: 09e04e3949a2a98ab2483771f9def4c71942edbc
+  data.tar.gz: eaf82148761e31028a7918faaab00b721f41c661
 SHA512:
-  metadata.gz: 44bf1d87f0b3e88e70cc8962dd708a35866a74710e95706ae5e4061c02995b00afb6175acb1d5219605ec391b60ceeddf01edb83bd253d73e14681847cd8aac6
-  data.tar.gz: ea504d997033b778bb9f458fb33ef1f75bfb4d57c6da1771685f092c3fa1b2362f8bdf82d2a85cbcaade440c42617f21e130c7baab7767f5522f27843f78ca5f
+  metadata.gz: e55fbf7a14149928f4ebfaa20f44ceef593152a7233d73b2e29ccbb0b88e5a6fd25086bfc9af04a7721513b9297487f8302b4947d3afdac5cc0e614648a203e2
+  data.tar.gz: b722d1aa76cb00b135ae13b1081bc14f488c9bc3da42527046e19096edf796f65df250e086f7c923af43bea72cd9a5154372f90af213570f5c44001634601a58

data/README.md

@@ -100,7 +100,7 @@ If you would like to enable twine to create language files in another format, cr
 
 #### `generate-string-file`
 
-This command creates an Apple or Android strings file from the master strings data file.
+This command creates an Apple or Android strings file from the master strings data file. If the output file would not contain any translations, twine will exit with an error.
 
 	$ twine generate-string-file /path/to/strings.txt values-ja.xml --tags common,app1
 	$ twine generate-string-file /path/to/strings.txt Localizable.strings --lang ja --tags mytag
@@ -108,7 +108,7 @@ This command creates an Apple or Android strings file from the master strings da
 
 #### `generate-all-string-files`
 
-This command is a convenient way to call `generate-string-file` multiple times. It uses standard Mac OS X, iOS, and Android conventions to figure out exactly which files to create given a parent directory. For example, if you point it to a parent directory containing `en.lproj`, `fr.lproj`, and `ja.lproj` subdirectories, Twine will create a `Localizable.strings` file of the appropriate language in each of them. This is often the command you will want to execute during the build phase of your project.
+This command is a convenient way to call `generate-string-file` multiple times. It uses standard Mac OS X, iOS, and Android conventions to figure out exactly which files to create given a parent directory. For example, if you point it to a parent directory containing `en.lproj`, `fr.lproj`, and `ja.lproj` subdirectories, Twine will create a `Localizable.strings` file of the appropriate language in each of them. However, files that would not contain any translations will not be created; instead warnings will be logged to `stderr`. This is often the command you will want to execute during the build phase of your project.
 
 	$ twine generate-all-string-files /path/to/strings.txt /path/to/project/locales/directory --tags common,app1
 
@@ -128,7 +128,7 @@ This command reads in a folder containing many `.strings` or `.xml` files. These
 
 #### `generate-loc-drop`
 
-This command is a convenient way to generate a zip file containing files created by the `generate-string-file` command. It is often used for creating a single zip containing a large number of strings in all languages which you can then hand off to your translation team.
+This command is a convenient way to generate a zip file containing files created by the `generate-string-file` command. If a file would not contain any translated strings, it is skipped and a warning is logged to `stderr`. This command can be used to create a single zip containing a large number of strings in all languages which you can then hand off to your translation team.
 
 	$ twine generate-loc-drop /path/to/strings.txt LocDrop1.zip
 	$ twine generate-loc-drop /path/to/strings.txt LocDrop2.zip --lang en,fr,ja,ko --tags common,app1

data/lib/twine/cli.rb

@@ -13,93 +13,103 @@ module Twine
     }
 
     def self.parse(args)
-      options = {}
+      options = { include: :all }
+
       parser = OptionParser.new do |opts|
         opts.banner = 'Usage: twine COMMAND STRINGS_FILE [INPUT_OR_OUTPUT_PATH] [--lang LANG1,LANG2...] [--tags TAG1,TAG2,TAG3...] [--format FORMAT]'
         opts.separator ''
-        opts.separator 'The purpose of this script is to convert back and forth between multiple data formats, allowing us to treat our strings (and translations) as data stored in a text file. We can then use the data file to create drops for the localization team, consume similar drops returned by the localization team, and create formatted string files to ship with your products. Twine currently supports iOS, OS X, Android, gettext, and jquery-localize string files.'
+        opts.separator 'The purpose of this script is to convert back and forth between multiple data formats, allowing us to treat our strings (and translations) as data stored in a text file. We can then use the data file to create drops for the localization team, consume similar drops returned by the localization team, and create formatted string files to ship with your products.'
         opts.separator ''
         opts.separator 'Commands:'
         opts.separator ''
-        opts.separator 'generate-string-file -- Generates a string file in a certain LANGUAGE given a particular FORMAT. This script will attempt to guess both the language and the format given the filename and extension. For example, "ko.xml" will generate a Korean language file for Android.'
+        opts.separator '- generate-string-file'
+        opts.separator '    Generates a string file in a certain LANGUAGE given a particular FORMAT. This script will attempt to guess both the language and the format given the filename and extension. For example, "ko.xml" will generate a Korean language file for Android.'
         opts.separator ''
-        opts.separator 'generate-all-string-files -- Generates all the string files necessary for a given project. The parent directory to all of the locale-specific directories in your project should be specified as the INPUT_OR_OUTPUT_PATH. This command will most often be executed by your build script so that each build always contains the most recent strings.'
+        opts.separator '- generate-all-string-files'
+        opts.separator '    Generates all the string files necessary for a given project. The parent directory to all of the locale-specific directories in your project should be specified as the INPUT_OR_OUTPUT_PATH. This command will most often be executed by your build script so that each build always contains the most recent strings.'
         opts.separator ''
-        opts.separator 'consume-string-file -- Slurps all of the strings from a translated strings file into the specified STRINGS_FILE. If you have some files returned to you by your translators you can use this command to incorporate all of their changes. This script will attempt to guess both the language and the format given the filename and extension. For example, "ja.strings" will assume that the file is a Japanese iOS strings file.'
+        opts.separator '- consume-string-file'
+        opts.separator '    Slurps all of the strings from a translated strings file into the specified STRINGS_FILE. If you have some files returned to you by your translators you can use this command to incorporate all of their changes. This script will attempt to guess both the language and the format given the filename and extension. For example, "ja.strings" will assume that the file is a Japanese iOS strings file.'
         opts.separator ''
-        opts.separator 'consume-all-string-files -- Slurps all of the strings from a directory into the specified STRINGS_FILE. If you have some files returned to you by your translators you can use this command to incorporate all of their changes. This script will attempt to guess both the language and the format given the filename and extension. For example, "ja.strings" will assume that the file is a Japanese iOS strings file.'
+        opts.separator '- consume-all-string-files'
+        opts.separator '    Slurps all of the strings from a directory into the specified STRINGS_FILE. If you have some files returned to you by your translators you can use this command to incorporate all of their changes. This script will attempt to guess both the language and the format given the filename and extension. For example, "ja.strings" will assume that the file is a Japanese iOS strings file.'
         opts.separator ''
-        opts.separator 'generate-loc-drop -- Generates a zip archive of strings files in any format. The purpose of this command is to create a very simple archive that can be handed off to a translation team. The translation team can unzip the archive, translate all of the strings in the archived files, zip everything back up, and then hand that final archive back to be consumed by the consume-loc-drop command.'
+        opts.separator '- generate-loc-drop'
+        opts.separator '    Generates a zip archive of strings files in any format. The purpose of this command is to create a very simple archive that can be handed off to a translation team. The translation team can unzip the archive, translate all of the strings in the archived files, zip everything back up, and then hand that final archive back to be consumed by the consume-loc-drop command.'
         opts.separator ''
-        opts.separator 'consume-loc-drop -- Consumes an archive of translated files. This archive should be in the same format as the one created by the generate-loc-drop command.'
+        opts.separator '- consume-loc-drop'
+        opts.separator '    Consumes an archive of translated files. This archive should be in the same format as the one created by the generate-loc-drop command.'
         opts.separator ''
-        opts.separator 'validate-strings-file -- Validates that the given strings file is parseable, contains no duplicates, and that every string has a tag. Exits with a non-zero exit code if those criteria are not met.'
+        opts.separator '- validate-strings-file'
+        opts.separator '    Validates that the given strings file is parseable, contains no duplicates, and that every string has a tag. Exits with a non-zero exit code if those criteria are not met.'
         opts.separator ''
         opts.separator 'General Options:'
         opts.separator ''
-        opts.on('-l', '--lang LANGUAGES', Array, 'The language code(s) to use for the specified action.') do |langs|
-          options[:languages] = langs
+        opts.on('-l', '--lang LANGUAGES', Array, 'The language code(s) to use for the specified action.') do |l|
+          options[:languages] = l
         end
-        opts.on('-t', '--tags TAGS', Array, 'The tag(s) to use for the specified action. Only strings with that tag will be processed. Do not specify any tags to match all strings in the strings data file.') do |tags|
-          options[:tags] = tags
+        opts.on('-t', '--tags TAG1,TAG2,TAG3', Array, 'The tag(s) to use for the specified action. Only strings with that tag will be processed. Omit this option to match',
+                                                      '  all strings in the strings data file.') do |t|
+          options[:tags] = t
         end
-        opts.on('-u', '--untagged', 'If you have specified tags using the --tags flag, then only those tags will be selected. If you also want to select all strings that are untagged, then you can specify this option to do so.') do |u|
-          options[:untagged] = true
+        opts.on('-u', '--[no-]untagged', 'If you have specified tags using the --tags flag, then only those tags will be selected. If you also want to select',
+                                         '  all strings that are untagged, then you can specify this option to do so.') do |u|
+          options[:untagged] = u
         end
-        formats = Formatters.formatters.map(&:format_name)
-        opts.on('-f', '--format FORMAT', "The file format to read or write (#{formats.join(', ')}). Additional formatters can be placed in the formats/ directory.") do |format|
-          unless formats.include?(format.downcase)
-            raise Twine::Error.new "Invalid format: #{format}"
-          end
-          options[:format] = format.downcase
+        formats = Formatters.formatters.map(&:format_name).map(&:downcase)
+        opts.on('-f', '--format FORMAT', formats, "The file format to read or write: (#{formats.join(', ')}).",
+                                                  "  Additional formatters can be placed in the formats/ directory.") do |f|
+          options[:format] = f
         end
-        opts.on('-a', '--consume-all', 'Normally, when consuming a string file, Twine will ignore any string keys that do not exist in your master file.') do |a|
+        opts.on('-a', '--[no-]consume-all', 'Normally, when consuming a string file, Twine will ignore any string keys that do not exist in your master file.') do |a|
           options[:consume_all] = true
         end
-        opts.on('-i', '--include SET', "This flag will determine which strings are included when generating strings files. It's possible values:",
+        opts.on('-i', '--include SET', [:all, :translated, :untranslated],
+                                        "This flag will determine which strings are included when generating strings files. It's possible values:",
                                         "  all: All strings both translated and untranslated for the specified language are included. This is the default value.",
                                         "  translated: Only translated strings are included.",
-                                        "  untranslated: Only untranslated strings are included.") do |set|
-          unless ['all', 'translated', 'untranslated'].include?(set.downcase)
-            raise Twine::Error.new "Invalid include flag: #{set}"
-          end
-          options[:include] = set.downcase
-        end
-        unless options[:include]
-          options[:include] = 'all' 
+                                        "  untranslated: Only untranslated strings are included.") do |i|
+          options[:include] = i
         end
-        opts.on('-o', '--output-file OUTPUT_FILE', 'Write the new strings database to this file instead of replacing the original file. This flag is only useful when running the consume-string-file or consume-loc-drop commands.') do |o|
+        opts.on('-o', '--output-file OUTPUT_FILE', 'Write the new strings database to this file instead of replacing the original file. This flag is only useful when',
+                                                   '  running the consume-string-file or consume-loc-drop commands.') do |o|
           options[:output_path] = o
         end
         opts.on('-n', '--file-name FILE_NAME', 'When running the generate-all-string-files command, this flag may be used to overwrite the default file name of the format.') do |n|
           options[:file_name] = n
         end
-        opts.on('-r', '--create-folders', "When running the generate-all-string-files command, this flag may be used to create output folders for all languages, if they don't exist yet. As a result all languages will be exported, not only the ones where an output folder already exists.") do |r|
-          options[:create_folders] = true
+        opts.on('-r', '--[no-]create-folders', "When running the generate-all-string-files command, this flag may be used to create output folders for all languages,",
+                                               "  if they  don't exist yet. As a result all languages will be exported, not only the ones where an output folder already",
+                                               "  exists.") do |r|
+          options[:create_folders] = r
         end
-        opts.on('-d', '--developer-language LANG', 'When writing the strings data file, set the specified language as the "developer language". In practice, this just means that this language will appear first in the strings data file. When generating files this language will be used as default language and its translations will be used if a key is not localized for the output language.') do |d|
+        opts.on('-d', '--developer-language LANG', 'When writing the strings data file, set the specified language as the "developer language". In practice, this just',
+                                                   '  means that this language will appear first in the strings data file. When generating files this language will be',
+                                                   '  used as default language and its translations will be used if a key is not localized for the output language.') do |d|
           options[:developer_language] = d
         end
-        opts.on('-c', '--consume-comments', 'Normally, when consuming a string file, Twine will ignore all comments in the file. With this flag set, any comments encountered will be read and parsed into the strings data file. This is especially useful when creating your first strings data file from an existing project.') do |c|
-          options[:consume_comments] = true
+        opts.on('-c', '--[no-]consume-comments', 'Normally, when consuming a string file, Twine will ignore all comments in the file. With this flag set, any comments',
+                                                 '  encountered will be read and parsed into the strings data file. This is especially useful when creating your first',
+                                                 '  strings data file from an existing project.') do |c|
+          options[:consume_comments] = c
         end
-        opts.on('-e', '--encoding ENCODING', 'Twine defaults to encoding all output files in UTF-8. This flag will tell Twine to use an alternate encoding for these files. For example, you could use this to write Apple .strings files in UTF-16. This flag is currently only supported in Ruby 1.9.3 or greater.') do |e|
-          unless "".respond_to? :encode
-            raise Twine::Error.new "The --encoding flag is only supported on Ruby 1.9.3 or greater."
-          end
+        opts.on('-e', '--encoding ENCODING', 'Twine defaults to encoding all output files in UTF-8. This flag will tell Twine to use an alternate encoding for these',
+                                             '  files. For example, you could use this to write Apple .strings files in UTF-16. When reading files, Twine does its best',
+                                             "  to determine the encoding automatically. However, if the files are UTF-16 without BOM, you need to specify if it's", 
+                                             '  UTF-16LE or UTF16-BE.') do |e|
           options[:output_encoding] = e
         end
-        opts.on('--validate', 'Validate the strings file before formatting it') do
-          options[:validate] = true
+        opts.on('--[no-]validate', 'Validate the strings file before formatting it.') do |validate|
+          options[:validate] = validate
         end
-        opts.on('-p', '--pedantic', 'When validating a strings file, perform additional checks that go beyond pure validity (like presence of tags)') do
-          options[:pedantic] = true
+        opts.on('-p', '--[no-]pedantic', 'When validating a strings file, perform additional checks that go beyond pure validity (like presence of tags).') do |p|
+          options[:pedantic] = p
         end
         opts.on('-h', '--help', 'Show this message.') do |h|
           puts opts.help
           exit
         end
-        opts.on('--version', 'Print the version number and exit.') do |x|
+        opts.on('--version', 'Print the version number and exit.') do
           puts "Twine version #{Twine::VERSION}"
           exit
         end
@@ -114,11 +124,16 @@ module Twine
         opts.separator '> twine consume-loc-drop strings.txt LocDrop5.zip'
         opts.separator '> twine validate-strings-file strings.txt'
       end
-      parser.parse! args
+      begin
+        parser.parse! args
+      rescue OptionParser::ParseError => e
+        Twine::stderr.puts e.message
+        exit false
+      end
 
       if args.length == 0
         puts parser.help
-        exit
+        exit false
       end
 
       number_of_needed_arguments = NEEDED_COMMAND_ARGUMENTS[args[0]]

data/lib/twine/encoding.rb

@@ -1,20 +1,22 @@
 module Twine
   module Encoding
-    def self.encoding_for_path path
-      File.open(path, 'rb') do |f|
-        begin
-          a = f.readbyte
-          b = f.readbyte
-          if (a == 0xfe && b == 0xff)
-            return 'UTF-16BE'
-          elsif (a == 0xff && b == 0xfe)
-            return 'UTF-16LE'
-          end
-        rescue EOFError
-        end
-      end
 
-      'UTF-8'
+    def self.bom(path)
+      first_bytes = IO.binread(path, 2)
+      return nil unless first_bytes
+      first_bytes = first_bytes.codepoints.map.to_a
+      return 'UTF-16BE' if first_bytes == [0xFE, 0xFF]
+      return 'UTF-16LE' if first_bytes == [0xFF, 0xFE]
+    rescue EOFError
+      return nil
+    end
+
+    def self.has_bom?(path)
+      !bom(path).nil?
+    end
+
+    def self.encoding_for_path(path)
+      bom(path) || 'UTF-8'      
     end
   end
 end

data/lib/twine/formatters/abstract.rb

@@ -83,15 +83,20 @@ module Twine
         lang
       end
 
-      def read_file(path, lang)
-        raise NotImplementedError.new("You must implement read_file in your formatter class.")
+      def read(io, lang)
+        raise NotImplementedError.new("You must implement read in your formatter class.")
       end
 
-      def format_file(strings, lang)
+      def format_file(lang)
+        output_processor = Processors::OutputProcessor.new(@strings, @options)
+        processed_strings = output_processor.process(lang)
+
+        return nil if processed_strings.strings_map.empty?
+
         header = format_header(lang)
         result = ""
         result += header + "\n" if header
-        result += format_sections(strings, lang)
+        result += format_sections(processed_strings, lang)
       end
 
       def format_header(lang)
@@ -153,50 +158,6 @@ module Twine
       def escape_quotes(text)
         text.gsub('"', '\\\\"')
       end
-
-      def write_file(path, lang)
-        output_processor = Processors::OutputProcessor.new(@strings, @options)
-        processed_strings = output_processor.process(lang)
-
-        encoding = @options[:output_encoding] || 'UTF-8'
-        File.open(path, "w:#{encoding}") do |f|
-          f.puts format_file(processed_strings, lang)
-        end
-      end
-
-      def write_all_files(path)
-        file_name = @options[:file_name] || default_file_name
-        if @options[:create_folders]
-          @strings.language_codes.each do |lang|
-            output_path = File.join(path, output_path_for_language(lang))
-
-            FileUtils.mkdir_p(output_path)
-
-            file_path = File.join(output_path, file_name)
-            write_file(file_path, lang)
-          end
-        else
-          language_written = false
-          Dir.foreach(path) do |item|
-            next if item == "." or item == ".."
-
-            item = File.join(path, item)
-            next unless File.directory?(item)
-
-            lang = determine_language_given_path(item)
-            next unless lang
-
-            file_path = File.join(item, file_name)
-            write_file(file_path, lang)
-            language_written = true
-          end
-
-          if !language_written
-            raise Twine::Error.new("Failed to generate any files: No languages found at #{path}")
-          end
-        end
-      end
-
     end
   end
 end

data/lib/twine/formatters/android.rb

@@ -7,11 +7,11 @@ module Twine
     class Android < Abstract
       include Twine::Placeholders
 
-      LANG_CODES = Hash[
-        'zh' => 'zh-Hans',
+      LANG_MAPPINGS = Hash[
         'zh-rCN' => 'zh-Hans',
         'zh-rHK' => 'zh-Hant',
         'en-rGB' => 'en-UK',
+        'zh' => 'zh-Hans',
         'in' => 'id',
         'nb' => 'no'
         # TODO: spanish
@@ -39,10 +39,12 @@ module Twine
           if segment == 'values'
             return @strings.language_codes[0]
           else
-            match = /^values-(.*)$/.match(segment)
+            # The language is defined by a two-letter ISO 639-1 language code, optionally followed by a two letter ISO 3166-1-alpha-2 region code (preceded by lowercase "r").
+            # see http://developer.android.com/guide/topics/resources/providing-resources.html#AlternativeResources
+            match = /^values-([a-z]{2}(-r[a-z]{2})?)$/i.match(segment)
             if match
               lang = match[1]
-              lang = LANG_CODES.fetch(lang, lang)
+              lang = LANG_MAPPINGS.fetch(lang, lang)
               lang.sub!('-r', '-')
               return lang
             end
@@ -52,6 +54,10 @@ module Twine
         return
       end
 
+      def output_path_for_language(lang)
+        "values-" + (LANG_MAPPINGS.key(lang) || lang)
+      end
+
       def set_translation_for_key(key, lang, value)
         value = CGI.unescapeHTML(value)
         value.gsub!('\\\'', '\'')
@@ -62,7 +68,7 @@ module Twine
         super(key, lang, value)
       end
 
-      def read_file(path, lang)
+      def read(io, lang)
         resources_regex = /<resources(?:[^>]*)>(.*)<\/resources>/m
         key_regex = /<string name="(\w+)">/
         comment_regex = /<!-- (.*) -->/
@@ -71,27 +77,25 @@ module Twine
         value = nil
         comment = nil
 
-        File.open(path, 'r:UTF-8') do |f|
-          content_match = resources_regex.match(f.read)
-          if content_match
-            for line in content_match[1].split(/\r?\n/)
-              key_match = key_regex.match(line)
-              if key_match
-                key = key_match[1]
-                value_match = value_regex.match(line)
-                value = value_match ? value_match[1] : ""
-                
-                set_translation_for_key(key, lang, value)
-                if comment and comment.length > 0 and !comment.start_with?("SECTION:")
-                  set_comment_for_key(key, comment)
-                end
-                comment = nil
-              end
-
-              comment_match = comment_regex.match(line)
-              if comment_match
-                comment = comment_match[1]
+        content_match = resources_regex.match(io.read)
+        if content_match
+          for line in content_match[1].split(/\r?\n/)
+            key_match = key_regex.match(line)
+            if key_match
+              key = key_match[1]
+              value_match = value_regex.match(line)
+              value = value_match ? value_match[1] : ""
+              
+              set_translation_for_key(key, lang, value)
+              if comment and comment.length > 0 and !comment.start_with?("SECTION:")
+                set_comment_for_key(key, comment)
               end
+              comment = nil
+            end
+            
+            comment_match = comment_regex.match(line)
+            if comment_match
+              comment = comment_match[1]
             end
           end
         end
@@ -106,7 +110,7 @@ module Twine
         
         result += super + "\n"
 
-        result += '</resources>'
+        result += "</resources>\n"
       end
 
       def format_section_header(section)

data/lib/twine/formatters/apple.rb

@@ -35,56 +35,28 @@ module Twine
         "#{lang}.lproj"
       end
 
-      def read_file(path, lang)
-        encoding = Twine::Encoding.encoding_for_path(path)
-        sep = nil
-        if !encoding.respond_to?(:encode)
-          # This code is not necessary in 1.9.3 and does not work as it did in 1.8.7.
-          if encoding.end_with? 'LE'
-            sep = "\x0a\x00"
-          elsif encoding.end_with? 'BE'
-            sep = "\x00\x0a"
-          else
-            sep = "\n"
-          end
-        end
-
-        if encoding.index('UTF-16')
-          mode = "rb:#{encoding}"
-        else
-          mode = "r:#{encoding}"
-        end
-
-        File.open(path, mode) do |f|
-          last_comment = nil
-          while line = (sep) ? f.gets(sep) : f.gets
-            if encoding.index('UTF-16')
-              if line.respond_to? :encode!
-                line.encode!('UTF-8')
-              else
-                require 'iconv'
-                line = Iconv.iconv('UTF-8', encoding, line).join
-              end
-            end
-            match = /"((?:[^"\\]|\\.)+)"\s*=\s*"((?:[^"\\]|\\.)*)"/.match(line)
-            if match
-              key = match[1]
-              key.gsub!('\\"', '"')
-              value = match[2]
-              value.gsub!('\\"', '"')
-              set_translation_for_key(key, lang, value)
-              if last_comment
-                set_comment_for_key(key, last_comment)
-              end
-            end
-
-            match = /\/\* (.*) \*\//.match(line)
-            if match
-              last_comment = match[1]
-            else
-              last_comment = nil
+      def read(io, lang)
+        last_comment = nil
+        while line = io.gets
+          # matches a `key = "value"` line, where key may be quoted or unquoted. The former may also contain escaped characters
+          match = /^\s*((?:"(?:[^"\\]|\\.)+")|(?:[^"\s=]+))\s*=\s*"((?:[^"\\]|\\.)*)"/.match(line)
+          if match
+            key = match[1]
+            key = key[1..-2] if key[0] == '"' and key[-1] == '"'
+            key.gsub!('\\"', '"')
+            value = match[2]
+            value.gsub!('\\"', '"')
+            set_translation_for_key(key, lang, value)
+            if last_comment
+              set_comment_for_key(key, last_comment)
             end
+          end
 
+          match = /\/\* (.*) \*\//.match(line)
+          if match
+            last_comment = match[1]
+          else
+            last_comment = nil
           end
         end
       end