gettext 3.1.9 → 3.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (33) hide show
  1. checksums.yaml +4 -4
  2. data/doc/text/news.md +6 -0
  3. data/lib/gettext/tools/msgmerge.rb +5 -0
  4. data/lib/gettext/version.rb +1 -1
  5. data/po/bg/gettext.edit.po +18 -18
  6. data/po/bs/gettext.edit.po +18 -18
  7. data/po/ca/gettext.edit.po +18 -18
  8. data/po/cs/gettext.edit.po +18 -18
  9. data/po/de/gettext.edit.po +18 -18
  10. data/po/el/gettext.edit.po +18 -18
  11. data/po/eo/gettext.edit.po +18 -18
  12. data/po/es/gettext.edit.po +18 -18
  13. data/po/et/gettext.edit.po +18 -18
  14. data/po/fr/gettext.edit.po +18 -18
  15. data/po/gettext.pot +21 -21
  16. data/po/hr/gettext.edit.po +18 -18
  17. data/po/hu/gettext.edit.po +18 -18
  18. data/po/it/gettext.edit.po +18 -18
  19. data/po/ja/gettext.edit.po +18 -18
  20. data/po/ko/gettext.edit.po +18 -18
  21. data/po/lv/gettext.edit.po +18 -18
  22. data/po/nb/gettext.edit.po +18 -18
  23. data/po/nl/gettext.edit.po +18 -18
  24. data/po/pt_BR/gettext.edit.po +18 -18
  25. data/po/ru/gettext.edit.po +18 -18
  26. data/po/sr/gettext.edit.po +18 -18
  27. data/po/sv/gettext.edit.po +18 -18
  28. data/po/uk/gettext.edit.po +18 -18
  29. data/po/vi/gettext.edit.po +18 -18
  30. data/po/zh/gettext.edit.po +18 -18
  31. data/po/zh_TW/gettext.edit.po +18 -18
  32. data/test/tools/test_msgmerge.rb +39 -27
  33. metadata +14 -14
data/po/et/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:211 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:356 ../lib/gettext/tools/xgettext.rb:248
40
+ #: ../lib/gettext/tools/msgcat.rb:211 ../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
41
  msgid "Specific options:"
42
42
  msgstr "Seaded:"
43
43
 
44
- #: ../lib/gettext/tools/msgcat.rb:214 ../lib/gettext/tools/msgmerge.rb:364
44
+ #: ../lib/gettext/tools/msgcat.rb:214 ../lib/gettext/tools/msgmerge.rb:369
45
45
  #, fuzzy
46
46
  msgid "Write output to specified file"
47
47
  msgstr "kirjuta väljund antud faili"
@@ -50,23 +50,23 @@ msgstr "kirjuta väljund antud faili"
50
50
  msgid "(default: the standard output)"
51
51
  msgstr ""
52
52
 
53
- #: ../lib/gettext/tools/msgcat.rb:220 ../lib/gettext/tools/msgcat.rb:237 ../lib/gettext/tools/msgmerge.rb:369 ../lib/gettext/tools/msgmerge.rb:388 ../lib/gettext/tools/xgettext.rb:302
53
+ #: ../lib/gettext/tools/msgcat.rb:220 ../lib/gettext/tools/msgcat.rb:237 ../lib/gettext/tools/msgmerge.rb:374 ../lib/gettext/tools/msgmerge.rb:393 ../lib/gettext/tools/xgettext.rb:302
54
54
  msgid "Sort output by msgid"
55
55
  msgstr ""
56
56
 
57
- #: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgcat.rb:230 ../lib/gettext/tools/msgmerge.rb:376 ../lib/gettext/tools/msgmerge.rb:383
57
+ #: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgcat.rb:230 ../lib/gettext/tools/msgmerge.rb:381 ../lib/gettext/tools/msgmerge.rb:388
58
58
  msgid "Sort output by location"
59
59
  msgstr ""
60
60
 
61
- #: ../lib/gettext/tools/msgcat.rb:231 ../lib/gettext/tools/msgmerge.rb:377
61
+ #: ../lib/gettext/tools/msgcat.rb:231 ../lib/gettext/tools/msgmerge.rb:382
62
62
  msgid "It is same as --sort-by-location"
63
63
  msgstr ""
64
64
 
65
- #: ../lib/gettext/tools/msgcat.rb:232 ../lib/gettext/tools/msgcat.rb:239 ../lib/gettext/tools/msgmerge.rb:371 ../lib/gettext/tools/msgmerge.rb:378
65
+ #: ../lib/gettext/tools/msgcat.rb:232 ../lib/gettext/tools/msgcat.rb:239 ../lib/gettext/tools/msgmerge.rb:376 ../lib/gettext/tools/msgmerge.rb:383
66
66
  msgid "Just for GNU gettext's msgcat compatibility"
67
67
  msgstr ""
68
68
 
69
- #: ../lib/gettext/tools/msgcat.rb:238 ../lib/gettext/tools/msgmerge.rb:370
69
+ #: ../lib/gettext/tools/msgcat.rb:238 ../lib/gettext/tools/msgmerge.rb:375
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:274 ../lib/gettext/tools/msgmerge.rb:398 ../lib/gettext/tools/xgettext.rb:312
97
+ #: ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:403 ../lib/gettext/tools/xgettext.rb:312
98
98
  msgid "Set output page width"
99
99
  msgstr ""
100
100
 
101
- #: ../lib/gettext/tools/msgcat.rb:280 ../lib/gettext/tools/msgmerge.rb:404 ../lib/gettext/tools/xgettext.rb:318
101
+ #: ../lib/gettext/tools/msgcat.rb:280 ../lib/gettext/tools/msgmerge.rb:409 ../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
 
@@ -110,7 +110,7 @@ msgstr ""
110
110
  msgid "Don't report warning messages"
111
111
  msgstr ""
112
112
 
113
- #: ../lib/gettext/tools/msgcat.rb:301 ../lib/gettext/tools/msgmerge.rb:421
113
+ #: ../lib/gettext/tools/msgcat.rb:301 ../lib/gettext/tools/msgmerge.rb:426
114
114
  msgid "Don't output obsolete entries"
115
115
  msgstr ""
116
116
 
@@ -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:425
178
+ #: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:430
179
179
  msgid "Display this help and exit"
180
180
  msgstr ""
181
181
 
@@ -210,32 +210,32 @@ msgstr ""
210
210
  msgid "Please enter your email address"
211
211
  msgstr ""
212
212
 
213
- #: ../lib/gettext/tools/msgmerge.rb:345
213
+ #: ../lib/gettext/tools/msgmerge.rb:350
214
214
  msgid "Usage: %s [OPTIONS] definition.po reference.pot"
215
215
  msgstr ""
216
216
 
217
- #: ../lib/gettext/tools/msgmerge.rb:348
217
+ #: ../lib/gettext/tools/msgmerge.rb:353
218
218
  #, fuzzy
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 "Liidab kokku kaks ühesugust .po faili. def.po on fail olemasolevate tõlgetega.ref.pot on fail viimaste uuendatud tõlgetega.ref.pot on üldjuhul loodud rgettext poolt."
221
221
 
222
- #: ../lib/gettext/tools/msgmerge.rb:359
222
+ #: ../lib/gettext/tools/msgmerge.rb:364
223
223
  msgid "Update definition.po"
224
224
  msgstr ""
225
225
 
226
- #: ../lib/gettext/tools/msgmerge.rb:393 ../lib/gettext/tools/xgettext.rb:307
226
+ #: ../lib/gettext/tools/msgmerge.rb:398 ../lib/gettext/tools/xgettext.rb:307
227
227
  msgid "Preserve '#: FILENAME:LINE' lines"
228
228
  msgstr ""
229
229
 
230
- #: ../lib/gettext/tools/msgmerge.rb:415
230
+ #: ../lib/gettext/tools/msgmerge.rb:420
231
231
  msgid "Disable fuzzy matching"
232
232
  msgstr ""
233
233
 
234
- #: ../lib/gettext/tools/msgmerge.rb:416
234
+ #: ../lib/gettext/tools/msgmerge.rb:421
235
235
  msgid "(enable)"
236
236
  msgstr ""
237
237
 
238
- #: ../lib/gettext/tools/msgmerge.rb:431
238
+ #: ../lib/gettext/tools/msgmerge.rb:436
239
239
  #, fuzzy
240
240
  msgid "Display version information and exit"
241
241
  msgstr "esita versiooni info ja välju"
data/po/fr/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:211 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:356 ../lib/gettext/tools/xgettext.rb:248
41
+ #: ../lib/gettext/tools/msgcat.rb:211 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:361 ../lib/gettext/tools/xgettext.rb:248
42
42
  msgid "Specific options:"
43
43
  msgstr "Options spécifiques:"
44
44
 
45
- #: ../lib/gettext/tools/msgcat.rb:214 ../lib/gettext/tools/msgmerge.rb:364
45
+ #: ../lib/gettext/tools/msgcat.rb:214 ../lib/gettext/tools/msgmerge.rb:369
46
46
  #, fuzzy
47
47
  msgid "Write output to specified file"
48
48
  msgstr "écrit la sortie dans le fichier spécifié"
@@ -51,23 +51,23 @@ msgstr "écrit la sortie dans le fichier spécifié"
51
51
  msgid "(default: the standard output)"
52
52
  msgstr ""
53
53
 
54
- #: ../lib/gettext/tools/msgcat.rb:220 ../lib/gettext/tools/msgcat.rb:237 ../lib/gettext/tools/msgmerge.rb:369 ../lib/gettext/tools/msgmerge.rb:388 ../lib/gettext/tools/xgettext.rb:302
54
+ #: ../lib/gettext/tools/msgcat.rb:220 ../lib/gettext/tools/msgcat.rb:237 ../lib/gettext/tools/msgmerge.rb:374 ../lib/gettext/tools/msgmerge.rb:393 ../lib/gettext/tools/xgettext.rb:302
55
55
  msgid "Sort output by msgid"
56
56
  msgstr ""
57
57
 
58
- #: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgcat.rb:230 ../lib/gettext/tools/msgmerge.rb:376 ../lib/gettext/tools/msgmerge.rb:383
58
+ #: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgcat.rb:230 ../lib/gettext/tools/msgmerge.rb:381 ../lib/gettext/tools/msgmerge.rb:388
59
59
  msgid "Sort output by location"
60
60
  msgstr ""
61
61
 
62
- #: ../lib/gettext/tools/msgcat.rb:231 ../lib/gettext/tools/msgmerge.rb:377
62
+ #: ../lib/gettext/tools/msgcat.rb:231 ../lib/gettext/tools/msgmerge.rb:382
63
63
  msgid "It is same as --sort-by-location"
64
64
  msgstr ""
65
65
 
66
- #: ../lib/gettext/tools/msgcat.rb:232 ../lib/gettext/tools/msgcat.rb:239 ../lib/gettext/tools/msgmerge.rb:371 ../lib/gettext/tools/msgmerge.rb:378
66
+ #: ../lib/gettext/tools/msgcat.rb:232 ../lib/gettext/tools/msgcat.rb:239 ../lib/gettext/tools/msgmerge.rb:376 ../lib/gettext/tools/msgmerge.rb:383
67
67
  msgid "Just for GNU gettext's msgcat compatibility"
68
68
  msgstr ""
69
69
 
70
- #: ../lib/gettext/tools/msgcat.rb:238 ../lib/gettext/tools/msgmerge.rb:370
70
+ #: ../lib/gettext/tools/msgcat.rb:238 ../lib/gettext/tools/msgmerge.rb:375
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:274 ../lib/gettext/tools/msgmerge.rb:398 ../lib/gettext/tools/xgettext.rb:312
98
+ #: ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:403 ../lib/gettext/tools/xgettext.rb:312
99
99
  msgid "Set output page width"
100
100
  msgstr ""
101
101
 
102
- #: ../lib/gettext/tools/msgcat.rb:280 ../lib/gettext/tools/msgmerge.rb:404 ../lib/gettext/tools/xgettext.rb:318
102
+ #: ../lib/gettext/tools/msgcat.rb:280 ../lib/gettext/tools/msgmerge.rb:409 ../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
 
@@ -111,7 +111,7 @@ msgstr ""
111
111
  msgid "Don't report warning messages"
112
112
  msgstr ""
113
113
 
114
- #: ../lib/gettext/tools/msgcat.rb:301 ../lib/gettext/tools/msgmerge.rb:421
114
+ #: ../lib/gettext/tools/msgcat.rb:301 ../lib/gettext/tools/msgmerge.rb:426
115
115
  msgid "Don't output obsolete entries"
116
116
  msgstr ""
117
117
 
@@ -176,7 +176,7 @@ msgstr ""
176
176
  msgid "Use EMAIL as translator email address"
177
177
  msgstr ""
178
178
 
179
- #: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:425
179
+ #: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:430
180
180
  msgid "Display this help and exit"
181
181
  msgstr ""
182
182
 
@@ -211,32 +211,32 @@ msgstr ""
211
211
  msgid "Please enter your email address"
212
212
  msgstr ""
213
213
 
214
- #: ../lib/gettext/tools/msgmerge.rb:345
214
+ #: ../lib/gettext/tools/msgmerge.rb:350
215
215
  msgid "Usage: %s [OPTIONS] definition.po reference.pot"
216
216
  msgstr ""
217
217
 
218
- #: ../lib/gettext/tools/msgmerge.rb:348
218
+ #: ../lib/gettext/tools/msgmerge.rb:353
219
219
  #, fuzzy
220
220
  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."
221
221
  msgstr "Fusionne deux fichiers .po de style Uniforum. Le fichier def.po est un fichier de traduction original. Le fichier ref.pot est le dernier fichier de traduction créé avec les sources mise-à-jour. ref.pot est en général généré par rgettext."
222
222
 
223
- #: ../lib/gettext/tools/msgmerge.rb:359
223
+ #: ../lib/gettext/tools/msgmerge.rb:364
224
224
  msgid "Update definition.po"
225
225
  msgstr ""
226
226
 
227
- #: ../lib/gettext/tools/msgmerge.rb:393 ../lib/gettext/tools/xgettext.rb:307
227
+ #: ../lib/gettext/tools/msgmerge.rb:398 ../lib/gettext/tools/xgettext.rb:307
228
228
  msgid "Preserve '#: FILENAME:LINE' lines"
229
229
  msgstr ""
230
230
 
231
- #: ../lib/gettext/tools/msgmerge.rb:415
231
+ #: ../lib/gettext/tools/msgmerge.rb:420
232
232
  msgid "Disable fuzzy matching"
233
233
  msgstr ""
234
234
 
235
- #: ../lib/gettext/tools/msgmerge.rb:416
235
+ #: ../lib/gettext/tools/msgmerge.rb:421
236
236
  msgid "(enable)"
237
237
  msgstr ""
238
238
 
239
- #: ../lib/gettext/tools/msgmerge.rb:431
239
+ #: ../lib/gettext/tools/msgmerge.rb:436
240
240
  #, fuzzy
241
241
  msgid "Display version information and exit"
242
242
  msgstr "affiche la version du programme et sort"
data/po/gettext.pot CHANGED
@@ -6,10 +6,10 @@
6
6
  #, fuzzy
7
7
  msgid ""
8
8
  msgstr ""
9
- "Project-Id-Version: gettext 3.1.9\n"
9
+ "Project-Id-Version: gettext 3.2.0\n"
10
10
  "Report-Msgid-Bugs-To: \n"
11
- "POT-Creation-Date: 2015-12-30 11:57+0900\n"
12
- "PO-Revision-Date: 2015-12-30 11:57+0900\n"
11
+ "POT-Creation-Date: 2015-12-31 12:49+0900\n"
12
+ "PO-Revision-Date: 2015-12-31 12:49+0900\n"
13
13
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
  "Language-Team: LANGUAGE <LL@li.org>\n"
15
15
  "Language: \n"
@@ -35,12 +35,12 @@ msgid "Concatenates and merges PO files."
35
35
  msgstr ""
36
36
 
37
37
  #: ../lib/gettext/tools/msgcat.rb:211 ../lib/gettext/tools/msgfmt.rb:86
38
- #: ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:356
38
+ #: ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:361
39
39
  #: ../lib/gettext/tools/xgettext.rb:248
40
40
  msgid "Specific options:"
41
41
  msgstr ""
42
42
 
43
- #: ../lib/gettext/tools/msgcat.rb:214 ../lib/gettext/tools/msgmerge.rb:364
43
+ #: ../lib/gettext/tools/msgcat.rb:214 ../lib/gettext/tools/msgmerge.rb:369
44
44
  msgid "Write output to specified file"
45
45
  msgstr ""
46
46
 
@@ -49,26 +49,26 @@ msgid "(default: the standard output)"
49
49
  msgstr ""
50
50
 
51
51
  #: ../lib/gettext/tools/msgcat.rb:220 ../lib/gettext/tools/msgcat.rb:237
52
- #: ../lib/gettext/tools/msgmerge.rb:369 ../lib/gettext/tools/msgmerge.rb:388
52
+ #: ../lib/gettext/tools/msgmerge.rb:374 ../lib/gettext/tools/msgmerge.rb:393
53
53
  #: ../lib/gettext/tools/xgettext.rb:302
54
54
  msgid "Sort output by msgid"
55
55
  msgstr ""
56
56
 
57
57
  #: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgcat.rb:230
58
- #: ../lib/gettext/tools/msgmerge.rb:376 ../lib/gettext/tools/msgmerge.rb:383
58
+ #: ../lib/gettext/tools/msgmerge.rb:381 ../lib/gettext/tools/msgmerge.rb:388
59
59
  msgid "Sort output by location"
60
60
  msgstr ""
61
61
 
62
- #: ../lib/gettext/tools/msgcat.rb:231 ../lib/gettext/tools/msgmerge.rb:377
62
+ #: ../lib/gettext/tools/msgcat.rb:231 ../lib/gettext/tools/msgmerge.rb:382
63
63
  msgid "It is same as --sort-by-location"
64
64
  msgstr ""
65
65
 
66
66
  #: ../lib/gettext/tools/msgcat.rb:232 ../lib/gettext/tools/msgcat.rb:239
67
- #: ../lib/gettext/tools/msgmerge.rb:371 ../lib/gettext/tools/msgmerge.rb:378
67
+ #: ../lib/gettext/tools/msgmerge.rb:376 ../lib/gettext/tools/msgmerge.rb:383
68
68
  msgid "Just for GNU gettext's msgcat compatibility"
69
69
  msgstr ""
70
70
 
71
- #: ../lib/gettext/tools/msgcat.rb:238 ../lib/gettext/tools/msgmerge.rb:370
71
+ #: ../lib/gettext/tools/msgcat.rb:238 ../lib/gettext/tools/msgmerge.rb:375
72
72
  msgid "It is same as --sort-by-msgid"
73
73
  msgstr ""
74
74
 
@@ -96,12 +96,12 @@ msgstr ""
96
96
  msgid "Remove all comments"
97
97
  msgstr ""
98
98
 
99
- #: ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:398
99
+ #: ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:403
100
100
  #: ../lib/gettext/tools/xgettext.rb:312
101
101
  msgid "Set output page width"
102
102
  msgstr ""
103
103
 
104
- #: ../lib/gettext/tools/msgcat.rb:280 ../lib/gettext/tools/msgmerge.rb:404
104
+ #: ../lib/gettext/tools/msgcat.rb:280 ../lib/gettext/tools/msgmerge.rb:409
105
105
  #: ../lib/gettext/tools/xgettext.rb:318
106
106
  msgid ""
107
107
  "Break long message lines, longer than the output page width, into several line"
@@ -116,7 +116,7 @@ msgstr ""
116
116
  msgid "Don't report warning messages"
117
117
  msgstr ""
118
118
 
119
- #: ../lib/gettext/tools/msgcat.rb:301 ../lib/gettext/tools/msgmerge.rb:421
119
+ #: ../lib/gettext/tools/msgcat.rb:301 ../lib/gettext/tools/msgmerge.rb:426
120
120
  msgid "Don't output obsolete entries"
121
121
  msgstr ""
122
122
 
@@ -188,7 +188,7 @@ msgstr ""
188
188
  msgid "Use EMAIL as translator email address"
189
189
  msgstr ""
190
190
 
191
- #: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:425
191
+ #: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:430
192
192
  msgid "Display this help and exit"
193
193
  msgstr ""
194
194
 
@@ -222,11 +222,11 @@ msgstr ""
222
222
  msgid "Please enter your email address"
223
223
  msgstr ""
224
224
 
225
- #: ../lib/gettext/tools/msgmerge.rb:345
225
+ #: ../lib/gettext/tools/msgmerge.rb:350
226
226
  msgid "Usage: %s [OPTIONS] definition.po reference.pot"
227
227
  msgstr ""
228
228
 
229
- #: ../lib/gettext/tools/msgmerge.rb:348
229
+ #: ../lib/gettext/tools/msgmerge.rb:353
230
230
  msgid ""
231
231
  "Merges two Uniforum style .po files together. The definition.po file is an exi"
232
232
  "sting PO file with translations. The reference.pot file is the last created PO"
@@ -234,23 +234,23 @@ msgid ""
234
234
  "d by rxgettext."
235
235
  msgstr ""
236
236
 
237
- #: ../lib/gettext/tools/msgmerge.rb:359
237
+ #: ../lib/gettext/tools/msgmerge.rb:364
238
238
  msgid "Update definition.po"
239
239
  msgstr ""
240
240
 
241
- #: ../lib/gettext/tools/msgmerge.rb:393 ../lib/gettext/tools/xgettext.rb:307
241
+ #: ../lib/gettext/tools/msgmerge.rb:398 ../lib/gettext/tools/xgettext.rb:307
242
242
  msgid "Preserve '#: FILENAME:LINE' lines"
243
243
  msgstr ""
244
244
 
245
- #: ../lib/gettext/tools/msgmerge.rb:415
245
+ #: ../lib/gettext/tools/msgmerge.rb:420
246
246
  msgid "Disable fuzzy matching"
247
247
  msgstr ""
248
248
 
249
- #: ../lib/gettext/tools/msgmerge.rb:416
249
+ #: ../lib/gettext/tools/msgmerge.rb:421
250
250
  msgid "(enable)"
251
251
  msgstr ""
252
252
 
253
- #: ../lib/gettext/tools/msgmerge.rb:431
253
+ #: ../lib/gettext/tools/msgmerge.rb:436
254
254
  msgid "Display version information and exit"
255
255
  msgstr ""
256
256
 
data/po/hr/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:211 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:356 ../lib/gettext/tools/xgettext.rb:248
40
+ #: ../lib/gettext/tools/msgcat.rb:211 ../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
41
  msgid "Specific options:"
42
42
  msgstr "Specifične opcije:"
43
43
 
44
- #: ../lib/gettext/tools/msgcat.rb:214 ../lib/gettext/tools/msgmerge.rb:364
44
+ #: ../lib/gettext/tools/msgcat.rb:214 ../lib/gettext/tools/msgmerge.rb:369
45
45
  #, fuzzy
46
46
  msgid "Write output to specified file"
47
47
  msgstr "zapiši izlaz u specifičnu datoteku"
@@ -50,23 +50,23 @@ msgstr "zapiši izlaz u specifičnu datoteku"
50
50
  msgid "(default: the standard output)"
51
51
  msgstr ""
52
52
 
53
- #: ../lib/gettext/tools/msgcat.rb:220 ../lib/gettext/tools/msgcat.rb:237 ../lib/gettext/tools/msgmerge.rb:369 ../lib/gettext/tools/msgmerge.rb:388 ../lib/gettext/tools/xgettext.rb:302
53
+ #: ../lib/gettext/tools/msgcat.rb:220 ../lib/gettext/tools/msgcat.rb:237 ../lib/gettext/tools/msgmerge.rb:374 ../lib/gettext/tools/msgmerge.rb:393 ../lib/gettext/tools/xgettext.rb:302
54
54
  msgid "Sort output by msgid"
55
55
  msgstr ""
56
56
 
57
- #: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgcat.rb:230 ../lib/gettext/tools/msgmerge.rb:376 ../lib/gettext/tools/msgmerge.rb:383
57
+ #: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgcat.rb:230 ../lib/gettext/tools/msgmerge.rb:381 ../lib/gettext/tools/msgmerge.rb:388
58
58
  msgid "Sort output by location"
59
59
  msgstr ""
60
60
 
61
- #: ../lib/gettext/tools/msgcat.rb:231 ../lib/gettext/tools/msgmerge.rb:377
61
+ #: ../lib/gettext/tools/msgcat.rb:231 ../lib/gettext/tools/msgmerge.rb:382
62
62
  msgid "It is same as --sort-by-location"
63
63
  msgstr ""
64
64
 
65
- #: ../lib/gettext/tools/msgcat.rb:232 ../lib/gettext/tools/msgcat.rb:239 ../lib/gettext/tools/msgmerge.rb:371 ../lib/gettext/tools/msgmerge.rb:378
65
+ #: ../lib/gettext/tools/msgcat.rb:232 ../lib/gettext/tools/msgcat.rb:239 ../lib/gettext/tools/msgmerge.rb:376 ../lib/gettext/tools/msgmerge.rb:383
66
66
  msgid "Just for GNU gettext's msgcat compatibility"
67
67
  msgstr ""
68
68
 
69
- #: ../lib/gettext/tools/msgcat.rb:238 ../lib/gettext/tools/msgmerge.rb:370
69
+ #: ../lib/gettext/tools/msgcat.rb:238 ../lib/gettext/tools/msgmerge.rb:375
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:274 ../lib/gettext/tools/msgmerge.rb:398 ../lib/gettext/tools/xgettext.rb:312
97
+ #: ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:403 ../lib/gettext/tools/xgettext.rb:312
98
98
  msgid "Set output page width"
99
99
  msgstr ""
100
100
 
101
- #: ../lib/gettext/tools/msgcat.rb:280 ../lib/gettext/tools/msgmerge.rb:404 ../lib/gettext/tools/xgettext.rb:318
101
+ #: ../lib/gettext/tools/msgcat.rb:280 ../lib/gettext/tools/msgmerge.rb:409 ../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
 
@@ -110,7 +110,7 @@ msgstr ""
110
110
  msgid "Don't report warning messages"
111
111
  msgstr ""
112
112
 
113
- #: ../lib/gettext/tools/msgcat.rb:301 ../lib/gettext/tools/msgmerge.rb:421
113
+ #: ../lib/gettext/tools/msgcat.rb:301 ../lib/gettext/tools/msgmerge.rb:426
114
114
  msgid "Don't output obsolete entries"
115
115
  msgstr ""
116
116
 
@@ -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:425
178
+ #: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:430
179
179
  msgid "Display this help and exit"
180
180
  msgstr ""
181
181
 
@@ -210,32 +210,32 @@ msgstr ""
210
210
  msgid "Please enter your email address"
211
211
  msgstr ""
212
212
 
213
- #: ../lib/gettext/tools/msgmerge.rb:345
213
+ #: ../lib/gettext/tools/msgmerge.rb:350
214
214
  msgid "Usage: %s [OPTIONS] definition.po reference.pot"
215
215
  msgstr ""
216
216
 
217
- #: ../lib/gettext/tools/msgmerge.rb:348
217
+ #: ../lib/gettext/tools/msgmerge.rb:353
218
218
  #, fuzzy
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 "Spaja dvije Uniforum style .po datoteke skupa. def.po datoteka je već postojeća PO datoteka sa prevodima. ref.pot je zadnja napravljena PO datoteka sa najnovijim referencama koda. ref.pot je najčešće napravljen sa rgettext."
221
221
 
222
- #: ../lib/gettext/tools/msgmerge.rb:359
222
+ #: ../lib/gettext/tools/msgmerge.rb:364
223
223
  msgid "Update definition.po"
224
224
  msgstr ""
225
225
 
226
- #: ../lib/gettext/tools/msgmerge.rb:393 ../lib/gettext/tools/xgettext.rb:307
226
+ #: ../lib/gettext/tools/msgmerge.rb:398 ../lib/gettext/tools/xgettext.rb:307
227
227
  msgid "Preserve '#: FILENAME:LINE' lines"
228
228
  msgstr ""
229
229
 
230
- #: ../lib/gettext/tools/msgmerge.rb:415
230
+ #: ../lib/gettext/tools/msgmerge.rb:420
231
231
  msgid "Disable fuzzy matching"
232
232
  msgstr ""
233
233
 
234
- #: ../lib/gettext/tools/msgmerge.rb:416
234
+ #: ../lib/gettext/tools/msgmerge.rb:421
235
235
  msgid "(enable)"
236
236
  msgstr ""
237
237
 
238
- #: ../lib/gettext/tools/msgmerge.rb:431
238
+ #: ../lib/gettext/tools/msgmerge.rb:436
239
239
  #, fuzzy
240
240
  msgid "Display version information and exit"
241
241
  msgstr "prikaži informaciju o verziji i završi"