gettext 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea025535dd03f709a5e262af7dd2e247a0364f7e
-  data.tar.gz: ff34d6fff8e667f81bbd597d114fbf5e7a1c915c
+  metadata.gz: a50a620332a3a49684d87620897190049ebc092b
+  data.tar.gz: 59a027f33d3db49c684d07f52af1070554b0795c
 SHA512:
-  metadata.gz: dfb317f505c8158073d7d3d4de69d4d3f15c6e4bd1f5e69166cf526c69f41e2c972ba0c968da82591c76cf3d57eceedba9f4b6dccaad0208d9de163ffc6782b8
-  data.tar.gz: 4962eac7c541cbdbbb289851d0b31ae9a9102c7c386269600297ae9a9407c4dcd4dd465f90cc1991e97a44cce133f77dcb09246d10724425f868cd2bbbb07066
+  metadata.gz: ee7420a33fc3c0cd4a76883df01e7112153b1cf6d0db8189678b339251405547dcd0334058f49e809965a0ca4767297b7dfa2edf1555dfcd2b50aacf4364885e
+  data.tar.gz: dfb185db33d8cb776da95540180a1ca84958d4d8a15ee900539e19448916c0fdc4e275c61b1933b08a105063789867fc1325a8896f5fa9355f8b028be3d2f707

data/doc/text/news.md

@@ -1,5 +1,13 @@
 # News
 
+## <a id="3-0-6">3.0.6</a>: 2014-02-02
+
+### Improvements
+
+  * Added {GetText::POEntry#translated?}.
+  * `rmsgcat` chooses translated entry if it exists.
+  * `rmsgmerge`: Added `--no-obsolete-entries` option.
+
 ## <a id="3-0-5">3.0.5</a>: 2014-02-02
 
 ### Fixes

data/lib/gettext/po_entry.rb

@@ -203,6 +203,13 @@ module GetText
       @flags.include?("fuzzy")
     end
 
+    # @return true if the entry is translated entry, false otherwise.
+    def translated?
+      return false if fuzzy?
+      return false if @msgstr.nil? or @msgstr.empty?
+      true
+    end
+
     def [](number)
       param = @param_type[number]
       raise ParseError, 'no more string parameters expected' unless param

data/lib/gettext/tools/msgcat.rb

@@ -93,7 +93,11 @@ module GetText
             return merge_fuzzy_entry(base_entry, new_entry)
           end
 
-          base_entry
+          if base_entry.translated?
+            base_entry
+          else
+            new_entry
+          end
         end
 
         def merge_header(base_entry, new_entry)

data/lib/gettext/tools/msgmerge.rb

@@ -97,7 +97,7 @@ module GetText
             result[*id] = merge_definition(entry)
           end
 
-          add_obsolete_entry(result)
+          add_obsolete_entry(result) if @config.output_obsolete_entries?
           result
         end
 
@@ -254,6 +254,9 @@ module GetText
         # (#see #enable_fuzzy_matching?)
         attr_writer :enable_fuzzy_matching
 
+        # (#see #output_obsolete_entries?)
+        attr_writer :output_obsolete_entries
+
         # The result is written back to def.po.
         #       --backup=CONTROL        make a backup of def.po
         #       --suffix=SUFFIX         override the usual backup suffix
@@ -278,6 +281,7 @@ module GetText
           }
           @enable_fuzzy_matching = true
           @update = nil
+          @output_obsolete_entries = true
           @backup = ENV["VERSION_CONTROL"]
           @suffix = ENV["SIMPLE_BACKUP_SUFFIX"] || "~"
           @input_dirs = ["."]
@@ -301,6 +305,12 @@ module GetText
           @enable_fuzzy_matching
         end
 
+        # @return [Bool] true if outputting obsolete entries is
+        #    enabled, false otherwise.
+        def output_obsolete_entries?
+          @output_obsolete_entries
+        end
+
         private
         def create_option_parser
           parser = OptionParser.new
@@ -380,6 +390,11 @@ module GetText
             @enable_fuzzy_matching = boolean
           end
 
+          parser.on("--no-obsolete-entries",
+                    _("Don't output obsolete entries")) do |boolean|
+            @output_obsolete_entries = boolean
+          end
+
           parser.on("-h", "--help", _("Display this help and exit")) do
             puts(parser.help)
             exit(true)

data/lib/gettext/version.rb

@@ -9,5 +9,5 @@
 =end
 
 module GetText
-  VERSION = "3.0.5"
+  VERSION = "3.0.6"
 end

data/po/bg/gettext.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ruby-gettext 2.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-20 22:54+0900\n"
+"POT-Creation-Date: 2014-02-02 23:46+0900\n"
 "PO-Revision-Date: 2013-09-20 22:58+0900\n"
 "Last-Translator: Sava Chankov <sava.chankov@gmail.com>\n"
 "Language-Team: Bulgarian <ruby-on-rails-bulgaria@googlegroups.com>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/gettext/runtime/textdomain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:148
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr "Третият параметър е грешен: value = %{number}"
 
@@ -28,6 +28,80 @@ msgstr "Третият параметър е грешен: value = %{number}"
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 
+#: ../lib/gettext/tools/msgcat.rb:172
+msgid "Usage: %s [OPTIONS] PO_FILE1 PO_FILE2 ..."
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:174
+msgid "Concatenates and merges PO files."
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:176 ../lib/gettext/tools/msgfmt.rb:86
+#: ../lib/gettext/tools/msginit.rb:89 ../lib/gettext/tools/msgmerge.rb:329
+#: ../lib/gettext/tools/xgettext.rb:248
+msgid "Specific options:"
+msgstr "Специфични опции:"
+
+#: ../lib/gettext/tools/msgcat.rb:179 ../lib/gettext/tools/msgmerge.rb:337
+msgid "Write output to specified file"
+msgstr "изходът беше записан в зададения файл"
+
+#: ../lib/gettext/tools/msgcat.rb:180
+msgid "(default: the standard output)"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:185 ../lib/gettext/tools/msgcat.rb:202
+#: ../lib/gettext/tools/msgmerge.rb:342 ../lib/gettext/tools/msgmerge.rb:361
+#: ../lib/gettext/tools/xgettext.rb:302
+msgid "Sort output by msgid"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:190 ../lib/gettext/tools/msgcat.rb:195
+#: ../lib/gettext/tools/msgmerge.rb:349 ../lib/gettext/tools/msgmerge.rb:356
+msgid "Sort output by location"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:196 ../lib/gettext/tools/msgmerge.rb:350
+msgid "It is same as --sort-by-location"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:197 ../lib/gettext/tools/msgcat.rb:204
+#: ../lib/gettext/tools/msgmerge.rb:344 ../lib/gettext/tools/msgmerge.rb:351
+msgid "Just for GNU gettext's msgcat compatibility"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:203 ../lib/gettext/tools/msgmerge.rb:343
+msgid "It is same as --sort-by-msgid"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:209
+msgid "Remove location information"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:214
+msgid "Remove all comments"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:219 ../lib/gettext/tools/msgmerge.rb:371
+#: ../lib/gettext/tools/xgettext.rb:312
+msgid "Set output page width"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgmerge.rb:377
+#: ../lib/gettext/tools/xgettext.rb:318
+msgid ""
+"Break long message lines, longer than the output page width, into several line"
+"s"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:236
+msgid "Ignore fuzzy entries"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:241
+msgid "Don't report warning messages"
+msgstr ""
+
 #: ../lib/gettext/tools/msgfmt.rb:65
 msgid "no input files specified."
 msgstr "няма зададени файлове"
@@ -40,16 +114,11 @@ msgstr "Употреба: %s input.po [-o output.mo]"
 msgid "Generate binary message catalog from textual translation description."
 msgstr "Генериране на двоични файлове с преводите от текстовите описания."
 
-#: ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:89
-#: ../lib/gettext/tools/msgmerge.rb:266 ../lib/gettext/tools/xgettext.rb:218
-msgid "Specific options:"
-msgstr "Специфични опции:"
-
-#: ../lib/gettext/tools/msgfmt.rb:89 ../lib/gettext/tools/xgettext.rb:221
+#: ../lib/gettext/tools/msgfmt.rb:89 ../lib/gettext/tools/xgettext.rb:251
 msgid "write output to specified file"
 msgstr "изходът беше записан в зададения файл"
 
-#: ../lib/gettext/tools/msgfmt.rb:93 ../lib/gettext/tools/xgettext.rb:271
+#: ../lib/gettext/tools/msgfmt.rb:93 ../lib/gettext/tools/xgettext.rb:349
 msgid "display version information and exit"
 msgstr "показване на версията и изход"
 
@@ -77,7 +146,7 @@ msgid ""
 " locale on your environment."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:112 ../lib/gettext/tools/msgmerge.rb:317
+#: ../lib/gettext/tools/msginit.rb:112 ../lib/gettext/tools/msgmerge.rb:398
 msgid "Display this help and exit"
 msgstr ""
 
@@ -103,64 +172,50 @@ msgstr ""
 msgid "file '%s' has already existed."
 msgstr "Файлът '%s' съществува."
 
-#: ../lib/gettext/tools/msginit.rb:200
+#: ../lib/gettext/tools/msginit.rb:202
 msgid "Please enter your full name"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:229
+#: ../lib/gettext/tools/msginit.rb:231
 msgid "Please enter your email address"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:255
+#: ../lib/gettext/tools/msgmerge.rb:318
 msgid "Usage: %s [OPTIONS] definition.po reference.pot"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:258
+#: ../lib/gettext/tools/msgmerge.rb:321
 msgid ""
 "Merges two Uniforum style .po files together. The definition.po file is an exi"
 "sting PO file with translations. The reference.pot file is the last created PO"
 " file with up-to-date source references. The reference.pot is generally create"
 "d by rxgettext."
 msgstr ""
-"Слива два Uniforum .pо файла. definition.po е съществуващ PO файл с преводи. reference.pot "
-"е пресен PO файл с актуални референции към кода. reference.pot обикновено е създаден"
-" от rgettext."
+"Слива два Uniforum .pо файла. definition.po е съществуващ PO файл с преводи. r"
+"eference.pot е пресен PO файл с актуални референции към кода. reference.pot об"
+"икновено е създаден от rgettext."
 
-#: ../lib/gettext/tools/msgmerge.rb:269
+#: ../lib/gettext/tools/msgmerge.rb:332
 msgid "Update definition.po"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:274
-msgid "Write output to specified file"
-msgstr "изходът беше записан в зададения файл"
-
-#: ../lib/gettext/tools/msgmerge.rb:279
-msgid "Generate sorted output"
-msgstr ""
-
-#: ../lib/gettext/tools/msgmerge.rb:284
-msgid "Sort output by file location"
-msgstr ""
-
-#: ../lib/gettext/tools/msgmerge.rb:289
-msgid "Sort output by msgid"
+#: ../lib/gettext/tools/msgmerge.rb:366 ../lib/gettext/tools/xgettext.rb:307
+msgid "Preserve '#: FILENAME:LINE' lines"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:294
-msgid "Preserve '#: FILENAME:LINE' lines"
+#: ../lib/gettext/tools/msgmerge.rb:388
+msgid "Disable fuzzy matching"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:299
-msgid "Set output page width"
+#: ../lib/gettext/tools/msgmerge.rb:389
+msgid "(enable)"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:305
-msgid ""
-"Break long message lines, longer than the output page width, into several line"
-"s"
+#: ../lib/gettext/tools/msgmerge.rb:394
+msgid "Don't output obsolete entries"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:323
+#: ../lib/gettext/tools/msgmerge.rb:404
 msgid "Display version information and exit"
 msgstr "показване на версията и изход"
 
@@ -168,79 +223,91 @@ msgstr "показване на версията и изход"
 msgid "`%{file}' is not glade-2.0 format."
 msgstr "`%{file}' не е във формат glade-2.0."
 
-#: ../lib/gettext/tools/xgettext.rb:64
+#: ../lib/gettext/tools/xgettext.rb:65
 msgid "'%{klass}' is ignored."
 msgstr "'%{klass}' беше игнориран."
 
-#: ../lib/gettext/tools/xgettext.rb:183
+#: ../lib/gettext/tools/xgettext.rb:170
 msgid "Error parsing %{path}"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:194
+#: ../lib/gettext/tools/xgettext.rb:229
 msgid "no input files"
 msgstr "няма зададени файлове"
 
-#: ../lib/gettext/tools/xgettext.rb:212
+#: ../lib/gettext/tools/xgettext.rb:242
 msgid "Usage: %s input.rb [-r parser.rb] [-o output.pot]"
 msgstr "Употреба: %s input.rb [-r parser.rb] [-o output.pot] "
 
-#: ../lib/gettext/tools/xgettext.rb:215
+#: ../lib/gettext/tools/xgettext.rb:245
 msgid "Extract translatable strings from given input files."
 msgstr "Извличане на преводните низове от зададените файлове."
 
-#: ../lib/gettext/tools/xgettext.rb:226
+#: ../lib/gettext/tools/xgettext.rb:256
 msgid "set package name in output"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:231
+#: ../lib/gettext/tools/xgettext.rb:262
 msgid "set package version in output"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:236
-msgid "set report address for msgid bugs"
+#: ../lib/gettext/tools/xgettext.rb:268
+msgid "set report e-mail address for msgid bugs"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:241
+#: ../lib/gettext/tools/xgettext.rb:274
 msgid "set copyright holder in output"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:243
-msgid "require the library before executing xgettext"
-msgstr "заредете библиотеката с require преди да изпълните rgettext"
+#: ../lib/gettext/tools/xgettext.rb:280
+msgid "set copyright year in output"
+msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:246
+#: ../lib/gettext/tools/xgettext.rb:286
 msgid "set encoding for output"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:251
-msgid "display this help and exit"
-msgstr "показване на версията и изход"
+#: ../lib/gettext/tools/xgettext.rb:292
+msgid "Generate sorted output"
+msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:256
+#: ../lib/gettext/tools/xgettext.rb:297
+msgid "Sort output by file location"
+msgstr ""
+
+#: ../lib/gettext/tools/xgettext.rb:329
+msgid "require the library before executing xgettext"
+msgstr "заредете библиотеката с require преди да изпълните rgettext"
+
+#: ../lib/gettext/tools/xgettext.rb:334
 msgid ""
 "If TAG is specified, place comment blocks starting with TAG and precedding key"
 "word lines in output file"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:257
+#: ../lib/gettext/tools/xgettext.rb:335
 msgid ""
 "If TAG is not specified, place all comment blocks preceing keyword lines in ou"
 "tput file"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:258
-msgid "(default: %s)"
+#: ../lib/gettext/tools/xgettext.rb:336
+msgid "no TAG"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:258
-msgid "no TAG"
+#: ../lib/gettext/tools/xgettext.rb:336
+msgid "(default: %s)"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:262
+#: ../lib/gettext/tools/xgettext.rb:340
 msgid "run in debugging mode"
 msgstr "изпълнение в режим на дебъгване"
 
-#: ../lib/gettext/tools/xgettext.rb:320
+#: ../lib/gettext/tools/xgettext.rb:344
+msgid "display this help and exit"
+msgstr "показване на версията и изход"
+
+#: ../lib/gettext/tools/xgettext.rb:375
 msgid ""
 "Warning: The empty \"\" msgid is reserved by gettext. So gettext(\"\") doesn't ret"
 "urns empty string but the header entry in po file."
@@ -251,19 +318,22 @@ msgid "This message is from hellolib."
 msgstr ""
 
 #: ../samples/hello.rb:17
-msgid "Hello World\n"
+msgid ""
+"Hello World\n"
 msgstr ""
 
 #: ../samples/hello2.rb:19
-msgid "One is %{num}\n"
+msgid ""
+"One is %{num}\n"
 msgstr ""
 
 #: ../samples/hello2.rb:20
-msgid "Hello %{world}\n"
+msgid "World"
 msgstr ""
 
 #: ../samples/hello2.rb:20
-msgid "World"
+msgid ""
+"Hello %{world}\n"
 msgstr ""
 
 #: ../samples/hello_glade2.glade:9 ../test/fixtures/gladeparser.glade:8
@@ -294,8 +364,10 @@ msgid "Hello World2"
 msgstr ""
 
 #: ../samples/hello_plural.rb:20
-msgid "There is an apple.\n"
-msgid_plural "There are %{num} apples.\n"
+msgid ""
+"There is an apple.\n"
+msgid_plural ""
+"There are %{num} apples.\n"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -311,7 +383,8 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../test/fixtures/N_.rb:14 ../test/fixtures/_.rb:34
-msgid "aaa\n"
+msgid ""
+"aaa\n"
 msgstr ""
 
 #: ../test/fixtures/N_.rb:18 ../test/fixtures/_.rb:38
@@ -454,7 +527,8 @@ msgid "one line"
 msgstr ""
 
 #: ../test/fixtures/_/one_new_line.rb:28
-msgid "one new line\n"
+msgid ""
+"one new line\n"
 msgstr ""
 
 #: ../test/fixtures/backslash.rb:27
@@ -528,7 +602,8 @@ msgid "no data"
 msgstr ""
 
 #: ../test/fixtures/n_.rb:33
-msgid "bbb\n"
+msgid ""
+"bbb\n"
 msgid_plural ""
 "ccc2\n"
 "ccc2"
@@ -791,31 +866,18 @@ msgstr[1] ""
 msgid "a translation"
 msgstr ""
 
-#: ../lib/gettext/tools.rb:81
 #~ msgid "Failed to merge with %{defpo}"
 #~ msgstr "Пропадна сливането с %{defpo}"
-
-#: ../lib/gettext/tools.rb:82
 #~ msgid "New .pot was copied to %{failed_filename}"
 #~ msgstr "Новия .pot беше копиран като %{failed_filename}"
-
-#: ../lib/gettext/tools.rb:83
 #~ msgid "Check these po/pot-files. It may have syntax errors or something wrong."
 #~ msgstr "Проверете тези po/pot файлове. Може да имат синтактични грешки или нещо друго."
-
-#: ../lib/gettext/tools/msgmerge.rb:453
 #~ msgid "definition po is not given."
 #~ msgstr "съществуващия po не е зададен."
-
-#: ../lib/gettext/tools/msgmerge.rb:455
 #~ msgid "reference pot is not given."
 #~ msgstr "pot с референциите не е зададен."
-
-#: ../lib/gettext/tools/msgmerge.rb:463
 #~ msgid "Usage: %s definition.po reference.pot [-o output.pot]"
 #~ msgstr "Употреба: %s definition.po reference.pot [-o output.pot]"
-
-#: ../lib/gettext/tools/msgmerge.rb:466
 #~ msgid ""
 #~ "Merges two Uniforum style .po files together. The definition.po file is an existing P"
 #~ "O file with translations. The reference.pot file is the last created PO file with up"