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/nb/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/nl/gettext.edit.po CHANGED
@@ -36,11 +36,11 @@ msgstr ""
36
36
  msgid "Concatenates and merges PO files."
37
37
  msgstr ""
38
38
 
39
- #: ../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
39
+ #: ../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
40
40
  msgid "Specific options:"
41
41
  msgstr "Specifieke opties:"
42
42
 
43
- #: ../lib/gettext/tools/msgcat.rb:249 ../lib/gettext/tools/msgmerge.rb:369
43
+ #: ../lib/gettext/tools/msgcat.rb:249 ../lib/gettext/tools/msgmerge.rb:377
44
44
  #, fuzzy
45
45
  msgid "Write output to specified file"
46
46
  msgstr "schrijf uitvoer naar opgegeven bestand"
@@ -49,23 +49,23 @@ msgstr "schrijf uitvoer naar opgegeven bestand"
49
49
  msgid "(default: the standard output)"
50
50
  msgstr ""
51
51
 
52
- #: ../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
52
+ #: ../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
53
53
  msgid "Sort output by msgid"
54
54
  msgstr ""
55
55
 
56
- #: ../lib/gettext/tools/msgcat.rb:260 ../lib/gettext/tools/msgcat.rb:265 ../lib/gettext/tools/msgmerge.rb:381 ../lib/gettext/tools/msgmerge.rb:388
56
+ #: ../lib/gettext/tools/msgcat.rb:260 ../lib/gettext/tools/msgcat.rb:265 ../lib/gettext/tools/msgmerge.rb:389 ../lib/gettext/tools/msgmerge.rb:396
57
57
  msgid "Sort output by location"
58
58
  msgstr ""
59
59
 
60
- #: ../lib/gettext/tools/msgcat.rb:266 ../lib/gettext/tools/msgmerge.rb:382
60
+ #: ../lib/gettext/tools/msgcat.rb:266 ../lib/gettext/tools/msgmerge.rb:390
61
61
  msgid "It is same as --sort-by-location"
62
62
  msgstr ""
63
63
 
64
- #: ../lib/gettext/tools/msgcat.rb:267 ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:376 ../lib/gettext/tools/msgmerge.rb:383
64
+ #: ../lib/gettext/tools/msgcat.rb:267 ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:384 ../lib/gettext/tools/msgmerge.rb:391
65
65
  msgid "Just for GNU gettext's msgcat compatibility"
66
66
  msgstr ""
67
67
 
68
- #: ../lib/gettext/tools/msgcat.rb:273 ../lib/gettext/tools/msgmerge.rb:375
68
+ #: ../lib/gettext/tools/msgcat.rb:273 ../lib/gettext/tools/msgmerge.rb:383
69
69
  msgid "It is same as --sort-by-msgid"
70
70
  msgstr ""
71
71
 
@@ -93,11 +93,11 @@ msgstr ""
93
93
  msgid "Remove all comments"
94
94
  msgstr ""
95
95
 
96
- #: ../lib/gettext/tools/msgcat.rb:309 ../lib/gettext/tools/msgmerge.rb:403 ../lib/gettext/tools/xgettext.rb:312
96
+ #: ../lib/gettext/tools/msgcat.rb:309 ../lib/gettext/tools/msgmerge.rb:411 ../lib/gettext/tools/xgettext.rb:312
97
97
  msgid "Set output page width"
98
98
  msgstr ""
99
99
 
100
- #: ../lib/gettext/tools/msgcat.rb:315 ../lib/gettext/tools/msgmerge.rb:409 ../lib/gettext/tools/xgettext.rb:318
100
+ #: ../lib/gettext/tools/msgcat.rb:315 ../lib/gettext/tools/msgmerge.rb:417 ../lib/gettext/tools/xgettext.rb:318
101
101
  msgid "Break long message lines, longer than the output page width, into several lines"
102
102
  msgstr ""
103
103
 
@@ -105,11 +105,11 @@ msgstr ""
105
105
  msgid "Ignore fuzzy entries"
106
106
  msgstr ""
107
107
 
108
- #: ../lib/gettext/tools/msgcat.rb:331
108
+ #: ../lib/gettext/tools/msgcat.rb:331 ../lib/gettext/tools/msgmerge.rb:434
109
109
  msgid "Don't report warning messages"
110
110
  msgstr ""
111
111
 
112
- #: ../lib/gettext/tools/msgcat.rb:336 ../lib/gettext/tools/msgmerge.rb:426
112
+ #: ../lib/gettext/tools/msgcat.rb:336 ../lib/gettext/tools/msgmerge.rb:439
113
113
  msgid "Don't output obsolete entries"
114
114
  msgstr ""
115
115
 
@@ -178,7 +178,7 @@ msgstr ""
178
178
  msgid "Use EMAIL as translator email address"
179
179
  msgstr ""
180
180
 
181
- #: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:430
181
+ #: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:443
182
182
  msgid "Display this help and exit"
183
183
  msgstr ""
184
184
 
@@ -213,32 +213,32 @@ msgstr ""
213
213
  msgid "Please enter your email address"
214
214
  msgstr ""
215
215
 
216
- #: ../lib/gettext/tools/msgmerge.rb:350
216
+ #: ../lib/gettext/tools/msgmerge.rb:358
217
217
  msgid "Usage: %s [OPTIONS] definition.po reference.pot"
218
218
  msgstr ""
219
219
 
220
- #: ../lib/gettext/tools/msgmerge.rb:353
220
+ #: ../lib/gettext/tools/msgmerge.rb:361
221
221
  #, fuzzy
222
222
  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."
223
223
  msgstr "Voegt twee gelijksoortige .po-bestanden samen. Het def.po-bestand is een bestaand PO-bestand met vertalingen. Het ref.pot-bestand is het meest recente POT-bestand met actuele bronverwijzingen. ref.pot wordt over het algemeen aangemaakt door rgettext."
224
224
 
225
- #: ../lib/gettext/tools/msgmerge.rb:364
225
+ #: ../lib/gettext/tools/msgmerge.rb:372
226
226
  msgid "Update definition.po"
227
227
  msgstr ""
228
228
 
229
- #: ../lib/gettext/tools/msgmerge.rb:398 ../lib/gettext/tools/xgettext.rb:307
229
+ #: ../lib/gettext/tools/msgmerge.rb:406 ../lib/gettext/tools/xgettext.rb:307
230
230
  msgid "Preserve '#: FILENAME:LINE' lines"
231
231
  msgstr ""
232
232
 
233
- #: ../lib/gettext/tools/msgmerge.rb:420
233
+ #: ../lib/gettext/tools/msgmerge.rb:428
234
234
  msgid "Disable fuzzy matching"
235
235
  msgstr ""
236
236
 
237
- #: ../lib/gettext/tools/msgmerge.rb:421
237
+ #: ../lib/gettext/tools/msgmerge.rb:429
238
238
  msgid "(enable)"
239
239
  msgstr ""
240
240
 
241
- #: ../lib/gettext/tools/msgmerge.rb:436
241
+ #: ../lib/gettext/tools/msgmerge.rb:449
242
242
  #, fuzzy
243
243
  msgid "Display version information and exit"
244
244
  msgstr "toon versie-informatie en stop"
@@ -352,7 +352,7 @@ msgid ""
352
352
  "Hello %{world}\n"
353
353
  msgstr ""
354
354
 
355
- #: ../samples/hello2.rb:20
355
+ #: ../samples/hello2.rb:20 ../test/fixtures/_/pipe.rb:28
356
356
  msgid "World"
357
357
  msgstr ""
358
358
 
@@ -551,10 +551,22 @@ msgid ""
551
551
  "one new line\n"
552
552
  msgstr ""
553
553
 
554
- #: ../test/fixtures/_/percent_strings.rb:34
554
+ #: ../test/fixtures/_/percent_strings.rb:31
555
+ msgid "in_symbol_array"
556
+ msgstr ""
557
+
558
+ #: ../test/fixtures/_/percent_strings.rb:39
555
559
  msgid "hello world"
556
560
  msgstr ""
557
561
 
562
+ #: ../test/fixtures/_/percent_strings.rb:47
563
+ msgid "in_string_array"
564
+ msgstr ""
565
+
566
+ #: ../test/fixtures/_/pipe.rb:26 ../test/fixtures/hello.rb:26
567
+ msgid "Hello"
568
+ msgstr ""
569
+
558
570
  #: ../test/fixtures/backslash.rb:27
559
571
  msgid "You should escape '\\' as '\\\\'."
560
572
  msgstr ""
@@ -588,10 +600,6 @@ msgstr ""
588
600
  msgid "duplicated"
589
601
  msgstr ""
590
602
 
591
- #: ../test/fixtures/hello.rb:26
592
- msgid "Hello"
593
- msgstr ""
594
-
595
603
  #: ../test/fixtures/lower_n_.rb:33
596
604
  msgid ""
597
605
  "bbb\n"
data/po/nl/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/pt_BR/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 "Opções específicas:"
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 "escreve saída para o arquivo especificado"
@@ -51,23 +51,23 @@ msgstr "escreve saída para o arquivo especificado"
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 "Mescla dois arquivos .po de estilo Uniforum juntos. O arquivo def.po é um arquivo PO existente com traduções. O arquivo ref.pot é o último arquivo PO criado com referências de código atualizadas. Ref.pot é geralmente criado pelo 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 "mostra informação de versão e sai"
@@ -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/pt_BR/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/ru/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 Uniforum формата вместе. В файле def.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"