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/ja/gettext.po CHANGED
@@ -446,9 +446,18 @@ msgid ""
446
446
  "one new line\n"
447
447
  msgstr ""
448
448
 
449
+ msgid "in_symbol_array"
450
+ msgstr ""
451
+
449
452
  msgid "hello world"
450
453
  msgstr ""
451
454
 
455
+ msgid "in_string_array"
456
+ msgstr ""
457
+
458
+ msgid "Hello"
459
+ msgstr ""
460
+
452
461
  msgid "You should escape '\\' as '\\\\'."
453
462
  msgstr ""
454
463
 
@@ -475,9 +484,6 @@ msgstr ""
475
484
  msgid "duplicated"
476
485
  msgstr ""
477
486
 
478
- msgid "Hello"
479
- msgstr ""
480
-
481
487
  msgid ""
482
488
  "bbb\n"
483
489
  msgid_plural ""
data/po/ko/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 "특별한 옵션들:"
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 "지정한 파일에 출력 내용을 저장합니다"
@@ -49,23 +49,23 @@ msgstr "지정한 파일에 출력 내용을 저장합니다"
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 "2개의 유니포럼 스타일의 .po 파일들을 서로 병합합니다. def.po 파일은 번역을 가진 PO 파일입니다. ref.pot 파일은 최신 소스를 참조하는 가장 최근에 생성된 PO 파일입니다. ref.pot는 일반적으로 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 "버전 정보를 표시하고 빠져나갑니다"
@@ -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/ko/gettext.po CHANGED
@@ -453,9 +453,18 @@ msgid ""
453
453
  "one new line\n"
454
454
  msgstr ""
455
455
 
456
+ msgid "in_symbol_array"
457
+ msgstr ""
458
+
456
459
  msgid "hello world"
457
460
  msgstr ""
458
461
 
462
+ msgid "in_string_array"
463
+ msgstr ""
464
+
465
+ msgid "Hello"
466
+ msgstr ""
467
+
459
468
  msgid "You should escape '\\' as '\\\\'."
460
469
  msgstr ""
461
470
 
@@ -482,9 +491,6 @@ msgstr ""
482
491
  msgid "duplicated"
483
492
  msgstr ""
484
493
 
485
- msgid "Hello"
486
- msgstr ""
487
-
488
494
  msgid ""
489
495
  "bbb\n"
490
496
  msgid_plural ""
data/po/lv/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 "Īpaši uzstādījumi:"
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 "ierakstīt izvadi norādītajā datnē"
@@ -50,23 +50,23 @@ msgstr "ierakstīt izvadi norādītajā datnē"
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 "Apvieno divas \"Uniforum\" stila .po datnes. Def.po datne ir eksistējoša PO datne ar tulkojumiem. Ref.pot datne ir pēdējā izveidotā PO datne ar atjauninātām izejas faila atsaucēm. Ref.pot ir datni veido rgettext."
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 "parādīt versiju un iziet"
@@ -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/lv/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/nb/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 "Spesifikke alternativer:"
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 "skriv ut til spesifisert fil"
@@ -50,23 +50,23 @@ msgstr "skriv ut til spesifisert fil"
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 "Slår sammen to po-filer av Uniforum-typen. def.po-filen er en eksisterendePO-fil med oversettelser. ref.po-filen er den sist opprettede PO-filen medoppdaterte kildereferanser. ref.pot er generelt opprettet av rgettext."
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 "vis versjonsinformasjon og avslutt"
@@ -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"