Am 26.11.2013 um 20:04 schrieb Vincent van Ravesteijn <[email protected]>:
> Juergen Spitzmueller schreef op 26-11-2013 16:16: >> commit aa5ef5bbbe0674e4e434882e5f2ffade9c68a7dc >> Author: Juergen Spitzmueller <[email protected]> >> Date: Tue Nov 26 16:16:24 2013 +0100 >> >> Properly name Cancel button (part of #8787) >> >> diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp >> index d096eeb..431c87f 100644 >> --- a/src/buffer_funcs.cpp >> +++ b/src/buffer_funcs.cpp >> @@ -74,7 +74,7 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, >> bool const acceptDirty) >> "The document %1$s is already loaded and has >> unsaved changes.\n" >> "Do you want to abandon your changes and reload >> the version on disk?"), file); >> if (!Alert::prompt(_("Reload saved document?"), >> - text, 1, 1, _("&Reload"), _("&Keep Changes"))) { >> + text, 1, 1, _("&Reload"), _("&Cancel"))) { >> // reload the document >> if (checkBuffer->reload() != Buffer::ReadSuccess) >> return 0; > > The cancel button doesn't really cancel the action. > > 1. Open a document > 2. Change the document sucht that it becomes dirty > 3. File->New Window > 4. Open the same document in the new window > 5. Press cancel > > Result: The document is opened anyway, so Cancel doesn't seem the best > description to me. Then the rename was not correct indeed and a cancel operation is missing. Stephan
