gettext 3.1.9 → 3.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/doc/text/news.md +6 -0
- data/lib/gettext/tools/msgmerge.rb +5 -0
- data/lib/gettext/version.rb +1 -1
- data/po/bg/gettext.edit.po +18 -18
- data/po/bs/gettext.edit.po +18 -18
- data/po/ca/gettext.edit.po +18 -18
- data/po/cs/gettext.edit.po +18 -18
- data/po/de/gettext.edit.po +18 -18
- data/po/el/gettext.edit.po +18 -18
- data/po/eo/gettext.edit.po +18 -18
- data/po/es/gettext.edit.po +18 -18
- data/po/et/gettext.edit.po +18 -18
- data/po/fr/gettext.edit.po +18 -18
- data/po/gettext.pot +21 -21
- data/po/hr/gettext.edit.po +18 -18
- data/po/hu/gettext.edit.po +18 -18
- data/po/it/gettext.edit.po +18 -18
- data/po/ja/gettext.edit.po +18 -18
- data/po/ko/gettext.edit.po +18 -18
- data/po/lv/gettext.edit.po +18 -18
- data/po/nb/gettext.edit.po +18 -18
- data/po/nl/gettext.edit.po +18 -18
- data/po/pt_BR/gettext.edit.po +18 -18
- data/po/ru/gettext.edit.po +18 -18
- data/po/sr/gettext.edit.po +18 -18
- data/po/sv/gettext.edit.po +18 -18
- data/po/uk/gettext.edit.po +18 -18
- data/po/vi/gettext.edit.po +18 -18
- data/po/zh/gettext.edit.po +18 -18
- data/po/zh_TW/gettext.edit.po +18 -18
- data/test/tools/test_msgmerge.rb +39 -27
- metadata +14 -14
data/po/sr/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:
|
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 "Посебне опције:"
|
44
44
|
|
45
|
-
#: ../lib/gettext/tools/msgcat.rb:214 ../lib/gettext/tools/msgmerge.rb:
|
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 "писање излаза у задат фајл"
|
@@ -51,23 +51,23 @@ msgstr "писање излаза у задат фајл"
|
|
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:
|
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:
|
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:
|
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:
|
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:
|
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:
|
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:
|
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:
|
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:
|
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:
|
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:
|
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 "Спаја заједно два униформна .po фајла. def.po фајл је постојећи PO фајл са преводима. Ref.pot фајл је последње креиран PO фајл са текућим изворним референцама. Ref.pot се обично креира помоћу rgettext-а."
|
222
222
|
|
223
|
-
#: ../lib/gettext/tools/msgmerge.rb:
|
223
|
+
#: ../lib/gettext/tools/msgmerge.rb:364
|
224
224
|
msgid "Update definition.po"
|
225
225
|
msgstr ""
|
226
226
|
|
227
|
-
#: ../lib/gettext/tools/msgmerge.rb:
|
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:
|
231
|
+
#: ../lib/gettext/tools/msgmerge.rb:420
|
232
232
|
msgid "Disable fuzzy matching"
|
233
233
|
msgstr ""
|
234
234
|
|
235
|
-
#: ../lib/gettext/tools/msgmerge.rb:
|
235
|
+
#: ../lib/gettext/tools/msgmerge.rb:421
|
236
236
|
msgid "(enable)"
|
237
237
|
msgstr ""
|
238
238
|
|
239
|
-
#: ../lib/gettext/tools/msgmerge.rb:
|
239
|
+
#: ../lib/gettext/tools/msgmerge.rb:436
|
240
240
|
#, fuzzy
|
241
241
|
msgid "Display version information and exit"
|
242
242
|
msgstr "приказ информација о верзији и излаз"
|
data/po/sv/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:211 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:
|
38
|
+
#: ../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
|
39
39
|
msgid "Specific options:"
|
40
40
|
msgstr ""
|
41
41
|
|
42
|
-
#: ../lib/gettext/tools/msgcat.rb:214 ../lib/gettext/tools/msgmerge.rb:
|
42
|
+
#: ../lib/gettext/tools/msgcat.rb:214 ../lib/gettext/tools/msgmerge.rb:369
|
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:220 ../lib/gettext/tools/msgcat.rb:237 ../lib/gettext/tools/msgmerge.rb:
|
50
|
+
#: ../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
|
51
51
|
msgid "Sort output by msgid"
|
52
52
|
msgstr ""
|
53
53
|
|
54
|
-
#: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgcat.rb:230 ../lib/gettext/tools/msgmerge.rb:
|
54
|
+
#: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgcat.rb:230 ../lib/gettext/tools/msgmerge.rb:381 ../lib/gettext/tools/msgmerge.rb:388
|
55
55
|
msgid "Sort output by location"
|
56
56
|
msgstr ""
|
57
57
|
|
58
|
-
#: ../lib/gettext/tools/msgcat.rb:231 ../lib/gettext/tools/msgmerge.rb:
|
58
|
+
#: ../lib/gettext/tools/msgcat.rb:231 ../lib/gettext/tools/msgmerge.rb:382
|
59
59
|
msgid "It is same as --sort-by-location"
|
60
60
|
msgstr ""
|
61
61
|
|
62
|
-
#: ../lib/gettext/tools/msgcat.rb:232 ../lib/gettext/tools/msgcat.rb:239 ../lib/gettext/tools/msgmerge.rb:
|
62
|
+
#: ../lib/gettext/tools/msgcat.rb:232 ../lib/gettext/tools/msgcat.rb:239 ../lib/gettext/tools/msgmerge.rb:376 ../lib/gettext/tools/msgmerge.rb:383
|
63
63
|
msgid "Just for GNU gettext's msgcat compatibility"
|
64
64
|
msgstr ""
|
65
65
|
|
66
|
-
#: ../lib/gettext/tools/msgcat.rb:238 ../lib/gettext/tools/msgmerge.rb:
|
66
|
+
#: ../lib/gettext/tools/msgcat.rb:238 ../lib/gettext/tools/msgmerge.rb:375
|
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:274 ../lib/gettext/tools/msgmerge.rb:
|
94
|
+
#: ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:403 ../lib/gettext/tools/xgettext.rb:312
|
95
95
|
msgid "Set output page width"
|
96
96
|
msgstr ""
|
97
97
|
|
98
|
-
#: ../lib/gettext/tools/msgcat.rb:280 ../lib/gettext/tools/msgmerge.rb:
|
98
|
+
#: ../lib/gettext/tools/msgcat.rb:280 ../lib/gettext/tools/msgmerge.rb:409 ../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
|
|
@@ -107,7 +107,7 @@ msgstr ""
|
|
107
107
|
msgid "Don't report warning messages"
|
108
108
|
msgstr ""
|
109
109
|
|
110
|
-
#: ../lib/gettext/tools/msgcat.rb:301 ../lib/gettext/tools/msgmerge.rb:
|
110
|
+
#: ../lib/gettext/tools/msgcat.rb:301 ../lib/gettext/tools/msgmerge.rb:426
|
111
111
|
msgid "Don't output obsolete entries"
|
112
112
|
msgstr ""
|
113
113
|
|
@@ -171,7 +171,7 @@ msgstr ""
|
|
171
171
|
msgid "Use EMAIL as translator email address"
|
172
172
|
msgstr ""
|
173
173
|
|
174
|
-
#: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:
|
174
|
+
#: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:430
|
175
175
|
msgid "Display this help and exit"
|
176
176
|
msgstr ""
|
177
177
|
|
@@ -203,31 +203,31 @@ msgstr ""
|
|
203
203
|
msgid "Please enter your email address"
|
204
204
|
msgstr ""
|
205
205
|
|
206
|
-
#: ../lib/gettext/tools/msgmerge.rb:
|
206
|
+
#: ../lib/gettext/tools/msgmerge.rb:350
|
207
207
|
msgid "Usage: %s [OPTIONS] definition.po reference.pot"
|
208
208
|
msgstr ""
|
209
209
|
|
210
|
-
#: ../lib/gettext/tools/msgmerge.rb:
|
210
|
+
#: ../lib/gettext/tools/msgmerge.rb:353
|
211
211
|
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."
|
212
212
|
msgstr ""
|
213
213
|
|
214
|
-
#: ../lib/gettext/tools/msgmerge.rb:
|
214
|
+
#: ../lib/gettext/tools/msgmerge.rb:364
|
215
215
|
msgid "Update definition.po"
|
216
216
|
msgstr ""
|
217
217
|
|
218
|
-
#: ../lib/gettext/tools/msgmerge.rb:
|
218
|
+
#: ../lib/gettext/tools/msgmerge.rb:398 ../lib/gettext/tools/xgettext.rb:307
|
219
219
|
msgid "Preserve '#: FILENAME:LINE' lines"
|
220
220
|
msgstr ""
|
221
221
|
|
222
|
-
#: ../lib/gettext/tools/msgmerge.rb:
|
222
|
+
#: ../lib/gettext/tools/msgmerge.rb:420
|
223
223
|
msgid "Disable fuzzy matching"
|
224
224
|
msgstr ""
|
225
225
|
|
226
|
-
#: ../lib/gettext/tools/msgmerge.rb:
|
226
|
+
#: ../lib/gettext/tools/msgmerge.rb:421
|
227
227
|
msgid "(enable)"
|
228
228
|
msgstr ""
|
229
229
|
|
230
|
-
#: ../lib/gettext/tools/msgmerge.rb:
|
230
|
+
#: ../lib/gettext/tools/msgmerge.rb:436
|
231
231
|
msgid "Display version information and exit"
|
232
232
|
msgstr ""
|
233
233
|
|
data/po/uk/gettext.edit.po
CHANGED
@@ -41,11 +41,11 @@ msgstr ""
|
|
41
41
|
msgid "Concatenates and merges PO files."
|
42
42
|
msgstr ""
|
43
43
|
|
44
|
-
#: ../lib/gettext/tools/msgcat.rb:211 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:
|
44
|
+
#: ../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
|
45
45
|
msgid "Specific options:"
|
46
46
|
msgstr "Додаткові параметри:"
|
47
47
|
|
48
|
-
#: ../lib/gettext/tools/msgcat.rb:214 ../lib/gettext/tools/msgmerge.rb:
|
48
|
+
#: ../lib/gettext/tools/msgcat.rb:214 ../lib/gettext/tools/msgmerge.rb:369
|
49
49
|
#, fuzzy
|
50
50
|
msgid "Write output to specified file"
|
51
51
|
msgstr "записати результат у вказаний файл"
|
@@ -54,23 +54,23 @@ msgstr "записати результат у вказаний файл"
|
|
54
54
|
msgid "(default: the standard output)"
|
55
55
|
msgstr ""
|
56
56
|
|
57
|
-
#: ../lib/gettext/tools/msgcat.rb:220 ../lib/gettext/tools/msgcat.rb:237 ../lib/gettext/tools/msgmerge.rb:
|
57
|
+
#: ../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
|
58
58
|
msgid "Sort output by msgid"
|
59
59
|
msgstr ""
|
60
60
|
|
61
|
-
#: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgcat.rb:230 ../lib/gettext/tools/msgmerge.rb:
|
61
|
+
#: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgcat.rb:230 ../lib/gettext/tools/msgmerge.rb:381 ../lib/gettext/tools/msgmerge.rb:388
|
62
62
|
msgid "Sort output by location"
|
63
63
|
msgstr ""
|
64
64
|
|
65
|
-
#: ../lib/gettext/tools/msgcat.rb:231 ../lib/gettext/tools/msgmerge.rb:
|
65
|
+
#: ../lib/gettext/tools/msgcat.rb:231 ../lib/gettext/tools/msgmerge.rb:382
|
66
66
|
msgid "It is same as --sort-by-location"
|
67
67
|
msgstr ""
|
68
68
|
|
69
|
-
#: ../lib/gettext/tools/msgcat.rb:232 ../lib/gettext/tools/msgcat.rb:239 ../lib/gettext/tools/msgmerge.rb:
|
69
|
+
#: ../lib/gettext/tools/msgcat.rb:232 ../lib/gettext/tools/msgcat.rb:239 ../lib/gettext/tools/msgmerge.rb:376 ../lib/gettext/tools/msgmerge.rb:383
|
70
70
|
msgid "Just for GNU gettext's msgcat compatibility"
|
71
71
|
msgstr ""
|
72
72
|
|
73
|
-
#: ../lib/gettext/tools/msgcat.rb:238 ../lib/gettext/tools/msgmerge.rb:
|
73
|
+
#: ../lib/gettext/tools/msgcat.rb:238 ../lib/gettext/tools/msgmerge.rb:375
|
74
74
|
msgid "It is same as --sort-by-msgid"
|
75
75
|
msgstr ""
|
76
76
|
|
@@ -98,11 +98,11 @@ msgstr ""
|
|
98
98
|
msgid "Remove all comments"
|
99
99
|
msgstr ""
|
100
100
|
|
101
|
-
#: ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:
|
101
|
+
#: ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:403 ../lib/gettext/tools/xgettext.rb:312
|
102
102
|
msgid "Set output page width"
|
103
103
|
msgstr ""
|
104
104
|
|
105
|
-
#: ../lib/gettext/tools/msgcat.rb:280 ../lib/gettext/tools/msgmerge.rb:
|
105
|
+
#: ../lib/gettext/tools/msgcat.rb:280 ../lib/gettext/tools/msgmerge.rb:409 ../lib/gettext/tools/xgettext.rb:318
|
106
106
|
msgid "Break long message lines, longer than the output page width, into several lines"
|
107
107
|
msgstr ""
|
108
108
|
|
@@ -114,7 +114,7 @@ msgstr ""
|
|
114
114
|
msgid "Don't report warning messages"
|
115
115
|
msgstr ""
|
116
116
|
|
117
|
-
#: ../lib/gettext/tools/msgcat.rb:301 ../lib/gettext/tools/msgmerge.rb:
|
117
|
+
#: ../lib/gettext/tools/msgcat.rb:301 ../lib/gettext/tools/msgmerge.rb:426
|
118
118
|
msgid "Don't output obsolete entries"
|
119
119
|
msgstr ""
|
120
120
|
|
@@ -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:
|
182
|
+
#: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:430
|
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:
|
217
|
+
#: ../lib/gettext/tools/msgmerge.rb:350
|
218
218
|
msgid "Usage: %s [OPTIONS] definition.po reference.pot"
|
219
219
|
msgstr ""
|
220
220
|
|
221
|
-
#: ../lib/gettext/tools/msgmerge.rb:
|
221
|
+
#: ../lib/gettext/tools/msgmerge.rb:353
|
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 "Об'єднує файли .po Uniforum формату. В файлі def.po зберігаються уже перекладені стрічки. Файл ref.pot є оновленою версією PO файлу із вихідних текстів і не містить перекладів. ref.pot зазвичай створюють за допомогою програми rgettext."
|
225
225
|
|
226
|
-
#: ../lib/gettext/tools/msgmerge.rb:
|
226
|
+
#: ../lib/gettext/tools/msgmerge.rb:364
|
227
227
|
msgid "Update definition.po"
|
228
228
|
msgstr ""
|
229
229
|
|
230
|
-
#: ../lib/gettext/tools/msgmerge.rb:
|
230
|
+
#: ../lib/gettext/tools/msgmerge.rb:398 ../lib/gettext/tools/xgettext.rb:307
|
231
231
|
msgid "Preserve '#: FILENAME:LINE' lines"
|
232
232
|
msgstr ""
|
233
233
|
|
234
|
-
#: ../lib/gettext/tools/msgmerge.rb:
|
234
|
+
#: ../lib/gettext/tools/msgmerge.rb:420
|
235
235
|
msgid "Disable fuzzy matching"
|
236
236
|
msgstr ""
|
237
237
|
|
238
|
-
#: ../lib/gettext/tools/msgmerge.rb:
|
238
|
+
#: ../lib/gettext/tools/msgmerge.rb:421
|
239
239
|
msgid "(enable)"
|
240
240
|
msgstr ""
|
241
241
|
|
242
|
-
#: ../lib/gettext/tools/msgmerge.rb:
|
242
|
+
#: ../lib/gettext/tools/msgmerge.rb:436
|
243
243
|
#, fuzzy
|
244
244
|
msgid "Display version information and exit"
|
245
245
|
msgstr "показати інформацію про версію і завершити роботу"
|
data/po/vi/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:
|
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 "Tùy chọn cụ thể:"
|
43
43
|
|
44
|
-
#: ../lib/gettext/tools/msgcat.rb:214 ../lib/gettext/tools/msgmerge.rb:
|
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 "ghi ra tập tin được chỉ định"
|
@@ -50,23 +50,23 @@ msgstr "ghi ra tập tin được chỉ định"
|
|
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:
|
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:
|
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:
|
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:
|
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:
|
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:
|
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:
|
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:
|
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:
|
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:
|
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:
|
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 "Trộn hai tập tin .po kiểu Uniforum. Tập tin def.po là tập tin đã tồn tại PO có chứa lời dịch. Tập tin ref.pot là tập tin PO được tạo ra lần trước có chứa tham chiếu mới nhất. ref.pot thường do rgettext tạo ra."
|
221
221
|
|
222
|
-
#: ../lib/gettext/tools/msgmerge.rb:
|
222
|
+
#: ../lib/gettext/tools/msgmerge.rb:364
|
223
223
|
msgid "Update definition.po"
|
224
224
|
msgstr ""
|
225
225
|
|
226
|
-
#: ../lib/gettext/tools/msgmerge.rb:
|
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:
|
230
|
+
#: ../lib/gettext/tools/msgmerge.rb:420
|
231
231
|
msgid "Disable fuzzy matching"
|
232
232
|
msgstr ""
|
233
233
|
|
234
|
-
#: ../lib/gettext/tools/msgmerge.rb:
|
234
|
+
#: ../lib/gettext/tools/msgmerge.rb:421
|
235
235
|
msgid "(enable)"
|
236
236
|
msgstr ""
|
237
237
|
|
238
|
-
#: ../lib/gettext/tools/msgmerge.rb:
|
238
|
+
#: ../lib/gettext/tools/msgmerge.rb:436
|
239
239
|
#, fuzzy
|
240
240
|
msgid "Display version information and exit"
|
241
241
|
msgstr "hiện thông tin về phiên bản rồi thoát"
|
data/po/zh/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:211 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:
|
43
|
+
#: ../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
|
44
44
|
msgid "Specific options:"
|
45
45
|
msgstr "具体选项:"
|
46
46
|
|
47
|
-
#: ../lib/gettext/tools/msgcat.rb:214 ../lib/gettext/tools/msgmerge.rb:
|
47
|
+
#: ../lib/gettext/tools/msgcat.rb:214 ../lib/gettext/tools/msgmerge.rb:369
|
48
48
|
#, fuzzy
|
49
49
|
msgid "Write output to specified file"
|
50
50
|
msgstr "输出到指定文件"
|
@@ -53,23 +53,23 @@ msgstr "输出到指定文件"
|
|
53
53
|
msgid "(default: the standard output)"
|
54
54
|
msgstr ""
|
55
55
|
|
56
|
-
#: ../lib/gettext/tools/msgcat.rb:220 ../lib/gettext/tools/msgcat.rb:237 ../lib/gettext/tools/msgmerge.rb:
|
56
|
+
#: ../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
|
57
57
|
msgid "Sort output by msgid"
|
58
58
|
msgstr ""
|
59
59
|
|
60
|
-
#: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgcat.rb:230 ../lib/gettext/tools/msgmerge.rb:
|
60
|
+
#: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgcat.rb:230 ../lib/gettext/tools/msgmerge.rb:381 ../lib/gettext/tools/msgmerge.rb:388
|
61
61
|
msgid "Sort output by location"
|
62
62
|
msgstr ""
|
63
63
|
|
64
|
-
#: ../lib/gettext/tools/msgcat.rb:231 ../lib/gettext/tools/msgmerge.rb:
|
64
|
+
#: ../lib/gettext/tools/msgcat.rb:231 ../lib/gettext/tools/msgmerge.rb:382
|
65
65
|
msgid "It is same as --sort-by-location"
|
66
66
|
msgstr ""
|
67
67
|
|
68
|
-
#: ../lib/gettext/tools/msgcat.rb:232 ../lib/gettext/tools/msgcat.rb:239 ../lib/gettext/tools/msgmerge.rb:
|
68
|
+
#: ../lib/gettext/tools/msgcat.rb:232 ../lib/gettext/tools/msgcat.rb:239 ../lib/gettext/tools/msgmerge.rb:376 ../lib/gettext/tools/msgmerge.rb:383
|
69
69
|
msgid "Just for GNU gettext's msgcat compatibility"
|
70
70
|
msgstr ""
|
71
71
|
|
72
|
-
#: ../lib/gettext/tools/msgcat.rb:238 ../lib/gettext/tools/msgmerge.rb:
|
72
|
+
#: ../lib/gettext/tools/msgcat.rb:238 ../lib/gettext/tools/msgmerge.rb:375
|
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:274 ../lib/gettext/tools/msgmerge.rb:
|
100
|
+
#: ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:403 ../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:
|
104
|
+
#: ../lib/gettext/tools/msgcat.rb:280 ../lib/gettext/tools/msgmerge.rb:409 ../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
|
|
@@ -113,7 +113,7 @@ msgstr ""
|
|
113
113
|
msgid "Don't report warning messages"
|
114
114
|
msgstr ""
|
115
115
|
|
116
|
-
#: ../lib/gettext/tools/msgcat.rb:301 ../lib/gettext/tools/msgmerge.rb:
|
116
|
+
#: ../lib/gettext/tools/msgcat.rb:301 ../lib/gettext/tools/msgmerge.rb:426
|
117
117
|
msgid "Don't output obsolete entries"
|
118
118
|
msgstr ""
|
119
119
|
|
@@ -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:
|
181
|
+
#: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:430
|
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:
|
216
|
+
#: ../lib/gettext/tools/msgmerge.rb:350
|
217
217
|
msgid "Usage: %s [OPTIONS] definition.po reference.pot"
|
218
218
|
msgstr ""
|
219
219
|
|
220
|
-
#: ../lib/gettext/tools/msgmerge.rb:
|
220
|
+
#: ../lib/gettext/tools/msgmerge.rb:353
|
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 "合并两个同样形式的 po 文件, def.po 是原來有翻译的文件,ref.pot 是经过原始码更新过的新文件,ref.pot 一般是由 rgettext 建立的。"
|
224
224
|
|
225
|
-
#: ../lib/gettext/tools/msgmerge.rb:
|
225
|
+
#: ../lib/gettext/tools/msgmerge.rb:364
|
226
226
|
msgid "Update definition.po"
|
227
227
|
msgstr ""
|
228
228
|
|
229
|
-
#: ../lib/gettext/tools/msgmerge.rb:
|
229
|
+
#: ../lib/gettext/tools/msgmerge.rb:398 ../lib/gettext/tools/xgettext.rb:307
|
230
230
|
msgid "Preserve '#: FILENAME:LINE' lines"
|
231
231
|
msgstr ""
|
232
232
|
|
233
|
-
#: ../lib/gettext/tools/msgmerge.rb:
|
233
|
+
#: ../lib/gettext/tools/msgmerge.rb:420
|
234
234
|
msgid "Disable fuzzy matching"
|
235
235
|
msgstr ""
|
236
236
|
|
237
|
-
#: ../lib/gettext/tools/msgmerge.rb:
|
237
|
+
#: ../lib/gettext/tools/msgmerge.rb:421
|
238
238
|
msgid "(enable)"
|
239
239
|
msgstr ""
|
240
240
|
|
241
|
-
#: ../lib/gettext/tools/msgmerge.rb:
|
241
|
+
#: ../lib/gettext/tools/msgmerge.rb:436
|
242
242
|
#, fuzzy
|
243
243
|
msgid "Display version information and exit"
|
244
244
|
msgstr "显示版本信息并退出"
|