Prechádzať zdrojové kódy

Merge branch 'master' into dev

# Conflicts:
#	dotnet/Properties/AssemblyInfo.cs
#	source/WinSCP.cbproj

Source commit: 89caff63937711bf606f0534222e2c34ca1207f9
Martin Prikryl 6 rokov pred
rodič
commit
97ccd5dd0c
2 zmenil súbory, kde vykonal 16 pridanie a 16 odobranie
  1. 15 15
      translations/CHS.ini
  2. 1 1
      translations/version.ini

+ 15 - 15
translations/CHS.ini

@@ -2183,9 +2183,9 @@ MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.Caption="拖拽下载
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtEnabledLabel.Caption="允许直接下载到一般本地目录(e.g. Window Explorer)。不允许下载到其他目标(ZIP文件,FTP等)"
 ; "Allows downloads to any destinations (regular folders, ZIP archives,  FTP, etc.). Files are downloaded first to temporary folder, from where they are delivered to the destination."
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtDisabledLabel.Caption="允许下载到任何目标(一般目录,ZIP文件,FTP等)。文件首先下载到临时目录,然后再放到目标中。"
-; "Use &shell extension"
+; "Determine drop target by dragging a &fake file"
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtEnabledButton.Caption="使用Shell扩展(&S)"
-; "Use &temporary folder"
+; "Download files via &temporary folder"
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtDisabledButton.Caption="使用临时目录(&T)"
 ; "&Warn when there is not enough free space"
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtDisabledPanel.DDWarnLackOfTempSpaceCheck.Caption="当没有足够空间时警告(&W)"
@@ -3317,7 +3317,7 @@ OptionsGroup.SynchronizeExistingOnlyCheck.Caption="只对现有文件(&E)"
 ; "Update s&ubdirectories"
 OptionsGroup.SynchronizeRecursiveCheck.Caption="更新子目录(&U)"
 ; "Synchronize on s&tart"
-OptionsGroup.SynchronizeSynchronizeCheck.Caption="启动时同步(&T)"
+OptionsGroup.SynchronizeSynchronizeCheck.Caption="开始时同步(&T)"
 ; "Selected files o&nly"
 OptionsGroup.SynchronizeSelectedOnlyCheck.Caption="只对选中文件(&E)"
 ; "Continue on &error"
@@ -4659,7 +4659,7 @@ EXIT_ON_COMPLETION="%%s\n\n是否关闭程序?"
 DISCONNECT_ON_COMPLETION="%%s\n\n是否终止%d个现有会话并关闭程序?"
 ; "**There are still some background transfers in queue. Do you want to disconnect anyway?**\n \nWarning: Pressing 'OK' will terminate all transfers immediately."
 PENDING_QUEUE_ITEMS2="**队列中仍有一些后台传输。是否断开连接?**\n \n警告:按 'OK' 会立即终止所有传输。"
-; "**Do you want to open separate shell session?**\n\nCurrent %s session does not support command you request. Separate shell session may be opened to process the command.\n \nNote: The server must provide Unix-like shell and the shell must use same path syntax as current %s session."
+; "**Do you want to open a separate shell session?**\n\nCurrent %s session does not support command you request. A separate shell session may be opened to process the command.\n \nNote: The server must provide Unix-like shell and the shell must use same path syntax as current %s session."
 PERFORM_ON_COMMAND_SESSION2="**是否打开一个独立的Shell会话?**\n\n当前会话%s不支持你要求的命令。可以打开一个独立的Shell会话来执行命令。\n \n注意:服务器必须提供Unix风格的Shell,并且这个Shell必须使用与当前会话%s相同的路径语法。"
 ; "There are some opened files. Please close them before exiting application.\n \nBeware: If you ignore this message, opened files may remain in temporary directory."
 PENDING_EDITORS="有一些已经被打开的文件。请在退出前先关闭它们。\n \n小心:如果你忽略了这个消息,打开的文件会保留在临时目录中。"
@@ -4673,7 +4673,7 @@ NEVER_SHOW_AGAIN="不要再显示这个对话框(&G)"
 CREATE_DESKTOP_ICON2="**是否为所有用户创建桌面图标?**\n \n你必须有管理员权限才能执行此功能。"
 ; "Do you want to add application path '%s' to system search path (%%PATH%%)?"
 CONFIRM_ADD_SEARCH_PATH="是否将程序路径'%s'添加到系统搜索路径(%%PATH%%)?"
-; "Editor (application) launched to open file '%s' was closed too early. If it was not closed by you, it may happened because your external editor opens multiple files in one window (process). Additional launched instances of the editor then just sends the new file to existing instance of editor and closes itself immediately. To support this kind of editors, WinSCP must adapt its behavior, not to remove temporary file when the process exits, but to keep it as long as WinSCP is running. The behavior can be turned on by unsetting editor preference option 'External editor opens each file in separate window (process)'. If your editor is not of this kind, ignore this message and let the file be removed from temporary directory now.\n \nDo you want to remove the opened file now? (By pressing 'No' you will enable the special behavior and keep the file in temporary folder.)"
+; "Editor (application) launched to open file '%s' was closed too early. If it was not closed by you, it may have happened because your external editor opens multiple files in one window (process). Additional launched instances of the editor then just sends the new file to existing instance of editor and closes itself immediately. To support this kind of editors, WinSCP must adapt its behavior, not to remove temporary file when the process exits, but to keep it as long as WinSCP is running. The behavior can be turned on by unsetting editor preference option 'External editor opens each file in separate window (process)'. If your editor is not of this kind, ignore this message and let the file be removed from temporary directory now.\n \nDo you want to remove the opened file now? (By pressing 'No' you will enable the special behavior and keep the file in temporary folder.)"
 EDITOR_EARLY_CLOSED2="打开文件'%s'的编辑器关得太早了。如果不是你关的,可能是因为外置编辑器在一个窗口打开了多个文件。再次运行编辑器实例,然后发送新文件给已经存在的编辑器实例,它会立刻自己关闭。要支持这种编辑器,WinSCP必须适应它的行为,当编辑器存在时不删除临时文件,直到WinSCP运行结束。可以取消选中编辑器选项里的'外部编辑器在独立窗口(进程)中打开各个文件'来开启该行为。如果你的编辑器不是这种类型的,忽略这个消息,现在就自动删除临时目录内的文件。\n \n你想现在就删除打开的文件吗?(按'否'你会开启特殊行为,将文件保存在临时目录里。)"
 ; "**Do you want to make direction you have selected the default?**\n\nYou have overridden pre-selected synchronisation direction. By default the direction is determined from file panel that was active before you run the synchronise function."
 SAVE_SYNCHRONIZE_MODE2="**是否将现在的方向设为默认?**\n\n你覆盖了预选同步方向。默认的方向是由你运行同步前激活的面板所决定的。"
@@ -4901,7 +4901,7 @@ QUEUE_DONE="已完成"
 EDITOR_AUTO_CONFIG2="**你想使用'%s'代替默认的内置编辑器吗?**\n\n检测到了自定义文本编辑器'%s'。\n\n"
 ; "%s\n\nThere were some errors when encrypting passwords using new master password or decrypting passwords."
 MASTER_PASSWORD_RECRYPT_ERRORS="%s\n\n使用新的主密码加密或解密密码时发生了一些错误。"
-; "WinSCP, a popular free SFTP and FTP client for Windows, copies files between a local and remote computer. It supports also FTPS, SCP, WebDAV and S3. It offers easy to use GUI for all common file operations and a powerful automation with .NET assembly."
+; "WinSCP is a popular free SFTP and FTP client for Windows, a powerful file manager that will improve your productivity. It supports also Amazon S3, FTPS, SCP and WebDAV protocols. Power users can automate WinSCP using .NET assembly."
 REGISTERED_APP_DESC2="WinSCP是一款流行的Windows下的免费SFTP和FTP客户端,能在本地和远程电脑之间复制文件。它也支持SFTP、SCP、WebDAV和S3。针对所有常用文件操作提供了简单易用的GUI以及强大的自动化功能。"
 ; "Loading..."
 MESSAGE_LOADING="加载中..."
@@ -5291,7 +5291,7 @@ LOGIN_DELETE_SPECIAL_SESSION="无法删除特殊站点'%s'。"
 LOGIN_NEW_SESSION_FOLDER_CAPTION="创建会话目录"
 ; "New folder name:"
 LOGIN_NEW_SESSION_FOLDER_PROMPT="新建目录名:"
-; "**Do you want to open separate shell session to duplicate the file(s)?**\n \nCurrent session does not support direct duplication of remote files. Separate shell session may be opened to process the duplication. Alternatively your may duplicate the file(s) via local temporary copy."
+; "**Do you want to open a separate shell session to duplicate the file(s)?**\n \nCurrent session does not support direct duplication of remote files. A separate shell session may be opened to process the duplication. Alternatively you may duplicate the file(s) via local temporary copy."
 REMOTE_COPY_COMMAND_SESSION2="**是否希望打开独立的Shell会话来复制文件?**\n \n当前会话不支持直接复制远程文件。可以打开单独的Shell会话来处理复制。你也可以通过本地临时副本来进行复制。"
 ; "Editor"
 EDITOR_AD_HOC="编辑器"
@@ -5555,31 +5555,31 @@ DND_DOWNLOAD_MOVE_WARNING="你正试图移动远程文件到一个WinSCP不能
 
 ; WinSCP propagation strings (for use in Windows Store and other download sites)
 [Propagation.rc]
-; "Free SFTP, WebDAV and FTP client for Windows"
+; "Free SFTP, SCP, S3 and FTP client for Windows"
 DESCRIPTION_45_LETTERS="Windows下的免费SFTP、WebDAV及FTP客户端"
-; "WinSCP is a popular free SFTP, SCP, WebDAV, S3 and FTP client for Windows."
+; "WinSCP is a free SFTP, SCP, Amazon S3, WebDAV, and FTP client for Windows."
 DESCRIPTION_80_LETTERS="WinSCP是一款流行的Windows下的免费SFTP、SCP、WebDAV、S3和FTP客户端。"
-; "WinSCP, a popular free SFTP and FTP client for Windows, copies files between a local and remote computer. It supports also FTPS, SCP, WebDAV and S3. It offers easy to use GUI for all common file operations and a powerful automation with .NET assembly."
+; "WinSCP is a popular free SFTP and FTP client for Windows, a powerful file manager that will improve your productivity. It supports also Amazon S3, FTPS, SCP and WebDAV protocols. Power users can automate WinSCP using .NET assembly."
 DESCRIPTION_250_LETTERS="WinSCP是一款流行的Windows下的免费SFTP和FTP客户端,能在本地和远程电脑之间复制文件。它也支持SFTP、SCP、WebDAV和S3。针对所有常用文件操作提供了简单易用的GUI以及强大的自动化功能。"
-; "WinSCP is a popular free SFTP and FTP client for Windows, a powerful tool that will improve your productivity. WinSCP can copy files between a local and remote computer using FTP, FTPS, SCP, SFTP, WebDAV or S3. WinSCP offers an easy to use GUI for all common operations with files and directories. Power users can automate WinSCP using .NET assembly. WinSCP documentation is at https://winscp.net/. WinSCP is available in English and many other languages."
+; "WinSCP is a popular free SFTP and FTP client for Windows, a powerful file manager that will improve your productivity. It offers an easy to use GUI to copy files between a local and remote computer using multiple protocols: Amazon S3, FTP, FTPS, SCP, SFTP or WebDAV. Power users can automate WinSCP using .NET assembly. WinSCP is available in English and many other languages."
 DESCRIPTION_450_LETTERS="WinSCP是一款流行的Windows下的SFTP和FTP客户端,能够提升生产力的强大工具。WinSCP能使用FTP、FTPS、SCP、SFTP、WebDAV或S3在本地及远程电脑之间复制文件。WinSCP为所有常用的文件和目录操作提供了简单易用的GUI。高级用户可以用.NET Assembly进行自动化操作。在https://winscp.net/可以找到WinSCP的文档。WinSCP提供了英语、中文等多种语言支持。"
 ; "WinSCP is a popular free SFTP and FTP client for Windows. Moreover, WinSCP is a powerful multi-functional tool that will improve your productivity. WinSCP can copy files between a local and remote computer using multiple protocols: FTP, FTPS, SCP, SFTP, WebDAV or S3. On the one hand, WinSCP offers an easy to use graphical user interface; you can choose between Windows Explorer look and tabbed twin-panel interface like Norton commander. On the other hand, advanced users can automate WinSCP functionality using .NET assembly or simple batch file scripting. You will use WinSCP for all common operations with files. You can start editing a file directly from WinSCP, either using WinSCP internal text editor or using integration with your favorite external text editor. WinSCP operations are not limited to individual files; WinSCP offers several ways to synchronize your remote and local directories. After connecting to a site you can choose to store site information for repeated access, WinSCP can even share site settings with another popular open source tool PuTTY. WinSCP integrates also with Pageant (PuTTY authentication agent) for full support of public key authentication with SSH. Admins love WinSCP support for portable operation using a configuration file instead of registry entries, suitable for operation from removable media. A comprehensive WinSCP documentation is freely accessible at https://winscp.net/. This site hosts also a very active user forum for support and feature requests. WinSCP is available in English and many other languages. WinSCP is an open source software distributed free of charge under the terms of the GNU General Public License (GPL)."
 DESCRIPTION_2000_LETTERS="WinSCP是一款流行的Windows下的免费SFTP和FTP客户端。同时,它也是一款能够大大提升生产力的强大工具。WinSCP能够使用多种协议在本地和远程电脑之间传输文件,支持的协议有:FTP、FTPS、SCP、SFTP、WebDAV和S3。一方面,WinSCP提供了一套简单易用的图形用户界面;你可以在Windows Explorer风格和Norton Commander类似的双栏标签页风格之间进行选择。另一方面,高级用户可以通过.NET assembly或简单的批处理文件脚本让WinSCP自动完成一些工作。你能通过WinSCP完成所有常用文件操作。可以直接在WinSCP中编辑文件,可以选择WinSCP内置的文本编辑器,也可以选择你喜欢的外部编辑器。WinSCP不仅可以操作单个文件,它也提供了多种在远程和本地目录之间进行同步的方法。在连接到一个站点之后,可以保存站点信息以便重复访问,WinSCP甚至可以和著名的开源工具PuTTY共享站点设置。WinSCP还集成了Pageant(PuTTY的认证客户端),通过它为SSH公钥认证提供完整支持。管理员们喜欢WinSCP的移动操作支持,使用配置文件来代替注册表,适合在可移动介质上进行操作。在https://winscp.net/上能免费获得WinSCP的完整文档。该网站还提供了一个非常活跃的用户论坛来提供使用支持及收集需求。WinSCP提供了英语、中文等多种语言支持。WinSCP是一款开源软件,在遵循GNU General Public License(GPL)的前提下可以免费分发。"
-; "Support for SFTP and SCP protocols over SSH, FTP, WebDAV and S3 protocol"
+; "Support for Amazon S3, FTP, FTPS, SCP, SFTP or WebDAV"
 FUNCTIONS_PROTOCOLS="支持SSH之上的SFTP和SCP协议、FTP、WebDAV和S3协议"
 ; "All common operations with files"
 FUNCTIONS_FILE_OPERATION="支持文件相关的全部常用操作"
-; "Integration with Windows (drag&drop, URL, shortcut icons, jump list)"
+; "Integration with Windows, PuTTY and other applications"
 FUNCTIONS_INTEGRATION="与Windows深度集成(拖拽、URL、快捷图标、跳转列表)"
 ; "Translated into many languages"
 FUNCTIONS_TRANSLATIONS="已翻译为多种语言"
-; "Batch file scripting, command-line interface, .NET assembly"
+; "Scripting and task automation with batch file scripting, command-line interface and .NET assembly"
 FUNCTIONS_AUTOMATION="批处理文件脚本、命令行风格界面、.NET assembly"
 ; "Directory synchronization in several semi or fully automatic ways"
 FUNCTIONS_SYNCHRONIZATION="可以多种半自动或全自动方式同步目录"
 ; "Integrated text editor and support for external text editors"
 FUNCTIONS_EDITOR="集成了文本编辑器,也支持外置编辑器"
-; "Choice of Windows Explorer-like or Norton Commander-like interfaces"
+; "Graphical user interface with choice of Windows Explorer-like or Norton Commander-like interfaces"
 FUNCTIONS_INTERFACES="可以选择Windows Explorer风格或Norton Commander风格的界面"
 ; "Optionally supports portable operation using a configuration file instead of registry entries, suitable for operation from removable media"
 FUNCTIONS_PORTABLE="可以使用配置文件来代替注册表进行移动操作,适用于从可移动介质上进行操作"

+ 1 - 1
translations/version.ini

@@ -19,7 +19,7 @@ SV=72
 XXE=6
 EL=15
 PTG=52
-CHS=61
+CHS=62
 TH=4
 RO=55
 PT=64