notepad: adjust resources to more closely match XP

Austin English austinenglish at
Mon Jul 6 18:05:52 CDT 2009

I've written some autohotkey tests for notepad, but our string
resources are different. This adjusts them to match.

-------------- next part --------------
diff --git a/programs/notepad/En.rc b/programs/notepad/En.rc
index 3c4d052..5788212 100644
--- a/programs/notepad/En.rc
+++ b/programs/notepad/En.rc
@@ -116,15 +116,15 @@ STRING_UNTITLED,                                "Untitled"
 STRING_ALL_FILES,                               "All files (*.*)"
 STRING_TEXT_FILES_TXT,                  "Text files (*.txt)"
-STRING_TOOLARGE,                                "File '%s' is too large for notepad.\n \
+STRING_TOOLARGE,                                "File %s is too large for notepad.\n \
 Please use a different editor."
 STRING_NOTEXT,                                  "You didn't enter any text. \
 \nPlease type something and try again"
-STRING_DOESNOTEXIST,                            "File '%s'\ndoes not exist\n\n \
-Do you want to create a new file ?"
-STRING_NOTSAVED,                                "File '%s'\nhas been modified\n\n \
-Would you like to save the changes ?"
-STRING_NOTFOUND,                                        "'%s' could not be found."
+STRING_DOESNOTEXIST,                            "Cannot find the %s file.\n\n \
+Do you want to create a new file?"
+STRING_NOTSAVED,                                "The text in the %s file has changed.\n\n \
+Do you want to save the changes?"
+STRING_NOTFOUND,                                        "%s could not be found."
 STRING_OUT_OF_MEMORY,                   "Not enough memory to complete this \
 task.\nClose one or more applications to increase the amount of\nfree \
diff --git a/programs/notepad/main.c b/programs/notepad/main.c
index 104a834..940ff59 100644
--- a/programs/notepad/main.c
+++ b/programs/notepad/main.c
@@ -604,7 +604,7 @@ static int AlertFileDoesNotExist(LPCWSTR szFileName)
    LoadStringW(Globals.hInstance, STRING_DOESNOTEXIST, szResource, ARRAY_SIZE(szResource));
    wsprintfW(szMessage, szResource, szFileName);
-   LoadStringW(Globals.hInstance, STRING_ERROR, szResource, ARRAY_SIZE(szResource));
+   LoadStringW(Globals.hInstance, STRING_NOTEPAD, szResource, ARRAY_SIZE(szResource));
    nResult = MessageBoxW(Globals.hMainWnd, szMessage, szResource,
                          MB_ICONEXCLAMATION | MB_YESNO);

More information about the wine-patches mailing list