Git commit 37097a0c3875b21b67126c11673f54092440018d by Albert Astals Cid. Committed on 15/11/2017 at 09:08. Pushed by aacid into branch 'dont-use-docdata-for-annots-and-forms'.
Some text tweaking suggested in the phabricator review M +2 -2 doc/index.docbook M +3 -3 part.cpp https://commits.kde.org/okular/37097a0c3875b21b67126c11673f54092440018d diff --git a/doc/index.docbook b/doc/index.docbook index 4b35dc78..5218b752 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -989,7 +989,7 @@ Context menu actions like Rename Bookmarks etc.) </menuchoice> </term> <listitem> - <para><action>Saves</action> the document including all the changes (annotations, form contents, &etc;), provided the document backend supports saving those changes, if the backend does not support saving the changes the user will be give the option to lose them or to save as &okular; document archive.</para> + <para><action>Saves</action> the document including all the changes (annotations, form contents, &etc;), provided the document backend supports saving those changes. If the backend does not support saving the changes, the user will be given the option to either discard or to save them together with the document in an &okular; document archive.</para> </listitem> </varlistentry> @@ -1004,7 +1004,7 @@ Context menu actions like Rename Bookmarks etc.) </menuchoice> </term> <listitem> - <para><action>Saves</action> the document under a new name including all the changes (annotations, form contents, &etc;), provided the document backend supports saving changes, if the backend does not support saving the changes the user will be give the option to lose them or to save as &okular; document archive.</para> + <para><action>Saves</action> the document under a new name including all the changes (annotations, form contents, &etc;), provided the document backend supports saving changes. If the backend does not support saving the changes, the user will be given the option to either discard or to save them together with the document in an &okular; document archive.</para> <note> <para> Note that, due to the way this is implemented, even if there are no changes to the file, the new file need not to be an exact bit-for-bit copy of the original file (⪚ can have a different SHA-1 hash, &etc;). diff --git a/part.cpp b/part.cpp index 50ca274b..c025bf6c 100644 --- a/part.cpp +++ b/part.cpp @@ -2484,7 +2484,7 @@ bool Part::saveAs( const QUrl & saveUrl, SaveAsFlags flags ) if ( !hasUserAcceptedReload && !m_document->canSwapBackingFile() ) { const int res = KMessageBox::warningYesNo( widget(), - i18n( "The current document format backend doesn't support internal reload on save so we will close and open the file again.<br />This means that the undo/redo stack will be lost.<br />Do you want to continue?" ), + i18n( "After saving, the current document format requires the file to be reloaded. Your undo/redo history will be lost.<br />Do you want to continue?" ), i18n( "Save - Warning" ) ); switch ( res ) @@ -2517,8 +2517,8 @@ bool Part::saveAs( const QUrl & saveUrl, SaveAsFlags flags ) if ( !listOfwontSaves.isEmpty() ) { const QString warningMessage = m_document->canSwapBackingFile() ? - i18n( "You are about to save changes, but the current file format does not support saving the following elements. Please use the <i>Okular document archive</i> format to preserve them. Click <i>Continue</i> to save ignoring these elements." ) : - i18n( "You are about to save changes, but the current file format does not support saving the following elements. Please use the <i>Okular document archive</i> format to preserve them. Click <i>Continue</i> to save but you will lose these elements (as well as the undo/redo history)." ); + i18n( "You are about to save changes, but the current file format does not support saving the following elements. Please use the <i>Okular document archive</i> format to preserve them. Click <i>Continue</i> to save the document and discard these elements." ) : + i18n( "You are about to save changes, but the current file format does not support saving the following elements. Please use the <i>Okular document archive</i> format to preserve them. Click <i>Continue</i> to save, but you will lose these elements as well as the undo/redo history." ); const QString continueMessage = m_document->canSwapBackingFile() ? i18n( "Continue" ) : i18n( "Continue losing changes" );
