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/ca/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/cs/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 "Volby:"
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 "zapsat výstup od určeného souboru"
@@ -51,23 +51,23 @@ msgstr "zapsat výstup od určeného souboru"
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
 
@@ -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
 
@@ -211,31 +211,31 @@ msgstr ""
211
211
  msgid "Please enter your email address"
212
212
  msgstr ""
213
213
 
214
- #: ../lib/gettext/tools/msgmerge.rb:350
214
+ #: ../lib/gettext/tools/msgmerge.rb:358
215
215
  msgid "Usage: %s [OPTIONS] definition.po reference.pot"
216
216
  msgstr ""
217
217
 
218
- #: ../lib/gettext/tools/msgmerge.rb:353
218
+ #: ../lib/gettext/tools/msgmerge.rb:361
219
219
  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."
220
220
  msgstr "Sloučí dohromady dva (Uniforum style) .po soubory. Soubor definition.po je existující PO soubor s překlady. Soubor reference.pot je naposledy vytvořený PO soubor s aktuálními zdrojovými referencemi. reference.pot je většinou vytvořen rgettextem."
221
221
 
222
- #: ../lib/gettext/tools/msgmerge.rb:364
222
+ #: ../lib/gettext/tools/msgmerge.rb:372
223
223
  msgid "Update definition.po"
224
224
  msgstr ""
225
225
 
226
- #: ../lib/gettext/tools/msgmerge.rb:398 ../lib/gettext/tools/xgettext.rb:307
226
+ #: ../lib/gettext/tools/msgmerge.rb:406 ../lib/gettext/tools/xgettext.rb:307
227
227
  msgid "Preserve '#: FILENAME:LINE' lines"
228
228
  msgstr ""
229
229
 
230
- #: ../lib/gettext/tools/msgmerge.rb:420
230
+ #: ../lib/gettext/tools/msgmerge.rb:428
231
231
  msgid "Disable fuzzy matching"
232
232
  msgstr ""
233
233
 
234
- #: ../lib/gettext/tools/msgmerge.rb:421
234
+ #: ../lib/gettext/tools/msgmerge.rb:429
235
235
  msgid "(enable)"
236
236
  msgstr ""
237
237
 
238
- #: ../lib/gettext/tools/msgmerge.rb:436
238
+ #: ../lib/gettext/tools/msgmerge.rb:449
239
239
  #, fuzzy
240
240
  msgid "Display version information and exit"
241
241
  msgstr "zobrazit informaci o verzi a skončit"
@@ -349,7 +349,7 @@ msgid ""
349
349
  "Hello %{world}\n"
350
350
  msgstr ""
351
351
 
352
- #: ../samples/hello2.rb:20
352
+ #: ../samples/hello2.rb:20 ../test/fixtures/_/pipe.rb:28
353
353
  msgid "World"
354
354
  msgstr ""
355
355
 
@@ -548,10 +548,22 @@ msgid ""
548
548
  "one new line\n"
549
549
  msgstr ""
550
550
 
551
- #: ../test/fixtures/_/percent_strings.rb:34
551
+ #: ../test/fixtures/_/percent_strings.rb:31
552
+ msgid "in_symbol_array"
553
+ msgstr ""
554
+
555
+ #: ../test/fixtures/_/percent_strings.rb:39
552
556
  msgid "hello world"
553
557
  msgstr ""
554
558
 
559
+ #: ../test/fixtures/_/percent_strings.rb:47
560
+ msgid "in_string_array"
561
+ msgstr ""
562
+
563
+ #: ../test/fixtures/_/pipe.rb:26 ../test/fixtures/hello.rb:26
564
+ msgid "Hello"
565
+ msgstr ""
566
+
555
567
  #: ../test/fixtures/backslash.rb:27
556
568
  msgid "You should escape '\\' as '\\\\'."
557
569
  msgstr ""
@@ -585,10 +597,6 @@ msgstr ""
585
597
  msgid "duplicated"
586
598
  msgstr ""
587
599
 
588
- #: ../test/fixtures/hello.rb:26
589
- msgid "Hello"
590
- msgstr ""
591
-
592
600
  #: ../test/fixtures/lower_n_.rb:33
593
601
  msgid ""
594
602
  "bbb\n"
data/po/cs/gettext.po CHANGED
@@ -452,9 +452,18 @@ msgid ""
452
452
  "one new line\n"
453
453
  msgstr ""
454
454
 
455
+ msgid "in_symbol_array"
456
+ msgstr ""
457
+
455
458
  msgid "hello world"
456
459
  msgstr ""
457
460
 
461
+ msgid "in_string_array"
462
+ msgstr ""
463
+
464
+ msgid "Hello"
465
+ msgstr ""
466
+
458
467
  msgid "You should escape '\\' as '\\\\'."
459
468
  msgstr ""
460
469
 
@@ -481,9 +490,6 @@ msgstr ""
481
490
  msgid "duplicated"
482
491
  msgstr ""
483
492
 
484
- msgid "Hello"
485
- msgstr ""
486
-
487
493
  msgid ""
488
494
  "bbb\n"
489
495
  msgid_plural ""
data/po/de/gettext.edit.po CHANGED
@@ -40,11 +40,11 @@ msgstr ""
40
40
  msgid "Concatenates and merges PO files."
41
41
  msgstr ""
42
42
 
43
- #: ../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
43
+ #: ../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
44
44
  msgid "Specific options:"
45
45
  msgstr "Spezifische Optionen:"
46
46
 
47
- #: ../lib/gettext/tools/msgcat.rb:249 ../lib/gettext/tools/msgmerge.rb:369
47
+ #: ../lib/gettext/tools/msgcat.rb:249 ../lib/gettext/tools/msgmerge.rb:377
48
48
  #, fuzzy
49
49
  msgid "Write output to specified file"
50
50
  msgstr "Schreibe Ausgabe in die angegebene Datei"
@@ -53,23 +53,23 @@ msgstr "Schreibe Ausgabe in die angegebene Datei"
53
53
  msgid "(default: the standard output)"
54
54
  msgstr ""
55
55
 
56
- #: ../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
56
+ #: ../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
57
57
  msgid "Sort output by msgid"
58
58
  msgstr ""
59
59
 
60
- #: ../lib/gettext/tools/msgcat.rb:260 ../lib/gettext/tools/msgcat.rb:265 ../lib/gettext/tools/msgmerge.rb:381 ../lib/gettext/tools/msgmerge.rb:388
60
+ #: ../lib/gettext/tools/msgcat.rb:260 ../lib/gettext/tools/msgcat.rb:265 ../lib/gettext/tools/msgmerge.rb:389 ../lib/gettext/tools/msgmerge.rb:396
61
61
  msgid "Sort output by location"
62
62
  msgstr ""
63
63
 
64
- #: ../lib/gettext/tools/msgcat.rb:266 ../lib/gettext/tools/msgmerge.rb:382
64
+ #: ../lib/gettext/tools/msgcat.rb:266 ../lib/gettext/tools/msgmerge.rb:390
65
65
  msgid "It is same as --sort-by-location"
66
66
  msgstr ""
67
67
 
68
- #: ../lib/gettext/tools/msgcat.rb:267 ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:376 ../lib/gettext/tools/msgmerge.rb:383
68
+ #: ../lib/gettext/tools/msgcat.rb:267 ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:384 ../lib/gettext/tools/msgmerge.rb:391
69
69
  msgid "Just for GNU gettext's msgcat compatibility"
70
70
  msgstr ""
71
71
 
72
- #: ../lib/gettext/tools/msgcat.rb:273 ../lib/gettext/tools/msgmerge.rb:375
72
+ #: ../lib/gettext/tools/msgcat.rb:273 ../lib/gettext/tools/msgmerge.rb:383
73
73
  msgid "It is same as --sort-by-msgid"
74
74
  msgstr ""
75
75
 
@@ -97,11 +97,11 @@ msgstr ""
97
97
  msgid "Remove all comments"
98
98
  msgstr ""
99
99
 
100
- #: ../lib/gettext/tools/msgcat.rb:309 ../lib/gettext/tools/msgmerge.rb:403 ../lib/gettext/tools/xgettext.rb:312
100
+ #: ../lib/gettext/tools/msgcat.rb:309 ../lib/gettext/tools/msgmerge.rb:411 ../lib/gettext/tools/xgettext.rb:312
101
101
  msgid "Set output page width"
102
102
  msgstr ""
103
103
 
104
- #: ../lib/gettext/tools/msgcat.rb:315 ../lib/gettext/tools/msgmerge.rb:409 ../lib/gettext/tools/xgettext.rb:318
104
+ #: ../lib/gettext/tools/msgcat.rb:315 ../lib/gettext/tools/msgmerge.rb:417 ../lib/gettext/tools/xgettext.rb:318
105
105
  msgid "Break long message lines, longer than the output page width, into several lines"
106
106
  msgstr ""
107
107
 
@@ -109,11 +109,11 @@ msgstr ""
109
109
  msgid "Ignore fuzzy entries"
110
110
  msgstr ""
111
111
 
112
- #: ../lib/gettext/tools/msgcat.rb:331
112
+ #: ../lib/gettext/tools/msgcat.rb:331 ../lib/gettext/tools/msgmerge.rb:434
113
113
  msgid "Don't report warning messages"
114
114
  msgstr ""
115
115
 
116
- #: ../lib/gettext/tools/msgcat.rb:336 ../lib/gettext/tools/msgmerge.rb:426
116
+ #: ../lib/gettext/tools/msgcat.rb:336 ../lib/gettext/tools/msgmerge.rb:439
117
117
  msgid "Don't output obsolete entries"
118
118
  msgstr ""
119
119
 
@@ -182,7 +182,7 @@ msgstr ""
182
182
  msgid "Use EMAIL as translator email address"
183
183
  msgstr ""
184
184
 
185
- #: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:430
185
+ #: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:443
186
186
  msgid "Display this help and exit"
187
187
  msgstr ""
188
188
 
@@ -217,32 +217,32 @@ msgstr ""
217
217
  msgid "Please enter your email address"
218
218
  msgstr ""
219
219
 
220
- #: ../lib/gettext/tools/msgmerge.rb:350
220
+ #: ../lib/gettext/tools/msgmerge.rb:358
221
221
  msgid "Usage: %s [OPTIONS] definition.po reference.pot"
222
222
  msgstr ""
223
223
 
224
- #: ../lib/gettext/tools/msgmerge.rb:353
224
+ #: ../lib/gettext/tools/msgmerge.rb:361
225
225
  #, fuzzy
226
226
  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."
227
227
  msgstr "Vereint zwei .po Dateien im Uniform Stil miteinander. Die Datei def.po existiert bereits und enthält Übersetzungen. Die Datei ref.pot ist die zuletzt erstellte Datei mit aktuellen Quellenreferenzen. ref.pot wird in aller Regel durch rgettext erstellt"
228
228
 
229
- #: ../lib/gettext/tools/msgmerge.rb:364
229
+ #: ../lib/gettext/tools/msgmerge.rb:372
230
230
  msgid "Update definition.po"
231
231
  msgstr ""
232
232
 
233
- #: ../lib/gettext/tools/msgmerge.rb:398 ../lib/gettext/tools/xgettext.rb:307
233
+ #: ../lib/gettext/tools/msgmerge.rb:406 ../lib/gettext/tools/xgettext.rb:307
234
234
  msgid "Preserve '#: FILENAME:LINE' lines"
235
235
  msgstr ""
236
236
 
237
- #: ../lib/gettext/tools/msgmerge.rb:420
237
+ #: ../lib/gettext/tools/msgmerge.rb:428
238
238
  msgid "Disable fuzzy matching"
239
239
  msgstr ""
240
240
 
241
- #: ../lib/gettext/tools/msgmerge.rb:421
241
+ #: ../lib/gettext/tools/msgmerge.rb:429
242
242
  msgid "(enable)"
243
243
  msgstr ""
244
244
 
245
- #: ../lib/gettext/tools/msgmerge.rb:436
245
+ #: ../lib/gettext/tools/msgmerge.rb:449
246
246
  #, fuzzy
247
247
  msgid "Display version information and exit"
248
248
  msgstr "Zeige Versionsinformationen und beende."
@@ -356,7 +356,7 @@ msgid ""
356
356
  "Hello %{world}\n"
357
357
  msgstr ""
358
358
 
359
- #: ../samples/hello2.rb:20
359
+ #: ../samples/hello2.rb:20 ../test/fixtures/_/pipe.rb:28
360
360
  msgid "World"
361
361
  msgstr ""
362
362
 
@@ -555,10 +555,22 @@ msgid ""
555
555
  "one new line\n"
556
556
  msgstr ""
557
557
 
558
- #: ../test/fixtures/_/percent_strings.rb:34
558
+ #: ../test/fixtures/_/percent_strings.rb:31
559
+ msgid "in_symbol_array"
560
+ msgstr ""
561
+
562
+ #: ../test/fixtures/_/percent_strings.rb:39
559
563
  msgid "hello world"
560
564
  msgstr ""
561
565
 
566
+ #: ../test/fixtures/_/percent_strings.rb:47
567
+ msgid "in_string_array"
568
+ msgstr ""
569
+
570
+ #: ../test/fixtures/_/pipe.rb:26 ../test/fixtures/hello.rb:26
571
+ msgid "Hello"
572
+ msgstr ""
573
+
562
574
  #: ../test/fixtures/backslash.rb:27
563
575
  msgid "You should escape '\\' as '\\\\'."
564
576
  msgstr ""
@@ -592,10 +604,6 @@ msgstr ""
592
604
  msgid "duplicated"
593
605
  msgstr ""
594
606
 
595
- #: ../test/fixtures/hello.rb:26
596
- msgid "Hello"
597
- msgstr ""
598
-
599
607
  #: ../test/fixtures/lower_n_.rb:33
600
608
  msgid ""
601
609
  "bbb\n"
data/po/de/gettext.po CHANGED
@@ -459,9 +459,18 @@ msgid ""
459
459
  "one new line\n"
460
460
  msgstr ""
461
461
 
462
+ msgid "in_symbol_array"
463
+ msgstr ""
464
+
462
465
  msgid "hello world"
463
466
  msgstr ""
464
467
 
468
+ msgid "in_string_array"
469
+ msgstr ""
470
+
471
+ msgid "Hello"
472
+ msgstr ""
473
+
465
474
  msgid "You should escape '\\' as '\\\\'."
466
475
  msgstr ""
467
476
 
@@ -488,9 +497,6 @@ msgstr ""
488
497
  msgid "duplicated"
489
498
  msgstr ""
490
499
 
491
- msgid "Hello"
492
- msgstr ""
493
-
494
500
  msgid ""
495
501
  "bbb\n"
496
502
  msgid_plural ""
data/po/el/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 "Συγχωνεύει δύο αρχεία Uniforum .po. Το αρχείο def.po είναι ένα υπάρχον αρχείο PO με τις μεταφράσεις. Το αρχείο ref.pot είναι το τελευταίο αρχείο αναφοράς που κατασκευάστηκε και έχει ενημερωμένες αναφορές κώδικα. Το 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"