gettext 3.3.2 → 3.3.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
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/hr/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/hu/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 "Speciális opciók:"
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 "kimenet írása egy megadott fájlba"
@@ -50,23 +50,23 @@ msgstr "kimenet írása egy megadott fájlba"
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 "Két Uniforum formátumú .po fájl összefésülése. A def.po fájl egy létező PO fájl fordításokkal. A ref.pot fájl az utolsó PO fájl frissített hivatkozásokkal (rgettext által generált)."
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 "verzió információ kiírása és kilépés"
@@ -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/hu/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/it/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 "Opzioni:"
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 "scrivi l'output sul file specificato"
@@ -49,23 +49,23 @@ msgstr "scrivi l'output sul file specificato"
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 "Unisce due file .po di tipo Uniforum. Il file def.po è un file PO esistente e contenente le traduzioni. Il file ref.pot contiene i riferimenti aggiornati al sorgente e viene creato per ultimo (solitamente viene generato da 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 "mostra la versione ed esce"
@@ -351,7 +351,7 @@ msgid ""
351
351
  "Hello %{world}\n"
352
352
  msgstr ""
353
353
 
354
- #: ../samples/hello2.rb:20
354
+ #: ../samples/hello2.rb:20 ../test/fixtures/_/pipe.rb:28
355
355
  msgid "World"
356
356
  msgstr ""
357
357
 
@@ -550,10 +550,22 @@ msgid ""
550
550
  "one new line\n"
551
551
  msgstr ""
552
552
 
553
- #: ../test/fixtures/_/percent_strings.rb:34
553
+ #: ../test/fixtures/_/percent_strings.rb:31
554
+ msgid "in_symbol_array"
555
+ msgstr ""
556
+
557
+ #: ../test/fixtures/_/percent_strings.rb:39
554
558
  msgid "hello world"
555
559
  msgstr ""
556
560
 
561
+ #: ../test/fixtures/_/percent_strings.rb:47
562
+ msgid "in_string_array"
563
+ msgstr ""
564
+
565
+ #: ../test/fixtures/_/pipe.rb:26 ../test/fixtures/hello.rb:26
566
+ msgid "Hello"
567
+ msgstr ""
568
+
557
569
  #: ../test/fixtures/backslash.rb:27
558
570
  msgid "You should escape '\\' as '\\\\'."
559
571
  msgstr ""
@@ -587,10 +599,6 @@ msgstr ""
587
599
  msgid "duplicated"
588
600
  msgstr ""
589
601
 
590
- #: ../test/fixtures/hello.rb:26
591
- msgid "Hello"
592
- msgstr ""
593
-
594
602
  #: ../test/fixtures/lower_n_.rb:33
595
603
  msgid ""
596
604
  "bbb\n"
data/po/it/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/ja/gettext.edit.po CHANGED
@@ -32,11 +32,11 @@ msgstr "使い方: %s [オプション] POファイル1 POファイル2 ..."
32
32
  msgid "Concatenates and merges PO files."
33
33
  msgstr "複数のPOファイルの内容を連結し、重複したものはマージします。"
34
34
 
35
- #: ../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
35
+ #: ../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
36
36
  msgid "Specific options:"
37
37
  msgstr "オプション："
38
38
 
39
- #: ../lib/gettext/tools/msgcat.rb:249 ../lib/gettext/tools/msgmerge.rb:369
39
+ #: ../lib/gettext/tools/msgcat.rb:249 ../lib/gettext/tools/msgmerge.rb:377
40
40
  msgid "Write output to specified file"
41
41
  msgstr "出力ファイルを指定します"
42
42
 
@@ -44,23 +44,23 @@ msgstr "出力ファイルを指定します"
44
44
  msgid "(default: the standard output)"
45
45
  msgstr "（デフォルト：標準出力）"
46
46
 
47
- #: ../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
47
+ #: ../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
48
48
  msgid "Sort output by msgid"
49
49
  msgstr "出力をmsgidでソート"
50
50
 
51
- #: ../lib/gettext/tools/msgcat.rb:260 ../lib/gettext/tools/msgcat.rb:265 ../lib/gettext/tools/msgmerge.rb:381 ../lib/gettext/tools/msgmerge.rb:388
51
+ #: ../lib/gettext/tools/msgcat.rb:260 ../lib/gettext/tools/msgcat.rb:265 ../lib/gettext/tools/msgmerge.rb:389 ../lib/gettext/tools/msgmerge.rb:396
52
52
  msgid "Sort output by location"
53
53
  msgstr "出力を位置情報でソート"
54
54
 
55
- #: ../lib/gettext/tools/msgcat.rb:266 ../lib/gettext/tools/msgmerge.rb:382
55
+ #: ../lib/gettext/tools/msgcat.rb:266 ../lib/gettext/tools/msgmerge.rb:390
56
56
  msgid "It is same as --sort-by-location"
57
57
  msgstr "--sort-by-locationと同じ"
58
58
 
59
- #: ../lib/gettext/tools/msgcat.rb:267 ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:376 ../lib/gettext/tools/msgmerge.rb:383
59
+ #: ../lib/gettext/tools/msgcat.rb:267 ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:384 ../lib/gettext/tools/msgmerge.rb:391
60
60
  msgid "Just for GNU gettext's msgcat compatibility"
61
61
  msgstr "GNU gettextのmsgcatとの互換性のためだけにあります"
62
62
 
63
- #: ../lib/gettext/tools/msgcat.rb:273 ../lib/gettext/tools/msgmerge.rb:375
63
+ #: ../lib/gettext/tools/msgcat.rb:273 ../lib/gettext/tools/msgmerge.rb:383
64
64
  msgid "It is same as --sort-by-msgid"
65
65
  msgstr "--sort-by-msgidと同じ"
66
66
 
@@ -88,11 +88,11 @@ msgstr "以前のmsgidを示すコメントを削除"
88
88
  msgid "Remove all comments"
89
89
  msgstr "すべてのコメントを削除"
90
90
 
91
- #: ../lib/gettext/tools/msgcat.rb:309 ../lib/gettext/tools/msgmerge.rb:403 ../lib/gettext/tools/xgettext.rb:312
91
+ #: ../lib/gettext/tools/msgcat.rb:309 ../lib/gettext/tools/msgmerge.rb:411 ../lib/gettext/tools/xgettext.rb:312
92
92
  msgid "Set output page width"
93
93
  msgstr "出力のページ幅を設定"
94
94
 
95
- #: ../lib/gettext/tools/msgcat.rb:315 ../lib/gettext/tools/msgmerge.rb:409 ../lib/gettext/tools/xgettext.rb:318
95
+ #: ../lib/gettext/tools/msgcat.rb:315 ../lib/gettext/tools/msgmerge.rb:417 ../lib/gettext/tools/xgettext.rb:318
96
96
  msgid "Break long message lines, longer than the output page width, into several lines"
97
97
  msgstr "メッセージ中の出力ページ幅より長い行を複数行に分割"
98
98
 
@@ -100,11 +100,11 @@ msgstr "メッセージ中の出力ページ幅より長い行を複数行に分
100
100
  msgid "Ignore fuzzy entries"
101
101
  msgstr "fuzzyエントリーを無視"
102
102
 
103
- #: ../lib/gettext/tools/msgcat.rb:331
103
+ #: ../lib/gettext/tools/msgcat.rb:331 ../lib/gettext/tools/msgmerge.rb:434
104
104
  msgid "Don't report warning messages"
105
105
  msgstr "警告メッセージを出力しない"
106
106
 
107
- #: ../lib/gettext/tools/msgcat.rb:336 ../lib/gettext/tools/msgmerge.rb:426
107
+ #: ../lib/gettext/tools/msgcat.rb:336 ../lib/gettext/tools/msgmerge.rb:439
108
108
  msgid "Don't output obsolete entries"
109
109
  msgstr "obsoleteエントリーを出力しない"
110
110
 
@@ -172,7 +172,7 @@ msgstr "翻訳者名にNAMEを使用します。"
172
172
  msgid "Use EMAIL as translator email address"
173
173
  msgstr "翻訳者のメールアドレスにEMAILを使用します。"
174
174
 
175
- #: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:430
175
+ #: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:443
176
176
  msgid "Display this help and exit"
177
177
  msgstr "このヘルプを表示します"
178
178
 
@@ -204,31 +204,31 @@ msgstr "あなたのフルネームを入力してください"
204
204
  msgid "Please enter your email address"
205
205
  msgstr "あなたのメールアドレスを入力してください"
206
206
 
207
- #: ../lib/gettext/tools/msgmerge.rb:350
207
+ #: ../lib/gettext/tools/msgmerge.rb:358
208
208
  msgid "Usage: %s [OPTIONS] definition.po reference.pot"
209
209
  msgstr "使い方: %s [オプション] definition.po reference.pot"
210
210
 
211
- #: ../lib/gettext/tools/msgmerge.rb:353
211
+ #: ../lib/gettext/tools/msgmerge.rb:361
212
212
  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."
213
213
  msgstr "2つの.poファイルをマージします。definition.poファイルはすでにある翻訳済みのPOファイルです。reference.potは最新のPOファイルです。reference.potは通常rxgettextから新たに生成されたものです。"
214
214
 
215
- #: ../lib/gettext/tools/msgmerge.rb:364
215
+ #: ../lib/gettext/tools/msgmerge.rb:372
216
216
  msgid "Update definition.po"
217
217
  msgstr "definition.poを更新"
218
218
 
219
- #: ../lib/gettext/tools/msgmerge.rb:398 ../lib/gettext/tools/xgettext.rb:307
219
+ #: ../lib/gettext/tools/msgmerge.rb:406 ../lib/gettext/tools/xgettext.rb:307
220
220
  msgid "Preserve '#: FILENAME:LINE' lines"
221
221
  msgstr "'#: FILENAME:LINE'行を残す"
222
222
 
223
- #: ../lib/gettext/tools/msgmerge.rb:420
223
+ #: ../lib/gettext/tools/msgmerge.rb:428
224
224
  msgid "Disable fuzzy matching"
225
225
  msgstr "曖昧マッチを無効にする"
226
226
 
227
- #: ../lib/gettext/tools/msgmerge.rb:421
227
+ #: ../lib/gettext/tools/msgmerge.rb:429
228
228
  msgid "(enable)"
229
229
  msgstr "（有効）"
230
230
 
231
- #: ../lib/gettext/tools/msgmerge.rb:436
231
+ #: ../lib/gettext/tools/msgmerge.rb:449
232
232
  msgid "Display version information and exit"
233
233
  msgstr "バージョン情報を出力して終了します。"
234
234
 
@@ -339,7 +339,7 @@ msgid ""
339
339
  "Hello %{world}\n"
340
340
  msgstr ""
341
341
 
342
- #: ../samples/hello2.rb:20
342
+ #: ../samples/hello2.rb:20 ../test/fixtures/_/pipe.rb:28
343
343
  msgid "World"
344
344
  msgstr ""
345
345
 
@@ -538,10 +538,22 @@ msgid ""
538
538
  "one new line\n"
539
539
  msgstr ""
540
540
 
541
- #: ../test/fixtures/_/percent_strings.rb:34
541
+ #: ../test/fixtures/_/percent_strings.rb:31
542
+ msgid "in_symbol_array"
543
+ msgstr ""
544
+
545
+ #: ../test/fixtures/_/percent_strings.rb:39
542
546
  msgid "hello world"
543
547
  msgstr ""
544
548
 
549
+ #: ../test/fixtures/_/percent_strings.rb:47
550
+ msgid "in_string_array"
551
+ msgstr ""
552
+
553
+ #: ../test/fixtures/_/pipe.rb:26 ../test/fixtures/hello.rb:26
554
+ msgid "Hello"
555
+ msgstr ""
556
+
545
557
  #: ../test/fixtures/backslash.rb:27
546
558
  msgid "You should escape '\\' as '\\\\'."
547
559
  msgstr ""
@@ -575,10 +587,6 @@ msgstr ""
575
587
  msgid "duplicated"
576
588
  msgstr ""
577
589
 
578
- #: ../test/fixtures/hello.rb:26
579
- msgid "Hello"
580
- msgstr ""
581
-
582
590
  #: ../test/fixtures/lower_n_.rb:33
583
591
  msgid ""
584
592
  "bbb\n"