Translate/putty 0.69 (#17)

* 导入上一版本 0.66 汉化并调整 Signed-off-by: Larry Li <larryli@qq.com> * update date to 2017 Signed-off-by: Larry Li <larryli@qq.com> * disable vc _addcarry_u64 support Signed-off-by: Larry Li <larryli@qq.com> * adjust radio&checkbox height for chinese font, update something Signed-off-by: Larry Li <larryli@qq.com> * adjust PuTTYConfigBox height, update plink/pscp/psftp usage Signed-off-by: Larry Li <larryli@qq.com> * fix missing Signed-off-by: Larry Li <larryli@qq.com> * update version to 0.69, fix compile error Signed-off-by: Larry Li <larryli@qq.com> * 修正配置界面快捷键和主机密钥配置界面错误 Signed-off-by: Larry Li <larryli@qq.com> * 审查修正 Signed-off-by: Larry Li <larryli@qq.com> * 修正部分控件配置，调整菜单 Signed-off-by: Larry Li <larryli@qq.com>
larryli · May 4, 2017 · 8e37a5f · 8e37a5f
1 parent b1829b8
commit 8e37a5f
Show file tree

Hide file tree

Showing 34 changed files with 1,099 additions and 1,135 deletions.
diff --git a/LICENCE b/LICENCE
@@ -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 ��壬��������Ȩ����
diff --git a/cmdgen.c b/cmdgen.c
@@ -137,13 +137,13 @@ 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,
-		"Use \"puttygen --help\" for more detail.\n");
+		"使用 \"puttygen --help\" 了解更多帮助。\n");
 }
 
 void help(void)
@@ -152,34 +152,34 @@ void help(void)
      * Help message is an extended version of the usage message. So
      * start with that, plus a version heading.
      */
-    printf("PuTTYgen: key generator and converter for the PuTTY tools\n"
+    printf("PuTTYgen: PuTTY 密钥生成与转换工具\n"
 	   "%s\n", ver);
     usage(FALSE);
-    printf("  -t    specify key type when generating (ed25519, ecdsa, rsa, "
+    printf("  -t    指定生成的密钥类型 (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"
-	   "  -q    quiet: do not display progress bar\n"
-	   "  -O    specify output type:\n"
-	   "           private             output PuTTY private key format\n"
-	   "           private-openssh     export OpenSSH private key\n"
-	   "           private-openssh-new export OpenSSH private key "
-                                             "(force new format)\n"
-	   "           private-sshcom      export ssh.com private key\n"
-	   "           public              RFC 4716 / ssh.com public key\n"
-	   "           public-openssh      OpenSSH public key\n"
-	   "           fingerprint         output the key fingerprint\n"
-	   "  -o    specify output file\n"
-	   "  -l    equivalent to `-O fingerprint'\n"
-	   "  -L    equivalent to `-O public-openssh'\n"
-	   "  -p    equivalent to `-O public'\n"
-	   "  --old-passphrase file\n"
-	   "        specify file containing old key passphrase\n"
-	   "  --new-passphrase file\n"
-	   "        specify file containing new key passphrase\n"
-	   "  --random-device device\n"
-	   "        specify device to read entropy from (e.g. /dev/urandom)\n"
+	   "  -b    指定生成密钥的位数\n"
+	   "  -C    修改或指定密钥注释\n"
+	   "  -P    修改密钥密码\n"
+	   "  -q    静默: 不显示进度条\n"
+	   "  -O    指定输出类型:\n"
+	   "           private             输出 PuTTY 私钥格式\n"
+	   "           private-openssh     导出 OpenSSH 私钥格式\n"
+	   "           private-openssh-new 导出 OpenSSH 私钥格式 "
+                                             "(强制新格式)\n"
+	   "           private-sshcom      导出 ssh.com 私钥格式\n"
+	   "           public              RFC 4716 / ssh.com 公钥\n"
+	   "           public-openssh      OpenSSH 公钥\n"
+	   "           fingerprint         输出密钥指纹\n"
+	   "  -o    指定输出文件\n"
+	   "  -l    等价于 `-O fingerprint'\n"
+	   "  -L    等价于 `-O public-openssh'\n"
+	   "  -p    等价于 `-O public'\n"
+	   "  --old-passphrase 文件\n"
+	   "        指定包含旧密钥密码的文件\n"
+	   "  --new-passphrase 文件\n"
+	   "        指定包含新密钥密码的文件\n"
+	   "  --random-device 设备\n"
+	   "        指定用于读取熵的设备 (例如：/dev/urandom)\n"
 	   );
 }