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/ru/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/sr/gettext.edit.po CHANGED
@@ -38,11 +38,11 @@ msgstr ""
38
38
  msgid "Concatenates and merges PO files."
39
39
  msgstr ""
40
40
 
41
- #: ../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
41
+ #: ../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
42
42
  msgid "Specific options:"
43
43
  msgstr "Посебне опције:"
44
44
 
45
- #: ../lib/gettext/tools/msgcat.rb:249 ../lib/gettext/tools/msgmerge.rb:369
45
+ #: ../lib/gettext/tools/msgcat.rb:249 ../lib/gettext/tools/msgmerge.rb:377
46
46
  #, fuzzy
47
47
  msgid "Write output to specified file"
48
48
  msgstr "писање излаза у задат фајл"
@@ -51,23 +51,23 @@ msgstr "писање излаза у задат фајл"
51
51
  msgid "(default: the standard output)"
52
52
  msgstr ""
53
53
 
54
- #: ../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
54
+ #: ../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
55
55
  msgid "Sort output by msgid"
56
56
  msgstr ""
57
57
 
58
- #: ../lib/gettext/tools/msgcat.rb:260 ../lib/gettext/tools/msgcat.rb:265 ../lib/gettext/tools/msgmerge.rb:381 ../lib/gettext/tools/msgmerge.rb:388
58
+ #: ../lib/gettext/tools/msgcat.rb:260 ../lib/gettext/tools/msgcat.rb:265 ../lib/gettext/tools/msgmerge.rb:389 ../lib/gettext/tools/msgmerge.rb:396
59
59
  msgid "Sort output by location"
60
60
  msgstr ""
61
61
 
62
- #: ../lib/gettext/tools/msgcat.rb:266 ../lib/gettext/tools/msgmerge.rb:382
62
+ #: ../lib/gettext/tools/msgcat.rb:266 ../lib/gettext/tools/msgmerge.rb:390
63
63
  msgid "It is same as --sort-by-location"
64
64
  msgstr ""
65
65
 
66
- #: ../lib/gettext/tools/msgcat.rb:267 ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:376 ../lib/gettext/tools/msgmerge.rb:383
66
+ #: ../lib/gettext/tools/msgcat.rb:267 ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:384 ../lib/gettext/tools/msgmerge.rb:391
67
67
  msgid "Just for GNU gettext's msgcat compatibility"
68
68
  msgstr ""
69
69
 
70
- #: ../lib/gettext/tools/msgcat.rb:273 ../lib/gettext/tools/msgmerge.rb:375
70
+ #: ../lib/gettext/tools/msgcat.rb:273 ../lib/gettext/tools/msgmerge.rb:383
71
71
  msgid "It is same as --sort-by-msgid"
72
72
  msgstr ""
73
73
 
@@ -95,11 +95,11 @@ msgstr ""
95
95
  msgid "Remove all comments"
96
96
  msgstr ""
97
97
 
98
- #: ../lib/gettext/tools/msgcat.rb:309 ../lib/gettext/tools/msgmerge.rb:403 ../lib/gettext/tools/xgettext.rb:312
98
+ #: ../lib/gettext/tools/msgcat.rb:309 ../lib/gettext/tools/msgmerge.rb:411 ../lib/gettext/tools/xgettext.rb:312
99
99
  msgid "Set output page width"
100
100
  msgstr ""
101
101
 
102
- #: ../lib/gettext/tools/msgcat.rb:315 ../lib/gettext/tools/msgmerge.rb:409 ../lib/gettext/tools/xgettext.rb:318
102
+ #: ../lib/gettext/tools/msgcat.rb:315 ../lib/gettext/tools/msgmerge.rb:417 ../lib/gettext/tools/xgettext.rb:318
103
103
  msgid "Break long message lines, longer than the output page width, into several lines"
104
104
  msgstr ""
105
105
 
@@ -107,11 +107,11 @@ msgstr ""
107
107
  msgid "Ignore fuzzy entries"
108
108
  msgstr ""
109
109
 
110
- #: ../lib/gettext/tools/msgcat.rb:331
110
+ #: ../lib/gettext/tools/msgcat.rb:331 ../lib/gettext/tools/msgmerge.rb:434
111
111
  msgid "Don't report warning messages"
112
112
  msgstr ""
113
113
 
114
- #: ../lib/gettext/tools/msgcat.rb:336 ../lib/gettext/tools/msgmerge.rb:426
114
+ #: ../lib/gettext/tools/msgcat.rb:336 ../lib/gettext/tools/msgmerge.rb:439
115
115
  msgid "Don't output obsolete entries"
116
116
  msgstr ""
117
117
 
@@ -180,7 +180,7 @@ msgstr ""
180
180
  msgid "Use EMAIL as translator email address"
181
181
  msgstr ""
182
182
 
183
- #: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:430
183
+ #: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:443
184
184
  msgid "Display this help and exit"
185
185
  msgstr ""
186
186
 
@@ -215,32 +215,32 @@ msgstr ""
215
215
  msgid "Please enter your email address"
216
216
  msgstr ""
217
217
 
218
- #: ../lib/gettext/tools/msgmerge.rb:350
218
+ #: ../lib/gettext/tools/msgmerge.rb:358
219
219
  msgid "Usage: %s [OPTIONS] definition.po reference.pot"
220
220
  msgstr ""
221
221
 
222
- #: ../lib/gettext/tools/msgmerge.rb:353
222
+ #: ../lib/gettext/tools/msgmerge.rb:361
223
223
  #, fuzzy
224
224
  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."
225
225
  msgstr "Спаја заједно два униформна .po фајла. def.po фајл је постојећи PO фајл са преводима. Ref.pot фајл је последње креиран PO фајл са текућим изворним референцама. Ref.pot се обично креира помоћу rgettext-а."
226
226
 
227
- #: ../lib/gettext/tools/msgmerge.rb:364
227
+ #: ../lib/gettext/tools/msgmerge.rb:372
228
228
  msgid "Update definition.po"
229
229
  msgstr ""
230
230
 
231
- #: ../lib/gettext/tools/msgmerge.rb:398 ../lib/gettext/tools/xgettext.rb:307
231
+ #: ../lib/gettext/tools/msgmerge.rb:406 ../lib/gettext/tools/xgettext.rb:307
232
232
  msgid "Preserve '#: FILENAME:LINE' lines"
233
233
  msgstr ""
234
234
 
235
- #: ../lib/gettext/tools/msgmerge.rb:420
235
+ #: ../lib/gettext/tools/msgmerge.rb:428
236
236
  msgid "Disable fuzzy matching"
237
237
  msgstr ""
238
238
 
239
- #: ../lib/gettext/tools/msgmerge.rb:421
239
+ #: ../lib/gettext/tools/msgmerge.rb:429
240
240
  msgid "(enable)"
241
241
  msgstr ""
242
242
 
243
- #: ../lib/gettext/tools/msgmerge.rb:436
243
+ #: ../lib/gettext/tools/msgmerge.rb:449
244
244
  #, fuzzy
245
245
  msgid "Display version information and exit"
246
246
  msgstr "приказ информација о верзији и излаз"
@@ -354,7 +354,7 @@ msgid ""
354
354
  "Hello %{world}\n"
355
355
  msgstr ""
356
356
 
357
- #: ../samples/hello2.rb:20
357
+ #: ../samples/hello2.rb:20 ../test/fixtures/_/pipe.rb:28
358
358
  msgid "World"
359
359
  msgstr ""
360
360
 
@@ -553,10 +553,22 @@ msgid ""
553
553
  "one new line\n"
554
554
  msgstr ""
555
555
 
556
- #: ../test/fixtures/_/percent_strings.rb:34
556
+ #: ../test/fixtures/_/percent_strings.rb:31
557
+ msgid "in_symbol_array"
558
+ msgstr ""
559
+
560
+ #: ../test/fixtures/_/percent_strings.rb:39
557
561
  msgid "hello world"
558
562
  msgstr ""
559
563
 
564
+ #: ../test/fixtures/_/percent_strings.rb:47
565
+ msgid "in_string_array"
566
+ msgstr ""
567
+
568
+ #: ../test/fixtures/_/pipe.rb:26 ../test/fixtures/hello.rb:26
569
+ msgid "Hello"
570
+ msgstr ""
571
+
560
572
  #: ../test/fixtures/backslash.rb:27
561
573
  msgid "You should escape '\\' as '\\\\'."
562
574
  msgstr ""
@@ -590,10 +602,6 @@ msgstr ""
590
602
  msgid "duplicated"
591
603
  msgstr ""
592
604
 
593
- #: ../test/fixtures/hello.rb:26
594
- msgid "Hello"
595
- msgstr ""
596
-
597
605
  #: ../test/fixtures/lower_n_.rb:33
598
606
  msgid ""
599
607
  "bbb\n"
data/po/sr/gettext.po CHANGED
@@ -456,9 +456,18 @@ msgid ""
456
456
  "one new line\n"
457
457
  msgstr ""
458
458
 
459
+ msgid "in_symbol_array"
460
+ msgstr ""
461
+
459
462
  msgid "hello world"
460
463
  msgstr ""
461
464
 
465
+ msgid "in_string_array"
466
+ msgstr ""
467
+
468
+ msgid "Hello"
469
+ msgstr ""
470
+
462
471
  msgid "You should escape '\\' as '\\\\'."
463
472
  msgstr ""
464
473
 
@@ -485,9 +494,6 @@ msgstr ""
485
494
  msgid "duplicated"
486
495
  msgstr ""
487
496
 
488
- msgid "Hello"
489
- msgstr ""
490
-
491
497
  msgid ""
492
498
  "bbb\n"
493
499
  msgid_plural ""
data/po/sv/gettext.edit.po CHANGED
@@ -35,11 +35,11 @@ msgstr ""
35
35
  msgid "Concatenates and merges PO files."
36
36
  msgstr ""
37
37
 
38
- #: ../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
38
+ #: ../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
39
39
  msgid "Specific options:"
40
40
  msgstr ""
41
41
 
42
- #: ../lib/gettext/tools/msgcat.rb:249 ../lib/gettext/tools/msgmerge.rb:369
42
+ #: ../lib/gettext/tools/msgcat.rb:249 ../lib/gettext/tools/msgmerge.rb:377
43
43
  msgid "Write output to specified file"
44
44
  msgstr ""
45
45
 
@@ -47,23 +47,23 @@ msgstr ""
47
47
  msgid "(default: the standard output)"
48
48
  msgstr ""
49
49
 
50
- #: ../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
50
+ #: ../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
51
51
  msgid "Sort output by msgid"
52
52
  msgstr ""
53
53
 
54
- #: ../lib/gettext/tools/msgcat.rb:260 ../lib/gettext/tools/msgcat.rb:265 ../lib/gettext/tools/msgmerge.rb:381 ../lib/gettext/tools/msgmerge.rb:388
54
+ #: ../lib/gettext/tools/msgcat.rb:260 ../lib/gettext/tools/msgcat.rb:265 ../lib/gettext/tools/msgmerge.rb:389 ../lib/gettext/tools/msgmerge.rb:396
55
55
  msgid "Sort output by location"
56
56
  msgstr ""
57
57
 
58
- #: ../lib/gettext/tools/msgcat.rb:266 ../lib/gettext/tools/msgmerge.rb:382
58
+ #: ../lib/gettext/tools/msgcat.rb:266 ../lib/gettext/tools/msgmerge.rb:390
59
59
  msgid "It is same as --sort-by-location"
60
60
  msgstr ""
61
61
 
62
- #: ../lib/gettext/tools/msgcat.rb:267 ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:376 ../lib/gettext/tools/msgmerge.rb:383
62
+ #: ../lib/gettext/tools/msgcat.rb:267 ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:384 ../lib/gettext/tools/msgmerge.rb:391
63
63
  msgid "Just for GNU gettext's msgcat compatibility"
64
64
  msgstr ""
65
65
 
66
- #: ../lib/gettext/tools/msgcat.rb:273 ../lib/gettext/tools/msgmerge.rb:375
66
+ #: ../lib/gettext/tools/msgcat.rb:273 ../lib/gettext/tools/msgmerge.rb:383
67
67
  msgid "It is same as --sort-by-msgid"
68
68
  msgstr ""
69
69
 
@@ -91,11 +91,11 @@ msgstr ""
91
91
  msgid "Remove all comments"
92
92
  msgstr ""
93
93
 
94
- #: ../lib/gettext/tools/msgcat.rb:309 ../lib/gettext/tools/msgmerge.rb:403 ../lib/gettext/tools/xgettext.rb:312
94
+ #: ../lib/gettext/tools/msgcat.rb:309 ../lib/gettext/tools/msgmerge.rb:411 ../lib/gettext/tools/xgettext.rb:312
95
95
  msgid "Set output page width"
96
96
  msgstr ""
97
97
 
98
- #: ../lib/gettext/tools/msgcat.rb:315 ../lib/gettext/tools/msgmerge.rb:409 ../lib/gettext/tools/xgettext.rb:318
98
+ #: ../lib/gettext/tools/msgcat.rb:315 ../lib/gettext/tools/msgmerge.rb:417 ../lib/gettext/tools/xgettext.rb:318
99
99
  msgid "Break long message lines, longer than the output page width, into several lines"
100
100
  msgstr ""
101
101
 
@@ -103,11 +103,11 @@ msgstr ""
103
103
  msgid "Ignore fuzzy entries"
104
104
  msgstr ""
105
105
 
106
- #: ../lib/gettext/tools/msgcat.rb:331
106
+ #: ../lib/gettext/tools/msgcat.rb:331 ../lib/gettext/tools/msgmerge.rb:434
107
107
  msgid "Don't report warning messages"
108
108
  msgstr ""
109
109
 
110
- #: ../lib/gettext/tools/msgcat.rb:336 ../lib/gettext/tools/msgmerge.rb:426
110
+ #: ../lib/gettext/tools/msgcat.rb:336 ../lib/gettext/tools/msgmerge.rb:439
111
111
  msgid "Don't output obsolete entries"
112
112
  msgstr ""
113
113
 
@@ -175,7 +175,7 @@ msgstr ""
175
175
  msgid "Use EMAIL as translator email address"
176
176
  msgstr ""
177
177
 
178
- #: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:430
178
+ #: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:443
179
179
  msgid "Display this help and exit"
180
180
  msgstr ""
181
181
 
@@ -207,31 +207,31 @@ msgstr ""
207
207
  msgid "Please enter your email address"
208
208
  msgstr ""
209
209
 
210
- #: ../lib/gettext/tools/msgmerge.rb:350
210
+ #: ../lib/gettext/tools/msgmerge.rb:358
211
211
  msgid "Usage: %s [OPTIONS] definition.po reference.pot"
212
212
  msgstr ""
213
213
 
214
- #: ../lib/gettext/tools/msgmerge.rb:353
214
+ #: ../lib/gettext/tools/msgmerge.rb:361
215
215
  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."
216
216
  msgstr ""
217
217
 
218
- #: ../lib/gettext/tools/msgmerge.rb:364
218
+ #: ../lib/gettext/tools/msgmerge.rb:372
219
219
  msgid "Update definition.po"
220
220
  msgstr ""
221
221
 
222
- #: ../lib/gettext/tools/msgmerge.rb:398 ../lib/gettext/tools/xgettext.rb:307
222
+ #: ../lib/gettext/tools/msgmerge.rb:406 ../lib/gettext/tools/xgettext.rb:307
223
223
  msgid "Preserve '#: FILENAME:LINE' lines"
224
224
  msgstr ""
225
225
 
226
- #: ../lib/gettext/tools/msgmerge.rb:420
226
+ #: ../lib/gettext/tools/msgmerge.rb:428
227
227
  msgid "Disable fuzzy matching"
228
228
  msgstr ""
229
229
 
230
- #: ../lib/gettext/tools/msgmerge.rb:421
230
+ #: ../lib/gettext/tools/msgmerge.rb:429
231
231
  msgid "(enable)"
232
232
  msgstr ""
233
233
 
234
- #: ../lib/gettext/tools/msgmerge.rb:436
234
+ #: ../lib/gettext/tools/msgmerge.rb:449
235
235
  msgid "Display version information and exit"
236
236
  msgstr ""
237
237
 
@@ -342,7 +342,7 @@ msgid ""
342
342
  "Hello %{world}\n"
343
343
  msgstr ""
344
344
 
345
- #: ../samples/hello2.rb:20
345
+ #: ../samples/hello2.rb:20 ../test/fixtures/_/pipe.rb:28
346
346
  msgid "World"
347
347
  msgstr ""
348
348
 
@@ -541,10 +541,22 @@ msgid ""
541
541
  "one new line\n"
542
542
  msgstr ""
543
543
 
544
- #: ../test/fixtures/_/percent_strings.rb:34
544
+ #: ../test/fixtures/_/percent_strings.rb:31
545
+ msgid "in_symbol_array"
546
+ msgstr ""
547
+
548
+ #: ../test/fixtures/_/percent_strings.rb:39
545
549
  msgid "hello world"
546
550
  msgstr ""
547
551
 
552
+ #: ../test/fixtures/_/percent_strings.rb:47
553
+ msgid "in_string_array"
554
+ msgstr ""
555
+
556
+ #: ../test/fixtures/_/pipe.rb:26 ../test/fixtures/hello.rb:26
557
+ msgid "Hello"
558
+ msgstr ""
559
+
548
560
  #: ../test/fixtures/backslash.rb:27
549
561
  msgid "You should escape '\\' as '\\\\'."
550
562
  msgstr ""
@@ -578,10 +590,6 @@ msgstr ""
578
590
  msgid "duplicated"
579
591
  msgstr ""
580
592
 
581
- #: ../test/fixtures/hello.rb:26
582
- msgid "Hello"
583
- msgstr ""
584
-
585
593
  #: ../test/fixtures/lower_n_.rb:33
586
594
  msgid ""
587
595
  "bbb\n"
data/po/sv/gettext.po CHANGED
@@ -441,9 +441,18 @@ msgid ""
441
441
  "one new line\n"
442
442
  msgstr ""
443
443
 
444
+ msgid "in_symbol_array"
445
+ msgstr ""
446
+
444
447
  msgid "hello world"
445
448
  msgstr ""
446
449
 
450
+ msgid "in_string_array"
451
+ msgstr ""
452
+
453
+ msgid "Hello"
454
+ msgstr ""
455
+
447
456
  msgid "You should escape '\\' as '\\\\'."
448
457
  msgstr ""
449
458
 
@@ -470,9 +479,6 @@ msgstr ""
470
479
  msgid "duplicated"
471
480
  msgstr ""
472
481
 
473
- msgid "Hello"
474
- msgstr ""
475
-
476
482
  msgid ""
477
483
  "bbb\n"
478
484
  msgid_plural ""
data/po/uk/gettext.edit.po CHANGED
@@ -41,11 +41,11 @@ msgstr ""
41
41
  msgid "Concatenates and merges PO files."
42
42
  msgstr ""
43
43
 
44
- #: ../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
44
+ #: ../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
45
45
  msgid "Specific options:"
46
46
  msgstr "Додаткові параметри:"
47
47
 
48
- #: ../lib/gettext/tools/msgcat.rb:249 ../lib/gettext/tools/msgmerge.rb:369
48
+ #: ../lib/gettext/tools/msgcat.rb:249 ../lib/gettext/tools/msgmerge.rb:377
49
49
  #, fuzzy
50
50
  msgid "Write output to specified file"
51
51
  msgstr "записати результат у вказаний файл"
@@ -54,23 +54,23 @@ msgstr "записати результат у вказаний файл"
54
54
  msgid "(default: the standard output)"
55
55
  msgstr ""
56
56
 
57
- #: ../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
57
+ #: ../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
58
58
  msgid "Sort output by msgid"
59
59
  msgstr ""
60
60
 
61
- #: ../lib/gettext/tools/msgcat.rb:260 ../lib/gettext/tools/msgcat.rb:265 ../lib/gettext/tools/msgmerge.rb:381 ../lib/gettext/tools/msgmerge.rb:388
61
+ #: ../lib/gettext/tools/msgcat.rb:260 ../lib/gettext/tools/msgcat.rb:265 ../lib/gettext/tools/msgmerge.rb:389 ../lib/gettext/tools/msgmerge.rb:396
62
62
  msgid "Sort output by location"
63
63
  msgstr ""
64
64
 
65
- #: ../lib/gettext/tools/msgcat.rb:266 ../lib/gettext/tools/msgmerge.rb:382
65
+ #: ../lib/gettext/tools/msgcat.rb:266 ../lib/gettext/tools/msgmerge.rb:390
66
66
  msgid "It is same as --sort-by-location"
67
67
  msgstr ""
68
68
 
69
- #: ../lib/gettext/tools/msgcat.rb:267 ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:376 ../lib/gettext/tools/msgmerge.rb:383
69
+ #: ../lib/gettext/tools/msgcat.rb:267 ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:384 ../lib/gettext/tools/msgmerge.rb:391
70
70
  msgid "Just for GNU gettext's msgcat compatibility"
71
71
  msgstr ""
72
72
 
73
- #: ../lib/gettext/tools/msgcat.rb:273 ../lib/gettext/tools/msgmerge.rb:375
73
+ #: ../lib/gettext/tools/msgcat.rb:273 ../lib/gettext/tools/msgmerge.rb:383
74
74
  msgid "It is same as --sort-by-msgid"
75
75
  msgstr ""
76
76
 
@@ -98,11 +98,11 @@ msgstr ""
98
98
  msgid "Remove all comments"
99
99
  msgstr ""
100
100
 
101
- #: ../lib/gettext/tools/msgcat.rb:309 ../lib/gettext/tools/msgmerge.rb:403 ../lib/gettext/tools/xgettext.rb:312
101
+ #: ../lib/gettext/tools/msgcat.rb:309 ../lib/gettext/tools/msgmerge.rb:411 ../lib/gettext/tools/xgettext.rb:312
102
102
  msgid "Set output page width"
103
103
  msgstr ""
104
104
 
105
- #: ../lib/gettext/tools/msgcat.rb:315 ../lib/gettext/tools/msgmerge.rb:409 ../lib/gettext/tools/xgettext.rb:318
105
+ #: ../lib/gettext/tools/msgcat.rb:315 ../lib/gettext/tools/msgmerge.rb:417 ../lib/gettext/tools/xgettext.rb:318
106
106
  msgid "Break long message lines, longer than the output page width, into several lines"
107
107
  msgstr ""
108
108
 
@@ -110,11 +110,11 @@ msgstr ""
110
110
  msgid "Ignore fuzzy entries"
111
111
  msgstr ""
112
112
 
113
- #: ../lib/gettext/tools/msgcat.rb:331
113
+ #: ../lib/gettext/tools/msgcat.rb:331 ../lib/gettext/tools/msgmerge.rb:434
114
114
  msgid "Don't report warning messages"
115
115
  msgstr ""
116
116
 
117
- #: ../lib/gettext/tools/msgcat.rb:336 ../lib/gettext/tools/msgmerge.rb:426
117
+ #: ../lib/gettext/tools/msgcat.rb:336 ../lib/gettext/tools/msgmerge.rb:439
118
118
  msgid "Don't output obsolete entries"
119
119
  msgstr ""
120
120
 
@@ -183,7 +183,7 @@ msgstr ""
183
183
  msgid "Use EMAIL as translator email address"
184
184
  msgstr ""
185
185
 
186
- #: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:430
186
+ #: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:443
187
187
  msgid "Display this help and exit"
188
188
  msgstr ""
189
189
 
@@ -218,32 +218,32 @@ msgstr ""
218
218
  msgid "Please enter your email address"
219
219
  msgstr ""
220
220
 
221
- #: ../lib/gettext/tools/msgmerge.rb:350
221
+ #: ../lib/gettext/tools/msgmerge.rb:358
222
222
  msgid "Usage: %s [OPTIONS] definition.po reference.pot"
223
223
  msgstr ""
224
224
 
225
- #: ../lib/gettext/tools/msgmerge.rb:353
225
+ #: ../lib/gettext/tools/msgmerge.rb:361
226
226
  #, fuzzy
227
227
  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."
228
228
  msgstr "Об'єднує файли .po Uniforum формату. В файлі def.po зберігаються уже перекладені стрічки. Файл ref.pot є оновленою версією PO файлу із вихідних текстів і не містить перекладів. ref.pot зазвичай створюють за допомогою програми rgettext."
229
229
 
230
- #: ../lib/gettext/tools/msgmerge.rb:364
230
+ #: ../lib/gettext/tools/msgmerge.rb:372
231
231
  msgid "Update definition.po"
232
232
  msgstr ""
233
233
 
234
- #: ../lib/gettext/tools/msgmerge.rb:398 ../lib/gettext/tools/xgettext.rb:307
234
+ #: ../lib/gettext/tools/msgmerge.rb:406 ../lib/gettext/tools/xgettext.rb:307
235
235
  msgid "Preserve '#: FILENAME:LINE' lines"
236
236
  msgstr ""
237
237
 
238
- #: ../lib/gettext/tools/msgmerge.rb:420
238
+ #: ../lib/gettext/tools/msgmerge.rb:428
239
239
  msgid "Disable fuzzy matching"
240
240
  msgstr ""
241
241
 
242
- #: ../lib/gettext/tools/msgmerge.rb:421
242
+ #: ../lib/gettext/tools/msgmerge.rb:429
243
243
  msgid "(enable)"
244
244
  msgstr ""
245
245
 
246
- #: ../lib/gettext/tools/msgmerge.rb:436
246
+ #: ../lib/gettext/tools/msgmerge.rb:449
247
247
  #, fuzzy
248
248
  msgid "Display version information and exit"
249
249
  msgstr "показати інформацію про версію і завершити роботу"
@@ -357,7 +357,7 @@ msgid ""
357
357
  "Hello %{world}\n"
358
358
  msgstr ""
359
359
 
360
- #: ../samples/hello2.rb:20
360
+ #: ../samples/hello2.rb:20 ../test/fixtures/_/pipe.rb:28
361
361
  msgid "World"
362
362
  msgstr ""
363
363
 
@@ -556,10 +556,22 @@ msgid ""
556
556
  "one new line\n"
557
557
  msgstr ""
558
558
 
559
- #: ../test/fixtures/_/percent_strings.rb:34
559
+ #: ../test/fixtures/_/percent_strings.rb:31
560
+ msgid "in_symbol_array"
561
+ msgstr ""
562
+
563
+ #: ../test/fixtures/_/percent_strings.rb:39
560
564
  msgid "hello world"
561
565
  msgstr ""
562
566
 
567
+ #: ../test/fixtures/_/percent_strings.rb:47
568
+ msgid "in_string_array"
569
+ msgstr ""
570
+
571
+ #: ../test/fixtures/_/pipe.rb:26 ../test/fixtures/hello.rb:26
572
+ msgid "Hello"
573
+ msgstr ""
574
+
563
575
  #: ../test/fixtures/backslash.rb:27
564
576
  msgid "You should escape '\\' as '\\\\'."
565
577
  msgstr ""
@@ -593,10 +605,6 @@ msgstr ""
593
605
  msgid "duplicated"
594
606
  msgstr ""
595
607
 
596
- #: ../test/fixtures/hello.rb:26
597
- msgid "Hello"
598
- msgstr ""
599
-
600
608
  #: ../test/fixtures/lower_n_.rb:33
601
609
  msgid ""
602
610
  "bbb\n"