浏览代码

Revert "Bug 1847: Clarify that WinSCP may crash in the warning message when trying to load too big file into the internal editor"

This reverts commit 03230d18d1391fce9bd6e9ee3edcdfaf3bdf38a9.

Source commit: 96467296a5dc7d137970535d61bdc595eede9686
Martin Prikryl 5 年之前
父节点
当前提交
762cc7c378
共有 3 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      source/forms/Editor.cpp
  2. 1 1
      source/resource/TextsWin.h
  3. 1 1
      source/resource/TextsWin1.rc

+ 1 - 1
source/forms/Editor.cpp

@@ -1397,7 +1397,7 @@ void __fastcall TEditorForm::CheckFileSize()
         TMessageParams Params(mpNeverAskAgainCheck);
         unsigned int Answer =
           MoreMessageDialog(
-            FMTLOAD(INTERNAL_EDITOR_LARGE_FILE2, (FormatBytes(Size))), NULL,
+            FMTLOAD(INTERNAL_EDITOR_LARGE_FILE, (FormatBytes(Size))), NULL,
             qtConfirmation, qaOK | qaCancel, HELP_NONE, &Params);
         switch (Answer)
         {

+ 1 - 1
source/resource/TextsWin.h

@@ -150,7 +150,7 @@
 #define MASTER_PASSWORD_OTHER_INSTANCE 1362
 #define EDIT_SESSION_REATTACH   1363
 #define CONFIRM_UNREGISTER_URL  1364
-#define INTERNAL_EDITOR_LARGE_FILE2 1365
+#define INTERNAL_EDITOR_LARGE_FILE 1365
 #define CLOSE_BUTTON            1366
 #define EXTENSION_UNTRUSTED     1367
 #define EXTENSION_NOT_LATEST    1368

+ 1 - 1
source/resource/TextsWin1.rc

@@ -154,7 +154,7 @@ BEGIN
         MASTER_PASSWORD_OTHER_INSTANCE, "There is other instance of WinSCP running.\n\nSetting or clearing master password, while another instance of WinSCP is running, can cause loss of your stored passwords.\n\nPlease quit other instances of WinSCP before continuing."
         EDIT_SESSION_REATTACH, "**Do you want to attach edited file '%s' to session '%s'?**\n\nOriginal session used to download file '%s' to editor was closed already."
         CONFIRM_UNREGISTER_URL, "Do you want to unregister WinSCP from handling all URL addresses?"
-        INTERNAL_EDITOR_LARGE_FILE2, "**Try to open large file?**\n\nThe file you are trying to open in an internal editor is too large (%s). WinSCP internal editor is not designed for editing large files. Consider using an external editor capable of editing large files.\n\nYou may try to open the file anyway, but WinSCP may fail."
+        INTERNAL_EDITOR_LARGE_FILE, "**Try to open large file?**\n\nThe file you are trying to open in an internal editor is too large (%s). WinSCP internal editor is not designed for editing large files. Consider using an external editor capable of editing large files.\n\nYou may try to open the file anyway, but you may run out of memory."
         CLOSE_BUTTON, "Close"
         EXTENSION_UNTRUSTED, "The extension does not come from a trusted source. Are you sure you want to install it?"
         EXTENSION_NOT_LATEST, "**Using the last compatible and trusted version of the extension.**\n\nThe latest version of the extension is either not reviewed yet or is not compatible with this version of WinSCP."