Skip to content

Commit

Permalink
Merge pull request #14 from larryli/translate/putty-0.68
Browse files Browse the repository at this point in the history
Translate PuTTY 0.68
  • Loading branch information
larryli authored Mar 29, 2017
2 parents 23fbc4f + 9ed91da commit 52072d9
Show file tree
Hide file tree
Showing 33 changed files with 1,054 additions and 1,092 deletions.
23 changes: 6 additions & 17 deletions LICENCE
Original file line number Diff line number Diff line change
@@ -1,25 +1,14 @@
PuTTY is copyright 1997-2017 Simon Tatham.

Portions copyright Robert de Bath, Joris van Rantwijk, Delian
���ְ�Ȩ���� Robert de Bath, Joris van Rantwijk, Delian
Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,
Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus
Kuhn, Colin Watson, Christopher Staite, and CORE SDI S.A.

Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation files
(the "Software"), to deal in the Software without restriction,
including without limitation the rights to use, copy, modify, merge,
publish, distribute, sublicense, and/or sell copies of the Software,
and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
�����Դ˷�ʽ�����κ��˿�����ѵõ������������Լ������ĵ��ļ� (""����"")���������⴦�������������������Ƶ�ʹ�á����ơ��޸ġ��ϲ������桢�ַ���ת�á���Ȩ��/�����������Ȩ�������������������������������ֻҪ�������������

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
���ϵİ�Ȩ˵��������˵��Ӧ�������ڸ������κβ��ֵ����п����С�

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE
FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
����������Ϊ "AS IS" �ṩ��û���κα�֤����ʾ��ʾ�������������������ԡ������ԺͲ���Ȩ�����κ���������߲����κ��������𻵻��������θ��������Ƿ����ں�ͬ��Ϊ����Ȩ�������κ����������ġ���������ػ��޹ص��Լ�������ʹ�á�

PuTTY ���İ�İ�Ȩ���� 2003-2017 ��壬��������Ȩ����
14 changes: 7 additions & 7 deletions cmdgen.c
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,9 @@ void showversion(void)
void usage(int standalone)
{
fprintf(standalone ? stderr : stdout,
"Usage: puttygen ( keyfile | -t type [ -b bits ] )\n"
" [ -C comment ] [ -P ] [ -q ]\n"
" [ -o output-keyfile ] [ -O type | -l | -L"
"用法: puttygen ( 密钥文件 | -t 类型 [ -b 位数 ] )\n"
" [ -C 注释 ] [ -P ] [ -q ]\n"
" [ -o 输出密钥文件 ] [ -O 类型 | -l | -L"
" | -p ]\n");
if (standalone)
fprintf(stderr,
Expand All @@ -157,11 +157,11 @@ void help(void)
usage(FALSE);
printf(" -t specify key type when generating (ed25519, ecdsa, rsa, "
"dsa, rsa1)\n"
" -b specify number of bits when generating key\n"
" -C change or specify key comment\n"
" -P change key passphrase\n"
" -b 指定生成密钥的位数\n"
" -C 修改或指定密钥注释\n"
" -P 修改密钥密码\n"
" -q quiet: do not display progress bar\n"
" -O specify output type:\n"
" -O 指定输出类型:\n"
" private output PuTTY private key format\n"
" private-openssh export OpenSSH private key\n"
" private-openssh-new export OpenSSH private key "
Expand Down
Loading

0 comments on commit 52072d9

Please sign in to comment.