Skip to content

Commit 3355c46

Browse files
hcmiyahcmiya
committed
オプションの説明の調整
・「編集入出力→タグ入出力」など ・-Dオプションの説明を刷新 ・英語の「エラーを返す」表現など
1 parent 4ff1357 commit 3355c46

File tree

8 files changed

+58
-37
lines changed

8 files changed

+58
-37
lines changed

‎nls/C/6.usage

+9-6
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ Options:\n\
2727
-i idx\n\
2828
Specify %2$s index for editing in multiplexed Ogg stream\n\
2929
(1-origin, without non-%2$s stream)\n\
30-
-R Assume editing IO to be encoded in UTF-8\n\
30+
-R Assume tag IO to be encoded in UTF-8\n\
3131
-e Use escape sequence; \\\\, \\n, \\r and \\0\n\
32-
-0 Use '\\0' separation for editing IO\n\
32+
-0 Use '\\0' separation for tag IO\n\
3333
-t NAME=VALUE\n\
34-
add the argument as editing item\n\
34+
add the argument as a tag\n\
3535
-c tagfile\n\
3636
In list mode, write tags to tagfile.\n\
3737
In append/write mode, read tags from tagfile\n\
@@ -40,9 +40,12 @@ Options:\n\
4040
When VALUE is omitted, All of NAME is removed. Implies -U\n\
4141
-p Supress editing for METADATA_BLOCK_PICTURE\n\
4242
-U Convert field name stored in srcfile to uppercase\n\
43-
-V Verify Tags stored in srcfile\n\
44-
-T Error when editing input is not terminated by line feed\n\
45-
-D Defer editing IO; implies -V, -T\n\
43+
-V Verify tags stored in srcfile\n\
44+
-T Return error when tag input is not terminated by line feed\n\
45+
-D In list mode, defer tag output until comment packet is built.\n\
46+
Implies -V.\n\
47+
In appent/write mode, return error when tag input is empty.\n\
48+
Implies -T\n\
4649
`
4750

4851
$ opus specific options

‎nls/C@l33t/6.usage

+8-5
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ $ %2$s = codec name, e.g. Opus, Theora, ...
2727
-i idx\n\
2828
5p3c1fy %2$s 1nd3x f0r 3d171n6 1n mul71pl3x3d 066 57r34m\n\
2929
(1-0r161n, w17h0u7 n0n-%2$s 57r34m)\n\
30-
-R 455um3 3d171n6 10 70 b3 3nc0d3d 1n u7f-8\n\
30+
-R 455um3 746 10 70 b3 3nc0d3d 1n u7f-8\n\
3131
-e u53 35c4p3 53qu3nc3; \\\\, \\n, \\r 4nd \\0\n\
32-
-0 Use '\\0' separation for editing IO\n\
32+
-0 u53 '\\0' 53p4r4710n f0r 746 10\n\
3333
-t NAME=VALUE\n\
34-
4dd 7h3 4r6um3n7 45 3d171n6 173m\n\
34+
4dd 7h3 4r6um3n7 45 4 746\n\
3535
-c tagfile\n\
3636
1n l157 m0d3, wr173 7465 70 "tagfile".\n\
3737
1n 4pp3nd/wr173 m0d3, r34d 7465 fr0m "tagfile"\n\
@@ -41,8 +41,11 @@ $ %2$s = codec name, e.g. Opus, Theora, ...
4141
-p 5upr355 3d171n6 f0r m374d474_bl0ck_p1c7ur3\n\
4242
-U c0nv3r7 f13ld n4m3 570r3d 1n "srcfile" 70 upp3rc453\n\
4343
-V v3r1fy 7465 570r3d 1n "srcfile"\n\
44-
-T 3rr0r wh3n 3d171n6 1npu7 15 n07 73rm1n473d by l1n3 f33d\n\
45-
-D d3f3r 3d171n6 10; 1mpl135 '-V', '-T'\n\
44+
-T r37urn 3rr0r wh3n 746 1npu7 15 n07 73rm1n473d by l1n3 f33d\n\
45+
-D 1n l157 m0d3, d3f3r 746 0u7pu7 un71l c0mm3n7 p4ck37 15 bu1l7.\n\
46+
1mpl135 -v.\n\
47+
1n 4pp3n7/wr173 m0d3, r37urn 3rr0r wh3n 746 1npu7 15 3mp7y.\n\
48+
1mpl135 -7\n\
4649
`
4750

4851
$ opus specific options

‎nls/en_US.ISO8859-1/6.usage

+9-6
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ Options:\n\
2727
-i idx\n\
2828
Specify %2$s index for editing in multiplexed Ogg stream\n\
2929
(1-origin, without non-%2$s stream)\n\
30-
-R Assume editing IO to be encoded in UTF-8\n\
30+
-R Assume tag IO to be encoded in UTF-8\n\
3131
-e Use escape sequence; \\\\, \\n, \\r and \\0\n\
32-
-0 Use '\\0' separation for editing IO\n\
32+
-0 Use '\\0' separation for tag IO\n\
3333
-t NAME=VALUE\n\
34-
add the argument as editing item\n\
34+
add the argument as a tag\n\
3535
-c tagfile\n\
3636
In list mode, write tags to tagfile.\n\
3737
In append/write mode, read tags from tagfile\n\
@@ -40,9 +40,12 @@ Options:\n\
4040
When VALUE is omitted, All of NAME is removed. Implies -U\n\
4141
-p Supress editing for METADATA_BLOCK_PICTURE\n\
4242
-U Convert field name stored in srcfile to uppercase\n\
43-
-V Verify Tags stored in srcfile\n\
44-
-T Error when editing input is not terminated by line feed\n\
45-
-D Defer editing IO; implies -V, -T\n\
43+
-V Verify tags stored in srcfile\n\
44+
-T Return error when tag input is not terminated by line feed\n\
45+
-D In list mode, defer tag output until comment packet is built.\n\
46+
Implies -V.\n\
47+
In appent/write mode, return error when tag input is empty.\n\
48+
Implies -T\n\
4649
`
4750

4851
$ opus specific options

‎nls/en_US.UTF-8/6.usage

+9-6
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ Options:\n\
2727
-i idx\n\
2828
Specify %2$s index for editing in multiplexed Ogg stream\n\
2929
(1-origin, without non-%2$s stream)\n\
30-
-R Assume editing IO to be encoded in UTF-8\n\
30+
-R Assume tag IO to be encoded in UTF-8\n\
3131
-e Use escape sequence; \\\\, \\n, \\r and \\0\n\
32-
-0 Use '\\0' separation for editing IO\n\
32+
-0 Use '\\0' separation for tag IO\n\
3333
-t NAME=VALUE\n\
34-
add the argument as editing item\n\
34+
add the argument as a tag\n\
3535
-c tagfile\n\
3636
In list mode, write tags to tagfile.\n\
3737
In append/write mode, read tags from tagfile\n\
@@ -40,9 +40,12 @@ Options:\n\
4040
When VALUE is omitted, All of NAME is removed. Implies -U\n\
4141
-p Supress editing for METADATA_BLOCK_PICTURE\n\
4242
-U Convert field name stored in srcfile to uppercase\n\
43-
-V Verify Tags stored in srcfile\n\
44-
-T Error when editing input is not terminated by line feed\n\
45-
-D Defer editing IO; implies -V, -T\n\
43+
-V Verify tags stored in srcfile\n\
44+
-T Return error when tag input is not terminated by line feed\n\
45+
-D In list mode, defer tag output until comment packet is built.\n\
46+
Implies -V.\n\
47+
In appent/write mode, return error when tag input is empty.\n\
48+
Implies -T\n\
4649
`
4750

4851
$ opus specific options

‎nls/ja_JP.UTF-8/6.usage

+6-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ $ %2$s = コーデック名。Opus、Theora等
3030
-R タグ入出力の文字符号化方式をUTF-8として扱う\n\
3131
-e バックスラッシュ、改行、復帰、ヌルにそれぞれ\n\
3232
\\\\, \\n, \\r, \\0のエスケープを使用する\n\
33-
-0 編集入出力に'\\0'区切りを使う\n\
33+
-0 タグ入出力に'\\0'区切りを使う\n\
3434
-t NAME=VALUE\n\
3535
引数をタグとして追加する\n\
3636
-c tagfile\n\
@@ -42,8 +42,11 @@ $ %2$s = コーデック名。Opus、Theora等
4242
-p METADATA_BLOCK_PICTUREの出力または削除をしない\n\
4343
-U srcfile内のタグの項目名を大文字に変換する\n\
4444
-V srcfile内のタグに対して書式の正当性を検証する\n\
45-
-T 編集入力が改行で終わっていない場合エラーにする\n\
46-
-D 編集入出力を遅延させる。-V、-Tを暗黙的に指定する\n\
45+
-T タグ入力が改行で終わっていない場合エラーにする\n\
46+
-D 出力モード時、コメントパケットのパースが完了するまでタグ出力を\n\
47+
遅延させる。-Vを暗黙的に指定する。\n\
48+
追記・書き込みモード時、タグ入力が空の時にエラーにする。\n\
49+
-Tを暗黙的に指定する\n\
4750
`
4851

4952
$ Opus固有のオプション

‎nls/ja_JP.eucJP/6.usage

+6-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ $ %2$s =
3030
-R ���������Ϥ�ʸ����沽������UTF-8�Ȥ��ư���\n\
3131
-e �Хå�����å��塢���ԡ��������̥�ˤ��줾��\n\
3232
\\\\, \\n, \\r, \\0�Υ��������פ���Ѥ���\n\
33-
-0 �Խ������Ϥ�'\\0'���ڤ��Ȥ�\n\
33+
-0 ���������Ϥ�'\\0'���ڤ��Ȥ�\n\
3434
-t NAME=VALUE\n\
3535
�����򥿥��Ȥ����ɲä���\n\
3636
-c tagfile\n\
@@ -42,8 +42,11 @@ $ %2$s =
4242
-p METADATA_BLOCK_PICTURE�ν��Ϥޤ��Ϻ���򤷤ʤ�\n\
4343
-U srcfile��Υ����ι���̾����ʸ�����Ѵ�����\n\
4444
-V srcfile��Υ������Ф��ƽ񼰤��������򸡾ڤ���\n\
45-
-T �Խ����Ϥ����Ԥǽ���äƤ��ʤ���票�顼�ˤ���\n\
46-
-D �Խ������Ϥ��ٱ䤵���롣-V��-T�����Ū�˻��ꤹ��\n\
45+
-T �������Ϥ����Ԥǽ���äƤ��ʤ���票�顼�ˤ���\n\
46+
-D ���ϥ⡼�ɻ��������ȥѥ��åȤΥѡ�������λ����ޤǥ������Ϥ�\n\
47+
�ٱ䤵���롣-V�����Ū�˻��ꤹ�롣\n\
48+
�ɵ����񤭹��ߥ⡼�ɻ����������Ϥ����λ��˥��顼�ˤ��롣\n\
49+
-T�����Ū�˻��ꤹ��\n\
4750
`
4851

4952
$ Opus��ͭ�Υ��ץ����

‎src/main.c

+9-6
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ static void usage(void) {
4646
" -i idx\n"
4747
" Specify %2$s index for editing in multiplexed Ogg stream\n"
4848
" (1-origin, without non-%2$s stream)\n"
49-
" -R Assume editing IO to be encoded in UTF-8\n"
49+
" -R Assume tag IO to be encoded in UTF-8\n"
5050
" -e Use escape sequence; \\\\, \\n, \\r and \\0\n"
51-
" -0 Use '\\0' separation for editing IO\n"
51+
" -0 Use '\\0' separation for tag IO\n"
5252
" -t NAME=VALUE\n"
53-
" Add the argument as editing item\n"
53+
" Add the argument as a tag\n"
5454
" -c tagfile\n"
5555
" In list mode, write tags to tagfile.\n"
5656
" In append/write mode, read tags from tagfile.\n"
@@ -59,9 +59,12 @@ static void usage(void) {
5959
" When VALUE is omitted, All of NAME is removed. Implies -U\n"
6060
" -p Supress editing for METADATA_BLOCK_PICTURE\n"
6161
" -U Convert field name stored in srcfile to uppercase\n"
62-
" -V Verify Tags stored in srcfile\n"
63-
" -T Error when editing input is not terminated by line feed\n"
64-
" -D Defer editing IO; implies -V, -T\n"
62+
" -V Verify tags stored in srcfile\n"
63+
" -T Return error when tag input is not terminated by line feed\n"
64+
" -D In list mode, defer tag output until comment packet is built.\n"
65+
" Implies -V.\n"
66+
" In appent/write mode, return error when tag input is empty.\n"
67+
" Implies -T\n"
6568
), program_name, default_codec->name);
6669
if (!default_codec->prog) {
6770
fprintf(stderr, catgets(catd, 6, 5,

‎src/version.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#define OPUSCOMMENT_VERSION "1.5.4"
1+
#define OPUSCOMMENT_VERSION "1.5.5"
22

33
#define OPUSCOMMENT_REVISION_YEAR (2019 - 1900)
44
#define OPUSCOMMENT_REVISION_MONTH (5 - 1)
5-
#define OPUSCOMMENT_REVISION_DAY 25
5+
#define OPUSCOMMENT_REVISION_DAY 28

0 commit comments

Comments
 (0)