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/lib/gettext/version.rb CHANGED
@@ -9,5 +9,5 @@
9
9
  =end
10
10
 
11
11
  module GetText
12
- VERSION = "3.3.2"
12
+ VERSION = "3.3.7"
13
13
  end
data/po/bg/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 "Слива два Uniforum .pо файла. definition.po е съществуващ PO файл с преводи. reference.pot е пресен PO файл с актуални референции към кода. reference.pot обикновено е създаден от rgettext."
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/bg/gettext.po CHANGED
@@ -444,9 +444,18 @@ msgid ""
444
444
  "one new line\n"
445
445
  msgstr ""
446
446
 
447
+ msgid "in_symbol_array"
448
+ msgstr ""
449
+
447
450
  msgid "hello world"
448
451
  msgstr ""
449
452
 
453
+ msgid "in_string_array"
454
+ msgstr ""
455
+
456
+ msgid "Hello"
457
+ msgstr ""
458
+
450
459
  msgid "You should escape '\\' as '\\\\'."
451
460
  msgstr ""
452
461
 
@@ -473,9 +482,6 @@ msgstr ""
473
482
  msgid "duplicated"
474
483
  msgstr ""
475
484
 
476
- msgid "Hello"
477
- msgstr ""
478
-
479
485
  msgid ""
480
486
  "bbb\n"
481
487
  msgid_plural ""
data/po/bs/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 "Specifične opcije:"
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
  msgid "Write output to specified file"
46
46
  msgstr "zapiši izlaz u specifičnu datoteku"
47
47
 
@@ -49,23 +49,23 @@ msgstr "zapiši izlaz u specifičnu datoteku"
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
 
@@ -177,7 +177,7 @@ msgstr ""
177
177
  msgid "Use EMAIL as translator email address"
178
178
  msgstr ""
179
179
 
180
- #: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:430
180
+ #: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:443
181
181
  msgid "Display this help and exit"
182
182
  msgstr ""
183
183
 
@@ -209,31 +209,31 @@ msgstr ""
209
209
  msgid "Please enter your email address"
210
210
  msgstr ""
211
211
 
212
- #: ../lib/gettext/tools/msgmerge.rb:350
212
+ #: ../lib/gettext/tools/msgmerge.rb:358
213
213
  msgid "Usage: %s [OPTIONS] definition.po reference.pot"
214
214
  msgstr ""
215
215
 
216
- #: ../lib/gettext/tools/msgmerge.rb:353
216
+ #: ../lib/gettext/tools/msgmerge.rb:361
217
217
  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."
218
218
  msgstr "Spaja dvije Uniforum style .po datoteke skupa. definition.po datoteka je već postojeća PO datoteka sa prevodima. reference.pot je zadnja napravljena PO datoteka sa najnovijim referencama koda. reference.pot je najčešće napravljen sa rgettext."
219
219
 
220
- #: ../lib/gettext/tools/msgmerge.rb:364
220
+ #: ../lib/gettext/tools/msgmerge.rb:372
221
221
  msgid "Update definition.po"
222
222
  msgstr ""
223
223
 
224
- #: ../lib/gettext/tools/msgmerge.rb:398 ../lib/gettext/tools/xgettext.rb:307
224
+ #: ../lib/gettext/tools/msgmerge.rb:406 ../lib/gettext/tools/xgettext.rb:307
225
225
  msgid "Preserve '#: FILENAME:LINE' lines"
226
226
  msgstr ""
227
227
 
228
- #: ../lib/gettext/tools/msgmerge.rb:420
228
+ #: ../lib/gettext/tools/msgmerge.rb:428
229
229
  msgid "Disable fuzzy matching"
230
230
  msgstr ""
231
231
 
232
- #: ../lib/gettext/tools/msgmerge.rb:421
232
+ #: ../lib/gettext/tools/msgmerge.rb:429
233
233
  msgid "(enable)"
234
234
  msgstr ""
235
235
 
236
- #: ../lib/gettext/tools/msgmerge.rb:436
236
+ #: ../lib/gettext/tools/msgmerge.rb:449
237
237
  #, fuzzy
238
238
  msgid "Display version information and exit"
239
239
  msgstr "prikaži informaciju o verziji i završi"
@@ -347,7 +347,7 @@ msgid ""
347
347
  "Hello %{world}\n"
348
348
  msgstr ""
349
349
 
350
- #: ../samples/hello2.rb:20
350
+ #: ../samples/hello2.rb:20 ../test/fixtures/_/pipe.rb:28
351
351
  msgid "World"
352
352
  msgstr ""
353
353
 
@@ -546,10 +546,22 @@ msgid ""
546
546
  "one new line\n"
547
547
  msgstr ""
548
548
 
549
- #: ../test/fixtures/_/percent_strings.rb:34
549
+ #: ../test/fixtures/_/percent_strings.rb:31
550
+ msgid "in_symbol_array"
551
+ msgstr ""
552
+
553
+ #: ../test/fixtures/_/percent_strings.rb:39
550
554
  msgid "hello world"
551
555
  msgstr ""
552
556
 
557
+ #: ../test/fixtures/_/percent_strings.rb:47
558
+ msgid "in_string_array"
559
+ msgstr ""
560
+
561
+ #: ../test/fixtures/_/pipe.rb:26 ../test/fixtures/hello.rb:26
562
+ msgid "Hello"
563
+ msgstr ""
564
+
553
565
  #: ../test/fixtures/backslash.rb:27
554
566
  msgid "You should escape '\\' as '\\\\'."
555
567
  msgstr ""
@@ -583,10 +595,6 @@ msgstr ""
583
595
  msgid "duplicated"
584
596
  msgstr ""
585
597
 
586
- #: ../test/fixtures/hello.rb:26
587
- msgid "Hello"
588
- msgstr ""
589
-
590
598
  #: ../test/fixtures/lower_n_.rb:33
591
599
  msgid ""
592
600
  "bbb\n"
data/po/bs/gettext.po CHANGED
@@ -450,9 +450,18 @@ msgid ""
450
450
  "one new line\n"
451
451
  msgstr ""
452
452
 
453
+ msgid "in_symbol_array"
454
+ msgstr ""
455
+
453
456
  msgid "hello world"
454
457
  msgstr ""
455
458
 
459
+ msgid "in_string_array"
460
+ msgstr ""
461
+
462
+ msgid "Hello"
463
+ msgstr ""
464
+
456
465
  msgid "You should escape '\\' as '\\\\'."
457
466
  msgstr ""
458
467
 
@@ -479,9 +488,6 @@ msgstr ""
479
488
  msgid "duplicated"
480
489
  msgstr ""
481
490
 
482
- msgid "Hello"
483
- msgstr ""
484
-
485
491
  msgid ""
486
492
  "bbb\n"
487
493
  msgid_plural ""
data/po/ca/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 "Opcions específiques:"
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 "escriu la sortida en un fitxer especificat"
45
45
 
@@ -47,23 +47,23 @@ msgstr "escriu la sortida en un fitxer especificat"
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 "Combina dos fitxers .po d'estil Uniforum. El fitxer definition.po és un fitxer PO existent amb traduccions. El fitxer reference.pot és l'últim fitxer PO amb referències actualitzades. Normalment qui ha creat reference.pot és rgettext"
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 "mostra informació de la versió i surt"
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"