gettext 3.3.2 → 3.3.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (75) hide show
  1. checksums.yaml +4 -4
  2. data/doc/text/news.md +217 -0
  3. data/gettext.gemspec +0 -1
  4. data/lib/gettext/locale_path.rb +12 -8
  5. data/lib/gettext/tools/msgmerge.rb +13 -0
  6. data/lib/gettext/tools/parser/erb.rb +9 -1
  7. data/lib/gettext/tools/parser/gtk_builder_ui_definitions.rb +0 -3
  8. data/lib/gettext/tools/parser/ruby.rb +50 -23
  9. data/lib/gettext/version.rb +1 -1
  10. data/po/bg/gettext.edit.po +33 -25
  11. data/po/bg/gettext.po +9 -3
  12. data/po/bs/gettext.edit.po +33 -25
  13. data/po/bs/gettext.po +9 -3
  14. data/po/ca/gettext.edit.po +33 -25
  15. data/po/ca/gettext.po +9 -3
  16. data/po/cs/gettext.edit.po +33 -25
  17. data/po/cs/gettext.po +9 -3
  18. data/po/de/gettext.edit.po +33 -25
  19. data/po/de/gettext.po +9 -3
  20. data/po/el/gettext.edit.po +33 -25
  21. data/po/el/gettext.po +9 -3
  22. data/po/eo/gettext.edit.po +33 -25
  23. data/po/eo/gettext.po +9 -3
  24. data/po/es/gettext.edit.po +33 -25
  25. data/po/es/gettext.po +9 -3
  26. data/po/et/gettext.edit.po +33 -25
  27. data/po/et/gettext.po +9 -3
  28. data/po/fr/gettext.edit.po +33 -25
  29. data/po/fr/gettext.po +9 -3
  30. data/po/gettext.pot +36 -28
  31. data/po/hr/gettext.edit.po +33 -25
  32. data/po/hr/gettext.po +9 -3
  33. data/po/hu/gettext.edit.po +33 -25
  34. data/po/hu/gettext.po +9 -3
  35. data/po/it/gettext.edit.po +33 -25
  36. data/po/it/gettext.po +9 -3
  37. data/po/ja/gettext.edit.po +33 -25
  38. data/po/ja/gettext.po +9 -3
  39. data/po/ko/gettext.edit.po +33 -25
  40. data/po/ko/gettext.po +9 -3
  41. data/po/lv/gettext.edit.po +33 -25
  42. data/po/lv/gettext.po +9 -3
  43. data/po/nb/gettext.edit.po +33 -25
  44. data/po/nb/gettext.po +9 -3
  45. data/po/nl/gettext.edit.po +33 -25
  46. data/po/nl/gettext.po +9 -3
  47. data/po/pt_BR/gettext.edit.po +33 -25
  48. data/po/pt_BR/gettext.po +9 -3
  49. data/po/ru/gettext.edit.po +33 -25
  50. data/po/ru/gettext.po +9 -3
  51. data/po/sr/gettext.edit.po +33 -25
  52. data/po/sr/gettext.po +9 -3
  53. data/po/sv/gettext.edit.po +33 -25
  54. data/po/sv/gettext.po +9 -3
  55. data/po/uk/gettext.edit.po +33 -25
  56. data/po/uk/gettext.po +9 -3
  57. data/po/vi/gettext.edit.po +33 -25
  58. data/po/vi/gettext.po +9 -3
  59. data/po/zh/gettext.edit.po +33 -25
  60. data/po/zh/gettext.po +9 -3
  61. data/po/zh_TW/gettext.edit.po +33 -25
  62. data/po/zh_TW/gettext.po +9 -3
  63. data/test/fixtures/_/percent_strings.rb +9 -0
  64. data/test/fixtures/_/pipe.rb +32 -0
  65. data/test/fixtures/erb/minus.rhtml +12 -0
  66. data/test/fixtures/gtk_builder_ui_definitions.ui~ +68 -0
  67. data/test/fixtures/ruby/percent_I.rb +1 -0
  68. data/test/fixtures/ruby/percent_W.rb +1 -0
  69. data/test/fixtures/ruby/percent_i.rb +1 -0
  70. data/test/fixtures/ruby/percent_w.rb +1 -0
  71. data/test/run-test.rb +0 -1
  72. data/test/test_parser.rb +7 -0
  73. data/test/tools/parser/test_ruby.rb +52 -2
  74. data/test/tools/test_msgmerge.rb +34 -0
  75. metadata +21 -29
data/po/uk/gettext.po CHANGED
@@ -460,9 +460,18 @@ msgid ""
460
460
  "one new line\n"
461
461
  msgstr ""
462
462
 
463
+ msgid "in_symbol_array"
464
+ msgstr ""
465
+
463
466
  msgid "hello world"
464
467
  msgstr ""
465
468
 
469
+ msgid "in_string_array"
470
+ msgstr ""
471
+
472
+ msgid "Hello"
473
+ msgstr ""
474
+
466
475
  msgid "You should escape '\\' as '\\\\'."
467
476
  msgstr ""
468
477
 
@@ -489,9 +498,6 @@ msgstr ""
489
498
  msgid "duplicated"
490
499
  msgstr ""
491
500
 
492
- msgid "Hello"
493
- msgstr ""
494
-
495
501
  msgid ""
496
502
  "bbb\n"
497
503
  msgid_plural ""
data/po/vi/gettext.edit.po CHANGED
@@ -37,11 +37,11 @@ msgstr ""
37
37
  msgid "Concatenates and merges PO files."
38
38
  msgstr ""
39
39
 
40
- #: ../lib/gettext/tools/msgcat.rb:246 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:361 ../lib/gettext/tools/xgettext.rb:248
40
+ #: ../lib/gettext/tools/msgcat.rb:246 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:369 ../lib/gettext/tools/xgettext.rb:248
41
41
  msgid "Specific options:"
42
42
  msgstr "Tùy chọn cụ thể:"
43
43
 
44
- #: ../lib/gettext/tools/msgcat.rb:249 ../lib/gettext/tools/msgmerge.rb:369
44
+ #: ../lib/gettext/tools/msgcat.rb:249 ../lib/gettext/tools/msgmerge.rb:377
45
45
  #, fuzzy
46
46
  msgid "Write output to specified file"
47
47
  msgstr "ghi ra tập tin được chỉ định"
@@ -50,23 +50,23 @@ msgstr "ghi ra tập tin được chỉ định"
50
50
  msgid "(default: the standard output)"
51
51
  msgstr ""
52
52
 
53
- #: ../lib/gettext/tools/msgcat.rb:255 ../lib/gettext/tools/msgcat.rb:272 ../lib/gettext/tools/msgmerge.rb:374 ../lib/gettext/tools/msgmerge.rb:393 ../lib/gettext/tools/xgettext.rb:302
53
+ #: ../lib/gettext/tools/msgcat.rb:255 ../lib/gettext/tools/msgcat.rb:272 ../lib/gettext/tools/msgmerge.rb:382 ../lib/gettext/tools/msgmerge.rb:401 ../lib/gettext/tools/xgettext.rb:302
54
54
  msgid "Sort output by msgid"
55
55
  msgstr ""
56
56
 
57
- #: ../lib/gettext/tools/msgcat.rb:260 ../lib/gettext/tools/msgcat.rb:265 ../lib/gettext/tools/msgmerge.rb:381 ../lib/gettext/tools/msgmerge.rb:388
57
+ #: ../lib/gettext/tools/msgcat.rb:260 ../lib/gettext/tools/msgcat.rb:265 ../lib/gettext/tools/msgmerge.rb:389 ../lib/gettext/tools/msgmerge.rb:396
58
58
  msgid "Sort output by location"
59
59
  msgstr ""
60
60
 
61
- #: ../lib/gettext/tools/msgcat.rb:266 ../lib/gettext/tools/msgmerge.rb:382
61
+ #: ../lib/gettext/tools/msgcat.rb:266 ../lib/gettext/tools/msgmerge.rb:390
62
62
  msgid "It is same as --sort-by-location"
63
63
  msgstr ""
64
64
 
65
- #: ../lib/gettext/tools/msgcat.rb:267 ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:376 ../lib/gettext/tools/msgmerge.rb:383
65
+ #: ../lib/gettext/tools/msgcat.rb:267 ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:384 ../lib/gettext/tools/msgmerge.rb:391
66
66
  msgid "Just for GNU gettext's msgcat compatibility"
67
67
  msgstr ""
68
68
 
69
- #: ../lib/gettext/tools/msgcat.rb:273 ../lib/gettext/tools/msgmerge.rb:375
69
+ #: ../lib/gettext/tools/msgcat.rb:273 ../lib/gettext/tools/msgmerge.rb:383
70
70
  msgid "It is same as --sort-by-msgid"
71
71
  msgstr ""
72
72
 
@@ -94,11 +94,11 @@ msgstr ""
94
94
  msgid "Remove all comments"
95
95
  msgstr ""
96
96
 
97
- #: ../lib/gettext/tools/msgcat.rb:309 ../lib/gettext/tools/msgmerge.rb:403 ../lib/gettext/tools/xgettext.rb:312
97
+ #: ../lib/gettext/tools/msgcat.rb:309 ../lib/gettext/tools/msgmerge.rb:411 ../lib/gettext/tools/xgettext.rb:312
98
98
  msgid "Set output page width"
99
99
  msgstr ""
100
100
 
101
- #: ../lib/gettext/tools/msgcat.rb:315 ../lib/gettext/tools/msgmerge.rb:409 ../lib/gettext/tools/xgettext.rb:318
101
+ #: ../lib/gettext/tools/msgcat.rb:315 ../lib/gettext/tools/msgmerge.rb:417 ../lib/gettext/tools/xgettext.rb:318
102
102
  msgid "Break long message lines, longer than the output page width, into several lines"
103
103
  msgstr ""
104
104
 
@@ -106,11 +106,11 @@ msgstr ""
106
106
  msgid "Ignore fuzzy entries"
107
107
  msgstr ""
108
108
 
109
- #: ../lib/gettext/tools/msgcat.rb:331
109
+ #: ../lib/gettext/tools/msgcat.rb:331 ../lib/gettext/tools/msgmerge.rb:434
110
110
  msgid "Don't report warning messages"
111
111
  msgstr ""
112
112
 
113
- #: ../lib/gettext/tools/msgcat.rb:336 ../lib/gettext/tools/msgmerge.rb:426
113
+ #: ../lib/gettext/tools/msgcat.rb:336 ../lib/gettext/tools/msgmerge.rb:439
114
114
  msgid "Don't output obsolete entries"
115
115
  msgstr ""
116
116
 
@@ -179,7 +179,7 @@ msgstr ""
179
179
  msgid "Use EMAIL as translator email address"
180
180
  msgstr ""
181
181
 
182
- #: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:430
182
+ #: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:443
183
183
  msgid "Display this help and exit"
184
184
  msgstr ""
185
185
 
@@ -214,32 +214,32 @@ msgstr ""
214
214
  msgid "Please enter your email address"
215
215
  msgstr ""
216
216
 
217
- #: ../lib/gettext/tools/msgmerge.rb:350
217
+ #: ../lib/gettext/tools/msgmerge.rb:358
218
218
  msgid "Usage: %s [OPTIONS] definition.po reference.pot"
219
219
  msgstr ""
220
220
 
221
- #: ../lib/gettext/tools/msgmerge.rb:353
221
+ #: ../lib/gettext/tools/msgmerge.rb:361
222
222
  #, fuzzy
223
223
  msgid "Merges two Uniforum style .po files together. The definition.po file is an existing 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 created by rxgettext."
224
224
  msgstr "Trộn hai tập tin .po kiểu Uniforum. Tập tin def.po là tập tin đã tồn tại PO có chứa lời dịch. Tập tin ref.pot là tập tin PO được tạo ra lần trước có chứa tham chiếu mới nhất. ref.pot thường do rgettext tạo ra."
225
225
 
226
- #: ../lib/gettext/tools/msgmerge.rb:364
226
+ #: ../lib/gettext/tools/msgmerge.rb:372
227
227
  msgid "Update definition.po"
228
228
  msgstr ""
229
229
 
230
- #: ../lib/gettext/tools/msgmerge.rb:398 ../lib/gettext/tools/xgettext.rb:307
230
+ #: ../lib/gettext/tools/msgmerge.rb:406 ../lib/gettext/tools/xgettext.rb:307
231
231
  msgid "Preserve '#: FILENAME:LINE' lines"
232
232
  msgstr ""
233
233
 
234
- #: ../lib/gettext/tools/msgmerge.rb:420
234
+ #: ../lib/gettext/tools/msgmerge.rb:428
235
235
  msgid "Disable fuzzy matching"
236
236
  msgstr ""
237
237
 
238
- #: ../lib/gettext/tools/msgmerge.rb:421
238
+ #: ../lib/gettext/tools/msgmerge.rb:429
239
239
  msgid "(enable)"
240
240
  msgstr ""
241
241
 
242
- #: ../lib/gettext/tools/msgmerge.rb:436
242
+ #: ../lib/gettext/tools/msgmerge.rb:449
243
243
  #, fuzzy
244
244
  msgid "Display version information and exit"
245
245
  msgstr "hiện thông tin về phiên bản rồi thoát"
@@ -353,7 +353,7 @@ msgid ""
353
353
  "Hello %{world}\n"
354
354
  msgstr ""
355
355
 
356
- #: ../samples/hello2.rb:20
356
+ #: ../samples/hello2.rb:20 ../test/fixtures/_/pipe.rb:28
357
357
  msgid "World"
358
358
  msgstr ""
359
359
 
@@ -552,10 +552,22 @@ msgid ""
552
552
  "one new line\n"
553
553
  msgstr ""
554
554
 
555
- #: ../test/fixtures/_/percent_strings.rb:34
555
+ #: ../test/fixtures/_/percent_strings.rb:31
556
+ msgid "in_symbol_array"
557
+ msgstr ""
558
+
559
+ #: ../test/fixtures/_/percent_strings.rb:39
556
560
  msgid "hello world"
557
561
  msgstr ""
558
562
 
563
+ #: ../test/fixtures/_/percent_strings.rb:47
564
+ msgid "in_string_array"
565
+ msgstr ""
566
+
567
+ #: ../test/fixtures/_/pipe.rb:26 ../test/fixtures/hello.rb:26
568
+ msgid "Hello"
569
+ msgstr ""
570
+
559
571
  #: ../test/fixtures/backslash.rb:27
560
572
  msgid "You should escape '\\' as '\\\\'."
561
573
  msgstr ""
@@ -589,10 +601,6 @@ msgstr ""
589
601
  msgid "duplicated"
590
602
  msgstr ""
591
603
 
592
- #: ../test/fixtures/hello.rb:26
593
- msgid "Hello"
594
- msgstr ""
595
-
596
604
  #: ../test/fixtures/lower_n_.rb:33
597
605
  msgid ""
598
606
  "bbb\n"
data/po/vi/gettext.po CHANGED
@@ -455,9 +455,18 @@ msgid ""
455
455
  "one new line\n"
456
456
  msgstr ""
457
457
 
458
+ msgid "in_symbol_array"
459
+ msgstr ""
460
+
458
461
  msgid "hello world"
459
462
  msgstr ""
460
463
 
464
+ msgid "in_string_array"
465
+ msgstr ""
466
+
467
+ msgid "Hello"
468
+ msgstr ""
469
+
461
470
  msgid "You should escape '\\' as '\\\\'."
462
471
  msgstr ""
463
472
 
@@ -484,9 +493,6 @@ msgstr ""
484
493
  msgid "duplicated"
485
494
  msgstr ""
486
495
 
487
- msgid "Hello"
488
- msgstr ""
489
-
490
496
  msgid ""
491
497
  "bbb\n"
492
498
  msgid_plural ""
data/po/zh/gettext.edit.po CHANGED
@@ -40,11 +40,11 @@ msgstr ""
40
40
  msgid "Concatenates and merges PO files."
41
41
  msgstr ""
42
42
 
43
- #: ../lib/gettext/tools/msgcat.rb:246 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:361 ../lib/gettext/tools/xgettext.rb:248
43
+ #: ../lib/gettext/tools/msgcat.rb:246 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:369 ../lib/gettext/tools/xgettext.rb:248
44
44
  msgid "Specific options:"
45
45
  msgstr "具体选项："
46
46
 
47
- #: ../lib/gettext/tools/msgcat.rb:249 ../lib/gettext/tools/msgmerge.rb:369
47
+ #: ../lib/gettext/tools/msgcat.rb:249 ../lib/gettext/tools/msgmerge.rb:377
48
48
  #, fuzzy
49
49
  msgid "Write output to specified file"
50
50
  msgstr "输出到指定文件"
@@ -53,23 +53,23 @@ msgstr "输出到指定文件"
53
53
  msgid "(default: the standard output)"
54
54
  msgstr ""
55
55
 
56
- #: ../lib/gettext/tools/msgcat.rb:255 ../lib/gettext/tools/msgcat.rb:272 ../lib/gettext/tools/msgmerge.rb:374 ../lib/gettext/tools/msgmerge.rb:393 ../lib/gettext/tools/xgettext.rb:302
56
+ #: ../lib/gettext/tools/msgcat.rb:255 ../lib/gettext/tools/msgcat.rb:272 ../lib/gettext/tools/msgmerge.rb:382 ../lib/gettext/tools/msgmerge.rb:401 ../lib/gettext/tools/xgettext.rb:302
57
57
  msgid "Sort output by msgid"
58
58
  msgstr ""
59
59
 
60
- #: ../lib/gettext/tools/msgcat.rb:260 ../lib/gettext/tools/msgcat.rb:265 ../lib/gettext/tools/msgmerge.rb:381 ../lib/gettext/tools/msgmerge.rb:388
60
+ #: ../lib/gettext/tools/msgcat.rb:260 ../lib/gettext/tools/msgcat.rb:265 ../lib/gettext/tools/msgmerge.rb:389 ../lib/gettext/tools/msgmerge.rb:396
61
61
  msgid "Sort output by location"
62
62
  msgstr ""
63
63
 
64
- #: ../lib/gettext/tools/msgcat.rb:266 ../lib/gettext/tools/msgmerge.rb:382
64
+ #: ../lib/gettext/tools/msgcat.rb:266 ../lib/gettext/tools/msgmerge.rb:390
65
65
  msgid "It is same as --sort-by-location"
66
66
  msgstr ""
67
67
 
68
- #: ../lib/gettext/tools/msgcat.rb:267 ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:376 ../lib/gettext/tools/msgmerge.rb:383
68
+ #: ../lib/gettext/tools/msgcat.rb:267 ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:384 ../lib/gettext/tools/msgmerge.rb:391
69
69
  msgid "Just for GNU gettext's msgcat compatibility"
70
70
  msgstr ""
71
71
 
72
- #: ../lib/gettext/tools/msgcat.rb:273 ../lib/gettext/tools/msgmerge.rb:375
72
+ #: ../lib/gettext/tools/msgcat.rb:273 ../lib/gettext/tools/msgmerge.rb:383
73
73
  msgid "It is same as --sort-by-msgid"
74
74
  msgstr ""
75
75
 
@@ -97,11 +97,11 @@ msgstr ""
97
97
  msgid "Remove all comments"
98
98
  msgstr ""
99
99
 
100
- #: ../lib/gettext/tools/msgcat.rb:309 ../lib/gettext/tools/msgmerge.rb:403 ../lib/gettext/tools/xgettext.rb:312
100
+ #: ../lib/gettext/tools/msgcat.rb:309 ../lib/gettext/tools/msgmerge.rb:411 ../lib/gettext/tools/xgettext.rb:312
101
101
  msgid "Set output page width"
102
102
  msgstr ""
103
103
 
104
- #: ../lib/gettext/tools/msgcat.rb:315 ../lib/gettext/tools/msgmerge.rb:409 ../lib/gettext/tools/xgettext.rb:318
104
+ #: ../lib/gettext/tools/msgcat.rb:315 ../lib/gettext/tools/msgmerge.rb:417 ../lib/gettext/tools/xgettext.rb:318
105
105
  msgid "Break long message lines, longer than the output page width, into several lines"
106
106
  msgstr ""
107
107
 
@@ -109,11 +109,11 @@ msgstr ""
109
109
  msgid "Ignore fuzzy entries"
110
110
  msgstr ""
111
111
 
112
- #: ../lib/gettext/tools/msgcat.rb:331
112
+ #: ../lib/gettext/tools/msgcat.rb:331 ../lib/gettext/tools/msgmerge.rb:434
113
113
  msgid "Don't report warning messages"
114
114
  msgstr ""
115
115
 
116
- #: ../lib/gettext/tools/msgcat.rb:336 ../lib/gettext/tools/msgmerge.rb:426
116
+ #: ../lib/gettext/tools/msgcat.rb:336 ../lib/gettext/tools/msgmerge.rb:439
117
117
  msgid "Don't output obsolete entries"
118
118
  msgstr ""
119
119
 
@@ -182,7 +182,7 @@ msgstr ""
182
182
  msgid "Use EMAIL as translator email address"
183
183
  msgstr ""
184
184
 
185
- #: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:430
185
+ #: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:443
186
186
  msgid "Display this help and exit"
187
187
  msgstr ""
188
188
 
@@ -217,32 +217,32 @@ msgstr ""
217
217
  msgid "Please enter your email address"
218
218
  msgstr ""
219
219
 
220
- #: ../lib/gettext/tools/msgmerge.rb:350
220
+ #: ../lib/gettext/tools/msgmerge.rb:358
221
221
  msgid "Usage: %s [OPTIONS] definition.po reference.pot"
222
222
  msgstr ""
223
223
 
224
- #: ../lib/gettext/tools/msgmerge.rb:353
224
+ #: ../lib/gettext/tools/msgmerge.rb:361
225
225
  #, fuzzy
226
226
  msgid "Merges two Uniforum style .po files together. The definition.po file is an existing 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 created by rxgettext."
227
227
  msgstr "合并两个同样形式的 po 文件， def.po 是原來有翻译的文件，ref.pot 是经过原始码更新过的新文件，ref.pot 一般是由 rgettext 建立的。"
228
228
 
229
- #: ../lib/gettext/tools/msgmerge.rb:364
229
+ #: ../lib/gettext/tools/msgmerge.rb:372
230
230
  msgid "Update definition.po"
231
231
  msgstr ""
232
232
 
233
- #: ../lib/gettext/tools/msgmerge.rb:398 ../lib/gettext/tools/xgettext.rb:307
233
+ #: ../lib/gettext/tools/msgmerge.rb:406 ../lib/gettext/tools/xgettext.rb:307
234
234
  msgid "Preserve '#: FILENAME:LINE' lines"
235
235
  msgstr ""
236
236
 
237
- #: ../lib/gettext/tools/msgmerge.rb:420
237
+ #: ../lib/gettext/tools/msgmerge.rb:428
238
238
  msgid "Disable fuzzy matching"
239
239
  msgstr ""
240
240
 
241
- #: ../lib/gettext/tools/msgmerge.rb:421
241
+ #: ../lib/gettext/tools/msgmerge.rb:429
242
242
  msgid "(enable)"
243
243
  msgstr ""
244
244
 
245
- #: ../lib/gettext/tools/msgmerge.rb:436
245
+ #: ../lib/gettext/tools/msgmerge.rb:449
246
246
  #, fuzzy
247
247
  msgid "Display version information and exit"
248
248
  msgstr "显示版本信息并退出"
@@ -356,7 +356,7 @@ msgid ""
356
356
  "Hello %{world}\n"
357
357
  msgstr ""
358
358
 
359
- #: ../samples/hello2.rb:20
359
+ #: ../samples/hello2.rb:20 ../test/fixtures/_/pipe.rb:28
360
360
  msgid "World"
361
361
  msgstr ""
362
362
 
@@ -555,10 +555,22 @@ msgid ""
555
555
  "one new line\n"
556
556
  msgstr ""
557
557
 
558
- #: ../test/fixtures/_/percent_strings.rb:34
558
+ #: ../test/fixtures/_/percent_strings.rb:31
559
+ msgid "in_symbol_array"
560
+ msgstr ""
561
+
562
+ #: ../test/fixtures/_/percent_strings.rb:39
559
563
  msgid "hello world"
560
564
  msgstr ""
561
565
 
566
+ #: ../test/fixtures/_/percent_strings.rb:47
567
+ msgid "in_string_array"
568
+ msgstr ""
569
+
570
+ #: ../test/fixtures/_/pipe.rb:26 ../test/fixtures/hello.rb:26
571
+ msgid "Hello"
572
+ msgstr ""
573
+
562
574
  #: ../test/fixtures/backslash.rb:27
563
575
  msgid "You should escape '\\' as '\\\\'."
564
576
  msgstr ""
@@ -592,10 +604,6 @@ msgstr ""
592
604
  msgid "duplicated"
593
605
  msgstr ""
594
606
 
595
- #: ../test/fixtures/hello.rb:26
596
- msgid "Hello"
597
- msgstr ""
598
-
599
607
  #: ../test/fixtures/lower_n_.rb:33
600
608
  msgid ""
601
609
  "bbb\n"
data/po/zh/gettext.po CHANGED
@@ -457,9 +457,18 @@ msgid ""
457
457
  "one new line\n"
458
458
  msgstr ""
459
459
 
460
+ msgid "in_symbol_array"
461
+ msgstr ""
462
+
460
463
  msgid "hello world"
461
464
  msgstr ""
462
465
 
466
+ msgid "in_string_array"
467
+ msgstr ""
468
+
469
+ msgid "Hello"
470
+ msgstr ""
471
+
463
472
  msgid "You should escape '\\' as '\\\\'."
464
473
  msgstr ""
465
474
 
@@ -486,9 +495,6 @@ msgstr ""
486
495
  msgid "duplicated"
487
496
  msgstr ""
488
497
 
489
- msgid "Hello"
490
- msgstr ""
491
-
492
498
  msgid ""
493
499
  "bbb\n"
494
500
  msgid_plural ""
data/po/zh_TW/gettext.edit.po CHANGED
@@ -39,11 +39,11 @@ msgstr ""
39
39
  msgid "Concatenates and merges PO files."
40
40
  msgstr ""
41
41
 
42
- #: ../lib/gettext/tools/msgcat.rb:246 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:361 ../lib/gettext/tools/xgettext.rb:248
42
+ #: ../lib/gettext/tools/msgcat.rb:246 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:369 ../lib/gettext/tools/xgettext.rb:248
43
43
  msgid "Specific options:"
44
44
  msgstr "特殊選項:"
45
45
 
46
- #: ../lib/gettext/tools/msgcat.rb:249 ../lib/gettext/tools/msgmerge.rb:369
46
+ #: ../lib/gettext/tools/msgcat.rb:249 ../lib/gettext/tools/msgmerge.rb:377
47
47
  #, fuzzy
48
48
  msgid "Write output to specified file"
49
49
  msgstr "輸出到指定檔案"
@@ -52,23 +52,23 @@ msgstr "輸出到指定檔案"
52
52
  msgid "(default: the standard output)"
53
53
  msgstr ""
54
54
 
55
- #: ../lib/gettext/tools/msgcat.rb:255 ../lib/gettext/tools/msgcat.rb:272 ../lib/gettext/tools/msgmerge.rb:374 ../lib/gettext/tools/msgmerge.rb:393 ../lib/gettext/tools/xgettext.rb:302
55
+ #: ../lib/gettext/tools/msgcat.rb:255 ../lib/gettext/tools/msgcat.rb:272 ../lib/gettext/tools/msgmerge.rb:382 ../lib/gettext/tools/msgmerge.rb:401 ../lib/gettext/tools/xgettext.rb:302
56
56
  msgid "Sort output by msgid"
57
57
  msgstr ""
58
58
 
59
- #: ../lib/gettext/tools/msgcat.rb:260 ../lib/gettext/tools/msgcat.rb:265 ../lib/gettext/tools/msgmerge.rb:381 ../lib/gettext/tools/msgmerge.rb:388
59
+ #: ../lib/gettext/tools/msgcat.rb:260 ../lib/gettext/tools/msgcat.rb:265 ../lib/gettext/tools/msgmerge.rb:389 ../lib/gettext/tools/msgmerge.rb:396
60
60
  msgid "Sort output by location"
61
61
  msgstr ""
62
62
 
63
- #: ../lib/gettext/tools/msgcat.rb:266 ../lib/gettext/tools/msgmerge.rb:382
63
+ #: ../lib/gettext/tools/msgcat.rb:266 ../lib/gettext/tools/msgmerge.rb:390
64
64
  msgid "It is same as --sort-by-location"
65
65
  msgstr ""
66
66
 
67
- #: ../lib/gettext/tools/msgcat.rb:267 ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:376 ../lib/gettext/tools/msgmerge.rb:383
67
+ #: ../lib/gettext/tools/msgcat.rb:267 ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:384 ../lib/gettext/tools/msgmerge.rb:391
68
68
  msgid "Just for GNU gettext's msgcat compatibility"
69
69
  msgstr ""
70
70
 
71
- #: ../lib/gettext/tools/msgcat.rb:273 ../lib/gettext/tools/msgmerge.rb:375
71
+ #: ../lib/gettext/tools/msgcat.rb:273 ../lib/gettext/tools/msgmerge.rb:383
72
72
  msgid "It is same as --sort-by-msgid"
73
73
  msgstr ""
74
74
 
@@ -96,11 +96,11 @@ msgstr ""
96
96
  msgid "Remove all comments"
97
97
  msgstr ""
98
98
 
99
- #: ../lib/gettext/tools/msgcat.rb:309 ../lib/gettext/tools/msgmerge.rb:403 ../lib/gettext/tools/xgettext.rb:312
99
+ #: ../lib/gettext/tools/msgcat.rb:309 ../lib/gettext/tools/msgmerge.rb:411 ../lib/gettext/tools/xgettext.rb:312
100
100
  msgid "Set output page width"
101
101
  msgstr ""
102
102
 
103
- #: ../lib/gettext/tools/msgcat.rb:315 ../lib/gettext/tools/msgmerge.rb:409 ../lib/gettext/tools/xgettext.rb:318
103
+ #: ../lib/gettext/tools/msgcat.rb:315 ../lib/gettext/tools/msgmerge.rb:417 ../lib/gettext/tools/xgettext.rb:318
104
104
  msgid "Break long message lines, longer than the output page width, into several lines"
105
105
  msgstr ""
106
106
 
@@ -108,11 +108,11 @@ msgstr ""
108
108
  msgid "Ignore fuzzy entries"
109
109
  msgstr ""
110
110
 
111
- #: ../lib/gettext/tools/msgcat.rb:331
111
+ #: ../lib/gettext/tools/msgcat.rb:331 ../lib/gettext/tools/msgmerge.rb:434
112
112
  msgid "Don't report warning messages"
113
113
  msgstr ""
114
114
 
115
- #: ../lib/gettext/tools/msgcat.rb:336 ../lib/gettext/tools/msgmerge.rb:426
115
+ #: ../lib/gettext/tools/msgcat.rb:336 ../lib/gettext/tools/msgmerge.rb:439
116
116
  msgid "Don't output obsolete entries"
117
117
  msgstr ""
118
118
 
@@ -181,7 +181,7 @@ msgstr ""
181
181
  msgid "Use EMAIL as translator email address"
182
182
  msgstr ""
183
183
 
184
- #: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:430
184
+ #: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:443
185
185
  msgid "Display this help and exit"
186
186
  msgstr ""
187
187
 
@@ -216,32 +216,32 @@ msgstr ""
216
216
  msgid "Please enter your email address"
217
217
  msgstr ""
218
218
 
219
- #: ../lib/gettext/tools/msgmerge.rb:350
219
+ #: ../lib/gettext/tools/msgmerge.rb:358
220
220
  msgid "Usage: %s [OPTIONS] definition.po reference.pot"
221
221
  msgstr ""
222
222
 
223
- #: ../lib/gettext/tools/msgmerge.rb:353
223
+ #: ../lib/gettext/tools/msgmerge.rb:361
224
224
  #, fuzzy
225
225
  msgid "Merges two Uniforum style .po files together. The definition.po file is an existing 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 created by rxgettext."
226
226
  msgstr "合併兩同樣形式的 po 檔， def.po 檔是原來有翻譯的檔案，ref.pot 檔是經過原始碼更新過的新檔，ref.pot 一般是由rgettext 建立。"
227
227
 
228
- #: ../lib/gettext/tools/msgmerge.rb:364
228
+ #: ../lib/gettext/tools/msgmerge.rb:372
229
229
  msgid "Update definition.po"
230
230
  msgstr ""
231
231
 
232
- #: ../lib/gettext/tools/msgmerge.rb:398 ../lib/gettext/tools/xgettext.rb:307
232
+ #: ../lib/gettext/tools/msgmerge.rb:406 ../lib/gettext/tools/xgettext.rb:307
233
233
  msgid "Preserve '#: FILENAME:LINE' lines"
234
234
  msgstr ""
235
235
 
236
- #: ../lib/gettext/tools/msgmerge.rb:420
236
+ #: ../lib/gettext/tools/msgmerge.rb:428
237
237
  msgid "Disable fuzzy matching"
238
238
  msgstr ""
239
239
 
240
- #: ../lib/gettext/tools/msgmerge.rb:421
240
+ #: ../lib/gettext/tools/msgmerge.rb:429
241
241
  msgid "(enable)"
242
242
  msgstr ""
243
243
 
244
- #: ../lib/gettext/tools/msgmerge.rb:436
244
+ #: ../lib/gettext/tools/msgmerge.rb:449
245
245
  #, fuzzy
246
246
  msgid "Display version information and exit"
247
247
  msgstr "秀出版本資訊後退出"
@@ -355,7 +355,7 @@ msgid ""
355
355
  "Hello %{world}\n"
356
356
  msgstr ""
357
357
 
358
- #: ../samples/hello2.rb:20
358
+ #: ../samples/hello2.rb:20 ../test/fixtures/_/pipe.rb:28
359
359
  msgid "World"
360
360
  msgstr ""
361
361
 
@@ -554,10 +554,22 @@ msgid ""
554
554
  "one new line\n"
555
555
  msgstr ""
556
556
 
557
- #: ../test/fixtures/_/percent_strings.rb:34
557
+ #: ../test/fixtures/_/percent_strings.rb:31
558
+ msgid "in_symbol_array"
559
+ msgstr ""
560
+
561
+ #: ../test/fixtures/_/percent_strings.rb:39
558
562
  msgid "hello world"
559
563
  msgstr ""
560
564
 
565
+ #: ../test/fixtures/_/percent_strings.rb:47
566
+ msgid "in_string_array"
567
+ msgstr ""
568
+
569
+ #: ../test/fixtures/_/pipe.rb:26 ../test/fixtures/hello.rb:26
570
+ msgid "Hello"
571
+ msgstr ""
572
+
561
573
  #: ../test/fixtures/backslash.rb:27
562
574
  msgid "You should escape '\\' as '\\\\'."
563
575
  msgstr ""
@@ -591,10 +603,6 @@ msgstr ""
591
603
  msgid "duplicated"
592
604
  msgstr ""
593
605
 
594
- #: ../test/fixtures/hello.rb:26
595
- msgid "Hello"
596
- msgstr ""
597
-
598
606
  #: ../test/fixtures/lower_n_.rb:33
599
607
  msgid ""
600
608
  "bbb\n"