From e75085a6ef602b0d28a897c85c988116c82bd7cc Mon Sep 17 00:00:00 2001 From: Kevin Hendricks Date: Thu, 22 Feb 2024 12:53:43 -0500 Subject: [PATCH] update base of translations for changed user prompt --- ChangeLog.txt | 1 + docs/Translating.md | 2 +- src/MainUI/MainWindow.cpp | 2 +- src/Resource_Files/ts/base.ts | 753 +++++++++++++++++----------------- 4 files changed, 382 insertions(+), 376 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index d12e5f5943..e3d7901b5e 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -11,6 +11,7 @@ Sigil-2.1.0 - update 3rdparty zlib to version 1.3.1 for security fixes - update 3rdparty pcre2 to version 10.42 for security fixes - update to Qt 6.6.2 for security fixes, accessibility improvements + - allow cancelling of Save if mend on save set and not well formed Bug Fixes - multiple bug fixes from Qt 6.6.2 such as the transient child window resize bug on Windows, etc diff --git a/docs/Translating.md b/docs/Translating.md index f590977016..40131756f3 100644 --- a/docs/Translating.md +++ b/docs/Translating.md @@ -22,7 +22,7 @@ manner for some reason (a bug in Qt?) 1. Make sure the Qt project "bin" directory is in your path so that the right version of "lconvert" can be found. For me this is: - export MYQTHOME=~/Qt653 + export MYQTHOME=~/Qt662 export PATH=${MYQTHOME}/bin:${PATH} 2. Open a terminal and change to the Sigil/src/Resource_Files/ts directory. diff --git a/src/MainUI/MainWindow.cpp b/src/MainUI/MainWindow.cpp index ac2b5a9a58..deff63b7b5 100644 --- a/src/MainUI/MainWindow.cpp +++ b/src/MainUI/MainWindow.cpp @@ -5477,7 +5477,7 @@ bool MainWindow::SaveFile(const QString &fullfilepath, bool update_current_filen QApplication::restoreOverrideCursor(); QMessageBox::StandardButton button_pressed = Utility::warning(this, tr("Sigil"), tr("This EPUB has HTML files that are not well formed and " - "your current Clean Source preferences are set to automatically mend on Save.\n\n" + "your current Clean Source preferences are set to mend on Save.\n\n" "Do you want to automatically mend the files before saving? Or cancel the Save?"), QMessageBox::Yes|QMessageBox::No|QMessageBox::Cancel); if (button_pressed == QMessageBox::Cancel) { diff --git a/src/Resource_Files/ts/base.ts b/src/Resource_Files/ts/base.ts index da16c25dcf..981c434e1e 100644 --- a/src/Resource_Files/ts/base.ts +++ b/src/Resource_Files/ts/base.ts @@ -3621,362 +3621,362 @@ mended. GuideItems - + Acknowledgements - + A passage containing acknowledgments to entities involved in the realization of the work. - + Afterword - + A closing statement from the author or a person of importance to the story, typically providing insight into how the story came to be written, its significance or related events that have transpired since its timeline. - + Appendix - + Supplemental information. - + Back Matter - + Ancillary material occurring after the main content of a publication, such as indices, appendices, etc. - + Bibliography - + A list of works cited. - + Text - + The start of the main text content of a publication. - + Colophon - + A brief description usually located at the end of a publication, describing production notes relevant to the edition. - + Conclusion - + An ending section that typically wraps up the work. - + Contributors - + A list of contributors to the work. - + Copyright Page - + The copyright page of the work. - + Cover - + The publications cover(s), jacket information, etc. - + Dedication - + An inscription addressed to one or several particular person(s). - + Epilogue - + A concluding section that is typically written from a later point in time than the main story, although still part of the narrative. - + Epigraph - + A quotation that is pertinent but not integral to the text. - + Errata - + Publication errata, in printed works typically a loose sheet inserted by hand; sometimes a bound page that contains corrections for mistakes in the work. - + Footnotes - + A collection of notes appearing at the bottom of a page. - + Foreword - + An introductory section that precedes the work, typically not written by the work's author. - + Front Matter - + Preliminary material to the main content of a publication, such as tables of contents, dedications, etc. - + Glossary - + An alphabetical list of terms in a particular domain of knowledge, with the definitions for those terms. - + Half Title Page - + The half title page of the work which carries just the title itself. - + Imprimatur - + A formal statement authorizing the publication of the work. - + Imprint - + Information relating to the publication or distribution of the work. - + Index - + A detailed list, usually arranged alphabetically, of the specific information in a publication. - + Introduction - + A section in the beginning of the work, typically introducing the reader to the scope or nature of the work's content. - + List of Illustrations - + A listing of illustrations included in the work. - + List of Audio Clips - + A listing of audio clips included in the work. - + List of Tables - + A listing of tables included in the work. - + List of Video Clips - + A listing of video clips included in the work. - + Notes - + A collection of notes. It can be used to identify footnotes, rear notes, marginal notes, inline notes, and similar when legacy naming conventions are not desired. Status: Deprecated - Replaced by: 'footnotes', 'rearnotes' - + Other Credits - + Acknowledgments of previously published parts of the work, illustration credits, and permission to quote from copyrighted material. - + Preamble - + A section in the beginning of the work, typically containing introductory and/or explanatory prose regarding the scope or nature of the work's content - + Preface - + An introductory section that precedes the work, typically written by the work's author. - + Prologue - + An introductory section that sets the background to a story, typically part of the narrative. - + Rear Notes - + A collection of notes appearing at the rear (backmatter) of the work, or at the end of a section. - + Title Page - + A page at the beginning of a book giving its title, authors, publisher and other publication information. - + Table of Contents - + A table of contents which is a list of the headings or parts of the book or document, organized in the order in which they appear. Typically appearing in the work's frontmatter, or at the beginning of a section. @@ -4203,69 +4203,69 @@ You can then check or uncheck individual headings in the list above. - + Name - + File Size (KB) - + Times Used - + Width - + Height - + Pixels - + Color - + Image - + %n file(s) - + Save Report As Comma Separated File - + Sigil - + Cannot save report file. - + Delete From Book @@ -4664,482 +4664,482 @@ Do you want to save your changes? Landmarks - + Acknowledgments - + A passage containing acknowledgments to entities involved in the realization of the work. - + Afterword - + A closing statement from the author or a person of importance to the story, typically providing insight into how the story came to be written, its significance or related events that have transpired since its timeline. - + Annotation - + Explanatory information about passages in the work. Status: Deprecated - + Appendix - + Supplemental information. - + Assessment - + A test, quiz, or other activity that helps measure a student's understanding of what is being taught. - + Back Matter - + Ancillary material occurring after the main content of a publication, such as indices, appendices, etc. - + Bibliography - + A list of works cited. - + Body Matter - + The main content of a publication. - + Chapter - + A major structural division of a piece of writing. - + Colophon - + A brief description usually located at the end of a publication, describing production notes relevant to the edition. - + Conclusion - + An ending section that typically wraps up the work. - + Contributors - + A list of contributors to the work. - + Copyright Page - + The copyright page of the work. - + Cover - + The publications cover(s), jacket information, etc. - + Dedication - + An inscription addressed to one or several particular person(s). - + Division - + A major structural division that may also appear as a substructure of a part (esp. in legislation). - + Epigraph - + A quotation that is pertinent but not integral to the text. - + Epilogue - + A concluding section that is typically written from a later point in time than the main story, although still part of the narrative. - + Errata - + Publication errata, in printed works typically a loose sheet inserted by hand; sometimes a bound page that contains corrections for mistakes in the work. - + Footnotes - + A collection of notes appearing at the bottom of a page. - + Foreword - + An introductory section that precedes the work, typically not written by the work's author. - + Front Matter - + Preliminary material to the main content of a publication, such as tables of contents, dedications, etc. - + Glossary - + An alphabetical list of terms in a particular domain of knowledge, with the definitions for those terms. - + Half Title Page - + The half title page of the work which carries just the title itself. - + Imprimatur - + A formal statement authorizing the publication of the work. - + Imprint - + Information relating to the publication or distribution of the work. - + Index - + A detailed list, usually arranged alphabetically, of the specific information in a publication. - + Introduction - + A section in the beginning of the work, typically introducing the reader to the scope or nature of the work's content. - + Landmarks - + A collection of references to well-known/recurring components within the publication - + List of Audio Clips - + A listing of audio clips included in the work. - + List of Illustrations - + A listing of illustrations included in the work. - + List of Tables - + A listing of tables included in the work. - + List of Video Clips - + A listing of video clips included in the work. - + Notice - + Information that requires special attention, and that must not be skipped or suppressed. Examples include: alert, warning, caution, danger, important. - + Other Credits - + Acknowledgments of previously published parts of the work, illustration credits, and permission to quote from copyrighted material. - + Page List - + A list of references to pagebreaks (start locations) from a print version of the ebook - + Part - + A major structural division of a piece of writing, typically encapsulating a set of related chapters. - + Preamble - + A section in the beginning of the work, typically containing introductory and/or explanatory prose regarding the scope or nature of the work's content - + Preface - + An introductory section that precedes the work, typically written by the work's author. - + Prologue - + An introductory section that sets the background to a story, typically part of the narrative. - + Questions and Answers - + A question and answer section. - + Rear Notes - + A collection of notes appearing at the rear (backmatter) of the work, or at the end of a section. - + Revision History - + A record of changes made to a work. - + Subchapter - + A major sub-division of a chapter. - + Title Page - + A page at the beginning of a book giving its title, authors, publisher and other publication information. - + Table of Contents - + A table of contents which is a list of the headings or parts of the book or document, organized in the order in which they appear. Typically appearing in the work's frontmatter, or at the beginning of a section. - + Volume - + A component of a collection. - + Warning - + A warning or caution about specific material. Status: Deprecated - Replaced by 'notice'. @@ -10840,37 +10840,37 @@ Stylesheets that are listed first take precedence over later stylesheets. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Sigil @@ -10890,17 +10890,17 @@ This action cannot be reversed. - - - - + + + + %1[*] - epub%2 - %3 - - + + Sigil [std] @@ -11145,354 +11145,354 @@ This action cannot be reversed. - + or - + No CSS styles named - + found, or stylesheet not linked. - + <html><p>The href <b>%1</b> found in <b>%2</b> does not exist (and there may be more). Splitting or merging under these conditions can result in broken links.</p><p>Do you still wish to continue?</p></html> - + Add Cover - + An existing Cover file has been found. - + Unexpected error. Only image files can be used for the cover. - + Cover added. - - - + + + Not Available for epub2. - + OPF Manifest Properties Updated. - + NCX and Guide removed. - - + + NCX and Guide generation failed. - + NCX and Guide generated. - + An existing Index file has been found. - + Styles deleted. - + Reports Being Generated. - + Reports cancelled due to XML not well formed. - + Delete Unused Media Files cancelled due to XML not well formed. - + Unused media files deleted. - - + + There are no unused image, video or audio files to delete. - + Delete Unused Styles cancelled due to XML not well formed. - - + + There are no unused stylesheet selectors to delete. - + You cannot insert a file at this position. - + Insert File - + The file "%1" does not exist. - - + + You cannot insert an id at this position. - + ID is invalid - must start with a letter, followed by letter number _ : - or . - - + + You cannot insert a link at this position. - + Link is invalid - cannot contain '<' or '>' - + You cannot mark an index at this position or without selecting text. - + Entry is invalid - cannot contain '<' or '>' - + You cannot mark an index at this position. - - - + + + Select the destination to paste into first. - + Pasted clip entry %1. - + One resource selected and there is no previous resource to merge into. - + Are you sure you want to merge the selected files? This action cannot be reversed. - + Merge cancelled: XHTML files involved in merge are not well formed. - + Cannot merge file %1 - + Merge completed. You may need to regenerate or edit your Table Of Contents. - + Link Stylesheets cancelled: %1, XML not well formed. - + Word updated. - + Link Javascripts cancelled: %1, XML not well formed. - + File(s) deleted. - + Edit Table of Contents cancelled. - + Table Of Contents edited. - + Generate TOC cancelled. - + Table Of Contents generated. - + No Table Of Contents changes were necessary. - + An existing HTML Table of Contents file has been found. - + Text selection marked. - - + + Text selection unmarked. - + Metadata Editor cancelled. - + Metadata edited. - + RunPlugin - + This EPUB does not contain any CSS stylesheets to validate. - + This EPUB does not contain any CSS stylesheets to reformat. - + Line: %1, Col: %2 - + File cannot be split at this position. - + Split completed. - + Cannot split since at least one file is not an HTML file. - + Cannot split: %1 XML is not well formed - + Cannot split since at least one file may not be an HTML file. - + Split completed. You may need to update the Table of Contents. - + No split file markers found. Use Insert->Split Marker. - + The document has been modified. Do you want to save your changes? - + Should Sigil overwrite this file? - + No importer for file type: %1 - + The following file was not loaded due to invalid content or not well formed XML: %1 (line %2: %3) @@ -11501,132 +11501,137 @@ Try setting the Clean Source preference to Mend XHTML Source Code on Open and re - + Loading file... - + File loaded. - + The creator of this file has encrypted it with DRM. Sigil cannot open such files. - + Cannot load EPUB: %1 - + Cannot load file %1: %2 - + Saving EPUB... - + Sigil cannot save files of type "%1". Please choose a different format. - - This EPUB has HTML files that are not well formed and your current Clean Source preferences are set to automatically mend on Save. Saving a file that is not well formed will cause it to be automatically fixed, which very rarely may result in some data loss. + + This EPUB has HTML files that are not well formed and your current Clean Source preferences are set to mend on Save. -Do you want to automatically mend the files before saving? +Do you want to automatically mend the files before saving? Or cancel the Save? + Saving EPUB... cancelled + + + + EPUB saved, but not all HTML files are well formed. - + EPUB saved. - + Cannot save file %1: %2 - + EPUB files (*.epub) - - - + + + HTML files (*.htm *.html *.xhtml) - + Text files (*.txt) - + All files (*.*) - + EPUB file (*.epub) - + Preserve existing heading attributes is now: - + ON - + OFF - + &%1 %2 - + Focus changed to CodeView window. - + Focus changed to BookBrowser window. - + Focus changed to Preview window. - + Focus changed to Table Of Contents window. - + Focus changed to Clips window. @@ -15475,12 +15480,12 @@ Do you want to automatically mend the files before saving? OPFResource - + [Title here] - + [Main title here] @@ -16109,127 +16114,127 @@ Do you want to automatically mend the files before saving? - + Launcher process crashed - + Status: finished - + Status: failed - - + + Status: No Changes Made - + Error: Plugin Tried to Remove the Last XHTML file .. aborting changes - - + + Status: - + Plugin failed to start - + Status: error - + Plugin cancelled - + Status: cancelled - + Error Parsing Result XML: - - + + Status: checking - + Incorrect XHTML: - + Line/Col - + Check Report - + Incorrect XHTML/XML Detected Are you Sure You Want to Continue? - + Status: cleaning up - deleting files - + Status: deleting - + Status: Loading - + Input Plugin - + Your current book will be completely replaced losing any unsaved changes ... Are you sure you want to proceed - - + + Status: adding - + Status: cleaning up - modifying files - + Status: modifying @@ -16728,18 +16733,18 @@ Line: %1 Column %2 - %3 - + Cannot read file %1: %2. - + Sigil has encountered a problem. - + Sigil may need to close. @@ -16765,28 +16770,28 @@ Line: %1 Column %2 - %3 - - + + Quit - + About - + Preferences - + New - + Open @@ -18842,32 +18847,32 @@ your book and automatically insert into your document. - + Files In the Book - + Thumbnails - + shades - + colors - + Grayscale - + Color @@ -19429,17 +19434,17 @@ Use if you edit any HTML files while Spellcheck is open. - + The file "%1" does not exist. - + Collapse All - + Expand All @@ -19455,12 +19460,12 @@ Use if you edit any HTML files while Spellcheck is open. Utility - + Sigil - + The requested file name contains non-ASCII characters. You should only use ASCII characters in filenames. Using non-ASCII characters can prevent the EPUB from working with some readers. Continue using the requested filename?