Skip to content

Commit 923fae6

Browse files
authored
Merge pull request #80 from vim-jp/update-for-8.0.1780
Update for 8.0.1780
2 parents 961389e + 1ef1ad2 commit 923fae6

File tree

3 files changed

+66
-13
lines changed

3 files changed

+66
-13
lines changed

runtime/doc/xxd-ja.UTF-8.1

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@
7676
.RI < cols >
7777
オクテットで出力する。標準設定は 16 (\-i: 12, \-ps: 30, \-b: 6)。最大 256。
7878
.TP
79+
.IR \-C " | " \-capitalize
80+
\-i を使用した際に、C インクルードファイル形式の変数名を大文字にする。
81+
.TP
7982
.IR \-E " | " \-EBCDIC
8083
右端に出力される文字のエンコーディングを ASCII から EBCDIC に変更する。
8184
16 進ダンプの出力形式は変更されません。

runtime/doc/xxd.1

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ are all equivalent.
5757
.PP
5858
.TP
5959
.IR \-a " | " \-autoskip
60-
toggle autoskip: A single '*' replaces nul-lines. Default off.
60+
Toggle autoskip: A single '*' replaces nul-lines. Default off.
6161
.TP
6262
.IR \-b " | " \-bits
6363
Switch to bits (binary digits) dump, rather than hexdump.
@@ -67,10 +67,13 @@ followed by an ascii (or ebcdic) representation. The command line switches
6767
\-r, \-p, \-i do not work with this mode.
6868
.TP
6969
.IR "\-c cols " | " \-cols cols"
70-
format
70+
Format
7171
.RI < cols >
7272
octets per line. Default 16 (\-i: 12, \-ps: 30, \-b: 6). Max 256.
7373
.TP
74+
.IR \-C " | " \-capitalize
75+
Capitalize variable names in C include file style, when using \-i.
76+
.TP
7477
.IR \-E " | " \-EBCDIC
7578
Change the character encoding in the righthand column from ASCII to EBCDIC.
7679
This does not change the hexadecimal representation. The option is
@@ -87,7 +90,7 @@ The command line switches
8790
\-r, \-p, \-i do not work with this mode.
8891
.TP
8992
.IR "\-g bytes " | " \-groupsize bytes"
90-
separate the output of every
93+
Separate the output of every
9194
.RI < bytes >
9295
bytes (two hex characters or eight bit-digits each) by a whitespace.
9396
Specify
@@ -98,28 +101,28 @@ in normal mode, \fI4\fP in little-endian mode and \fI1\fP in bits mode.
98101
Grouping does not apply to postscript or include style.
99102
.TP
100103
.IR \-h " | " \-help
101-
print a summary of available commands and exit. No hex dumping is performed.
104+
Print a summary of available commands and exit. No hex dumping is performed.
102105
.TP
103106
.IR \-i " | " \-include
104-
output in C include file style. A complete static array definition is written
107+
Output in C include file style. A complete static array definition is written
105108
(named after the input file), unless xxd reads from stdin.
106109
.TP
107110
.IR "\-l len " | " \-len len"
108-
stop after writing
111+
Stop after writing
109112
.RI < len >
110113
octets.
111114
.TP
112115
.I \-o offset
113-
add
116+
Add
114117
.RI < offset >
115118
to the displayed file position.
116119
.TP
117120
.IR \-p " | " \-ps " | " \-postscript " | " \-plain
118-
output in postscript continuous hexdump style. Also known as plain hexdump
121+
Output in postscript continuous hexdump style. Also known as plain hexdump
119122
style.
120123
.TP
121124
.IR \-r " | " \-revert
122-
reverse operation: convert (or patch) hexdump into binary.
125+
Reverse operation: convert (or patch) hexdump into binary.
123126
If not writing to stdout, xxd writes into its output file without truncating
124127
it. Use the combination
125128
.I \-r \-p
@@ -135,7 +138,7 @@ revert with
135138
added to file positions found in hexdump.
136139
.TP
137140
.I \-s [+][\-]seek
138-
start at
141+
Start at
139142
.RI < seek >
140143
bytes abs. (or rel.) infile offset.
141144
\fI+ \fRindicates that the seek is relative to the current stdin file position
@@ -145,10 +148,10 @@ should be that many characters from the end of the input (or if combined with
145148
Without \-s option, xxd starts at the current file position.
146149
.TP
147150
.I \-u
148-
use upper case hex letters. Default is lower case.
151+
Use upper case hex letters. Default is lower case.
149152
.TP
150153
.IR \-v " | " \-version
151-
show version string.
154+
Show version string.
152155
.SH CAVEATS
153156
.PP
154157
.I xxd \-r

src/po/ja.po

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ msgid ""
1414
msgstr ""
1515
"Project-Id-Version: Vim 8.0\n"
1616
"Report-Msgid-Bugs-To: \n"
17-
"POT-Creation-Date: 2018-04-12 19:36+0900\n"
17+
"POT-Creation-Date: 2018-05-01 10:46+0900\n"
1818
"PO-Revision-Date: 2017-07-12 20:45+0900\n"
1919
"Last-Translator: MURAOKA Taro <[email protected]>\n"
2020
"Language-Team: vim-jp (https://github.com/vim-jp/lang-ja)\n"
@@ -5755,6 +5755,9 @@ msgstr "終了"
57555755
msgid "E953: File exists: %s"
57565756
msgstr "E953: ファイルは既に存在します: %s"
57575757

5758+
msgid "E955: Not a terminal buffer"
5759+
msgstr "E955: 端末バッファではありません"
5760+
57585761
msgid "new shell started\n"
57595762
msgstr "新しいシェルを起動します\n"
57605763

@@ -7029,3 +7032,47 @@ msgid ""
70297032
msgstr ""
70307033
"パスの設定に失敗しました: sys.path がリストではありません\n"
70317034
"すぐに vim.VIM_SPECIAL_PATH を sys.path に追加してください"
7035+
7036+
msgid ""
7037+
"Vim macro files (*.vim)\t*.vim\n"
7038+
"All Files (*.*)\t*.*\n"
7039+
msgstr ""
7040+
"Vimマクロファイル (*.vim)\t*.vim\n"
7041+
"すべてのファイル (*.*)\t*.*\n"
7042+
7043+
msgid "All Files (*.*)\t*.*\n"
7044+
msgstr "すべてのファイル (*.*)\t*.*\n"
7045+
7046+
msgid ""
7047+
"All Files (*.*)\t*.*\n"
7048+
"C source (*.c, *.h)\t*.c;*.h\n"
7049+
"C++ source (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
7050+
"VB code (*.bas, *.frm)\t*.bas;*.frm\n"
7051+
"Vim files (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
7052+
msgstr ""
7053+
"すべてのファイル (*.*)\t*.*\n"
7054+
"Cソース (*.c, *.h)\t*.c;*.h\n"
7055+
"C++ソース (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
7056+
"VBコード (*.bas, *.frm)\t*.bas;*.frm\n"
7057+
"Vimファイル (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
7058+
7059+
msgid ""
7060+
"Vim macro files (*.vim)\t*.vim\n"
7061+
"All Files (*)\t*\n"
7062+
msgstr ""
7063+
"Vim マクロファイル (*.vim)\t*.vim\n"
7064+
"すべてのファイル (*)\t*\n"
7065+
7066+
msgid "All Files (*)\t*\n"
7067+
msgstr "すべてのファイル (*)\t*\n"
7068+
7069+
msgid ""
7070+
"All Files (*)\t*\n"
7071+
"C source (*.c, *.h)\t*.c;*.h\n"
7072+
"C++ source (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
7073+
"Vim files (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
7074+
msgstr ""
7075+
"すべてのファイル (*)\t*\n"
7076+
"Cソース (*.c, *.h)\t*.c;*.h\n"
7077+
"C++ソース (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
7078+
"Vimファイル (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"

0 commit comments

Comments
 (0)