[LyX/master] Update sk.po
commit ee2b9d45dc13c75581b88f8ddb5f37d6f523fe12 Author: Kornel Benko Date: Fri Feb 17 21:30:23 2023 +0100 Update sk.po --- po/sk.po | 24 +++- 1 files changed, 19 insertions(+), 5 deletions(-) diff --git a/po/sk.po b/po/sk.po index eb40b1a..8720ef1 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: LyX-2.4\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" -"POT-Creation-Date: 2023-02-16 13:51+0100\n" -"PO-Revision-Date: 2023-02-16 12:54+\n" +"POT-Creation-Date: 2023-02-17 15:05+0100\n" +"PO-Revision-Date: 2023-02-17 14:27+\n" "Last-Translator: Kornel Benko \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -4095,11 +4095,25 @@ msgid "Backup documents when saving" msgstr "Zálohovať pôé dokumenty pri uložení" #: src/frontends/qt/ui/PrefDocHandlingUi.ui:103 -msgid " documents, every" +msgid "" +"If this is checked, LyX saves a temporary copy of changed documents in the " +"given interval (as #filename.lyx# in the given directory). As opposed to the " +"backup above, this snapshot will be removed when changes are being saved. If " +"the application crashes with unsaved changes and the restoration from the " +"emergency file fails, this snapshot can be at rescue." +msgstr "" +"Keď je toto zaškrtnuté, LyX zálohuje prechodné kópie zmenených dokumentov v " +"danom intervale (ako #menosúboru.lyx# v určenom adresáre). Ináč ako navyše, " +"zálohy budú odstránené keď budú patričné zmeny uložené. Keď aplikácia " +"havaruje a bez uložených zmien a obnovenie z havarijnej kópie zlyhá, táto " +"záloha by mohla byť záchranou." + +#: src/frontends/qt/ui/PrefDocHandlingUi.ui:106 +msgid "Make a snapshots every[[ N minutes]]" msgstr "Záť dokumenty, každých" -#: src/frontends/qt/ui/PrefDocHandlingUi.ui:120 -msgid "" +#: src/frontends/qt/ui/PrefDocHandlingUi.ui:123 +msgid "[[Make auto-save snapshots every N ]]" msgstr "út" #: src/frontends/qt/ui/PrefDocHandlingUi.ui:145 -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Update fr.po
commit e90cf8236412b68ca0d8cdbe4b2a3070322631f9 Author: jpc Date: Fri Feb 17 18:17:37 2023 +0100 Update fr.po --- po/fr.gmo | Bin 638959 -> 640876 bytes po/fr.po | 464 ++--- 2 files changed, 290 insertions(+), 174 deletions(-) diff --git a/po/fr.gmo b/po/fr.gmo index 3118372..f3cbd0e 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index 7a44c11..7da2f96 100644 --- a/po/fr.po +++ b/po/fr.po @@ -362,8 +362,8 @@ msgid "" msgstr "" "Project-Id-Version: LyX 2.4\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" -"POT-Creation-Date: 2023-02-10 11:13+0100\n" -"PO-Revision-Date: 2023-02-10 11:15+0100\n" +"POT-Creation-Date: 2023-02-17 17:57+0100\n" +"PO-Revision-Date: 2023-02-17 18:16+0100\n" "Last-Translator: Jean-Pierre Chrétien \n" "Language-Team: lyxfr\n" "Language: fr\n" @@ -1995,7 +1995,7 @@ msgid "Restrict search to whole words only" msgstr "Restreindre la recherche aux mots complets seulement" #: src/frontends/qt/ui/FindAndReplaceUi.ui:153 -#: src/frontends/qt/ui/SearchUi.ui:241 src/frontends/qt/GuiSearch.cpp:100 +#: src/frontends/qt/ui/SearchUi.ui:241 src/frontends/qt/GuiSearch.cpp:101 msgid "Wh words" msgstr "Mots com" @@ -4881,7 +4881,7 @@ msgstr "Ac" msgid "Ctrl" msgstr "Ctrl" -#: src/frontends/qt/ui/PrefInputUi.ui:249 src/insets/InsetInfo.cpp:898 +#: src/frontends/qt/ui/PrefInputUi.ui:249 src/insets/InsetInfo.cpp:894 msgid "Shift" msgstr "Maj" @@ -5760,11 +5760,11 @@ msgstr "&< Rechercher" msgid "Replace all occurrences" msgstr "Remplacer toutes les occurrences" -#: src/frontends/qt/ui/SearchUi.ui:100 src/frontends/qt/GuiSearch.cpp:204 +#: src/frontends/qt/ui/SearchUi.ui:100 src/frontends/qt/GuiSearch.cpp:206 msgid "Hide replace and option widgets" msgstr "Cacher les vignettes Remplacer et Options" -#: src/frontends/qt/ui/SearchUi.ui:103 src/frontends/qt/GuiSearch.cpp:203 +#: src/frontends/qt/ui/SearchUi.ui:103 src/frontends/qt/GuiSearch.cpp:205 msgid "" msgstr "" @@ -5800,7 +5800,7 @@ msgstr "Rechercher l'occurrence suivante (Entrée)" msgid "Treat uppercase/lowercase writing as distinct" msgstr "Distinguer majuscules/minuscules" -#: src/frontends/qt/ui/SearchUi.ui:231 src/frontends/qt/GuiSearch.cpp:98 +#: src/frontends/qt/ui/SearchUi.ui:231 src/frontends/qt/GuiSearch.cpp:99 msgid " sensitive[[search]]" msgstr "Selon la " @@ -5812,7 +5812,7 @@ msgstr "Mots complets seulement" msgid "Limit search and replace to selection" msgstr "Limiter rechercher/remplacer à la sélection" -#: src/frontends/qt/ui/SearchUi.ui:251 src/frontends/qt/GuiSearch.cpp:102 +#: src/frontends/qt/ui/SearchUi.ui:251 src/frontends/qt/GuiSearch.cpp:103 msgid "Selection onl" msgstr "Sélection " @@ -5820,7 +5820,7 @@ msgstr "Sélection " msgid "If this is checked, LyX will search forward immediately" msgstr "Si la case est cochée, LyX cherchera vers l'avant immédiatement" -#: src/frontends/qt/ui/SearchUi.ui:261 src/frontends/qt/GuiSearch.cpp:104 +#: src/frontends/qt/ui/SearchUi.ui:261 src/frontends/qt/GuiSearch.cpp:105 msgid "Search as yo type" msgstr "Chercher pendant la " @@ -5830,7 +5830,7 @@ msgstr "" "Continuer automatiquement la recherche si le début ou la fin du document est " "atteint" -#: src/frontends/qt/ui/SearchUi.ui:271 src/frontends/qt/GuiSearch.cpp:106 +#: src/frontends/qt/ui/SearchUi.ui:271 src/frontends/qt/GuiSearch.cpp:107 msgid "" msgstr "écursion" @@ -6930,17 +6930,17 @@ msgstr "American Economic Association (AEA)" #: lib/layouts/iopart.layout:4 lib/layouts/isprs.layout:4 #: lib/layouts/iucr.layout:4 lib/layouts/jarticle.layout:4 #: lib/layouts/jasatex.layout:4 lib/layouts/jgrga.layout:4 -#: lib/layouts/jsarticle.layout:4 lib/layouts/jss.layout:4 -#: lib/layouts/kluwer.layout:4 lib/layouts/llncs.layout:4 -#: lib/layouts/ltugboat.layout:4 lib/layouts/maa-monthly.layout:4 -#: lib/layouts/mwart.layout:4 lib/layouts/paper.layout:4 -#: lib/layouts/revtex4-1.layout:4 lib/layouts/revtex4-2.layout:4 -#: lib/layouts/revtex4.layout:4 lib/layouts/scrartcl.layout:4 -#: lib/layouts/scrarticle-beamer.layout:4 lib/layouts/siamltex.layout:4 -#: lib/layouts/singlecol-new.layout:4 lib/layouts/spie.layout:4 -#: lib/layouts/svglobal3.layout:4 lib/layouts/svjog.layout:4 -#: lib/layouts/svprobth.layout:4 lib/layouts/tarticle.layout:4 -#: lib/examples/Articles:0 +#: lib/layouts/jlreq-article.layout:4 lib/layouts/jsarticle.layout:4 +#: lib/layouts/jss.layout:4 lib/layouts/kluwer.layout:4 +#: lib/layouts/llncs.layout:4 lib/layouts/ltugboat.layout:4 +#: lib/layouts/maa-monthly.layout:4 lib/layouts/mwart.layout:4 +#: lib/layouts/paper.layout:4 lib/layouts/revtex4-1.layout:4 +#: lib/layouts/revtex4-2.layout:4 lib/layouts/revtex4.layout:4 +#: lib/layouts/scrartcl.layout:4 lib/layouts/scrarticle-beamer.layout:4 +#: lib/layouts/siamltex.layout:4 lib/layouts/singlecol-new.layout:4 +#: lib/layouts/spie.layout:4 lib/layouts/svglobal3.layout:4 +#:
[LyX/master] ctests: invert lyx2lyx tests expected to fail
commit caa7e6f6c8e4b09884e642a8ef5ae009b93b7976 Author: Scott Kostyshak Date: Fri Feb 17 10:17:51 2023 -0500 ctests: invert lyx2lyx tests expected to fail These tests are expected to fail, but are not really because of a bug. For more info see the comment in this commit. --- development/autotests/invertedTests | 25 + 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index e6e336e..09caddd 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -527,3 +527,28 @@ Sublabel: docbook beamer !export/templates/Presentations/Slides_docbook5 export/(examples|templates)/(ar|de|es|fr|ja|ru)/Presentations/.*_docbook5 export/(examples|templates)/Presentations/.*_docbook5 + +# == +Sublabel: expected +# These exports are expected to fail but don't necessarily indicate a bug. +# == + +# These fail because of the following warning: +# +# lyx2lyx warning: Can't find bibfiles for bibtex inset at line ! +# +# From Jürgen (https://www.mail-archive.com/search?l=mid=f6dad5b0596f33e6931ffa4ea4ca49390b5c1bf8.camel%40lyx.org): +# The bibtex inset in these files does not contain any bib file, so the +# warning is appropriate. I would not want to ditch the warning, as it +# makes sense to warn in this case. +# +# On the other hand I can see why it makes sense to include an empty +# inset to a template file. +# +# So this is probably a case where adjustment to please the tests would +# be over-optimization. +# +# Alternative to inverting them would be to just always ignore this warning in +# the ctests, but I think it might be useful in other cases. +# +export/templates/ja/(Articles|Books|Reports)/.*_lyx(16|20|21|22) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Some more minor corrections on the new (backup-related) documentation
commit a6f51c904da6eafaec75ce955717cf98251a4092 Author: Juergen Spitzmueller Date: Fri Feb 17 12:57:05 2023 +0100 Some more minor corrections on the new (backup-related) documentation --- lib/doc/UserGuide.lyx| 25 + lib/doc/de/UserGuide.lyx | 23 +-- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx index 1961b92..e78674a 100644 --- a/lib/doc/UserGuide.lyx +++ b/lib/doc/UserGuide.lyx @@ -1235,8 +1235,8 @@ Backup files provide the latest saved version of a document. \begin_layout Subsection -\change_inserted -712698321 1676624541 -Auto-save snapshots +\change_inserted -712698321 1676633415 +Auto-Save Snapshots \end_layout \begin_layout Standard @@ -1301,8 +1301,8 @@ g., \begin_layout Subsection -\change_inserted -712698321 1676624864 -Emergency files +\change_inserted -712698321 1676633419 +Emergency Files \end_layout \begin_layout Standard @@ -1343,9 +1343,9 @@ myfile.lyx.emergency \begin_layout Subsection -\change_inserted -712698321 1676625213 -Backup files from old \SpecialChar LyX - versions +\change_inserted -712698321 1676633427 +Backup Files from Old \SpecialChar LyX + Versions \end_layout \begin_layout Standard @@ -1419,19 +1419,20 @@ first try to restore from the emergency file (by reopening the document in \Spec \begin_layout Enumerate -\change_inserted -712698321 1676626031 +\change_inserted -712698321 1676634256 If the rescue file way did not work because there is no rescue file (e. \begin_inset space \thinspace{} \end_inset g., - after a power outage) or if the rescue file is damaged (it might happen in mean cases that the rescue files contains just that latest addition that makes \SpecialChar LyX + after a power outage) or the rescue file is damaged (it might happen in mean cases that the rescue files contains just that latest addition that makes \SpecialChar LyX crash!), look if there is an auto-save snapshot. If so, - rename it (not to the original file name unless you checked it) and see if that works for you. - In the worst case (with the default setting at least), - you will have lost maximally 5 minutes of work. + remove the trailing # so that the file can be opened with \SpecialChar LyX + (not the first # in order to keep the original file until you checked the snapshot) and see if that works for you. + If so, + you will have lost five minutes of work in the worst case (with the default settings at least). \end_layout \begin_layout Enumerate diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx index dbc7a0c..c508db1 100644 --- a/lib/doc/de/UserGuide.lyx +++ b/lib/doc/de/UserGuide.lyx @@ -982,7 +982,7 @@ meineDatei.lyx~ Sicherungsverzeichnis \family default festlegen, - in dem dann alle Sicherungsdateien abgelegt werden (siehe + in dem dann alle Sicherungsdateien abgelegt werden (siehe Abschnitt \begin_inset space ~ \end_inset @@ -1087,7 +1087,7 @@ Die Schnappschüsse werden immer in dem Verzeichnis gespeichert, ). Die Schnappschüsse werden von \SpecialChar LyX gelöscht, - sobald das entsprechende Dokument normal, + sobald die entsprechenden Dokument normal, d. \begin_inset space \thinspace{} \end_inset @@ -1138,7 +1138,7 @@ meineDatei.lyx.emergency ob die Notfalldatei gelöscht werden kann. Stimmen Sie dem erst zu, nachdem Sie geprüft haben, - dass alles korrekt wiederhergestellt wurde. + dass alles korrekt wiederhergestellt wurde! \end_layout \begin_layout Subsection @@ -1165,7 +1165,7 @@ meineDatei-lyxformat-474.lyx \family default ). Diese Dateien werden am selben Ort abgelegt wie die normalen Sicherungsdateien, - also drekt beim Originaldokument oder, + also direkt beim Originaldokument oder, wenn das so eingerichtet ist, im Sicherungsverzeichnis. \end_layout @@ -1193,7 +1193,7 @@ Falls \SpecialChar LyX \begin_layout Enumerate versuchen Sie zuallererst, ihre Dokumente von der Notfalldatei aus wieder herzustellen (einfach, - indem sie sie mit \SpecialChar LyX + indem Sie sie mit \SpecialChar LyX wieder öffnen). Diese Datei enthält die allerneuesten Änderungen, sogar die, @@ -1211,10 +1211,14 @@ Falls diese Versuch nicht zum Erfolg führt, schauen Sie, ob es einen automatischen Schnappschuss gibt. Falls ja, - benennen Sie ihn um (noch nicht zum Namen der Originaldatei, - so lange Sie sie nicht sorgfältig geprüft haben) und schauen Sie, + entfernen Sie das abschließende #, + so dass die Datei mit \SpecialChar LyX + geöffnet werden kann (noch nicht das erste #, + so dass die Originaldatei erhalten bleibt, + so lange Sie den Schnappschuss nicht sorgfältig geprüft haben) und schauen Sie, ob sie für Sie funktioniert. - Im schlimmsten Fall (jedenfalls mit den Voreinstellung) verlieren Sie so die letzten 5 Minuten Ihrer Arbeit am Dokument. + Falls ja, + verlieren Sie so im schlimmsten Fall (jedenfalls mit den Voreinstellung) die letzten 5 Minuten
[LyX/master] de/UserGuide: add the recent additions on backup files
commit 85eff6884e4e9f62b011b570b7e7f4d065209c8a Author: Juergen Spitzmueller Date: Fri Feb 17 11:28:42 2023 +0100 de/UserGuide: add the recent additions on backup files --- lib/doc/de/UserGuide.lyx | 461 ++ 1 files changed, 427 insertions(+), 34 deletions(-) diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx index c8e4f1d..dbc7a0c 100644 --- a/lib/doc/de/UserGuide.lyx +++ b/lib/doc/de/UserGuide.lyx @@ -899,6 +899,356 @@ Beenden \end_layout \begin_layout Section +\begin_inset CommandInset label +LatexCommand label +name "sec:Sicherheitsnetze" + +\end_inset + +Sicherheitsnetze: + Dateien retten, + wenn die Stricke reißen +\end_layout + +\begin_layout Standard +\SpecialChar LyX + legt größten Wert auf Sicherheit. + Wir wissen, + wie viel Mühe Sie in Ihre Arbeit investieren, + und deshalb ist das letzte, + was wir wollen, + dass diese Arbeit verloren geht. + Allerdings können wir nicht alles Böse verhindern: + \SpecialChar LyX + könnte abstürzen (auch wenn wir alles tun, + damit das nicht passiert), + der Strom könnte ausfallen, + während Sie an einem Dokument mit ungesicherten Änderungen arbeiten, + Festplatten können beschädigt sein oder Dateien könnten bei der Synchronisation verloren gehen bzw. + beschädigt werden oder einfach versehentlich gelöscht werden. + Für solche Fälle hat \SpecialChar LyX + ein mehrfaches Sicherheitsnetz eingebaut, + welches Ihnen hoffentlich größeren Stress erspart. + Das heißt, + dass \SpecialChar LyX + nicht einfach nur eine Sicherungskopie macht, + sondern es macht gleich mehrere, + welche in unterschiedlichen Szenarien hilfreich sein können. + Teile dieses Mehrfachnetzes können Sie ausschalten, + wenn Ihnen das Risiko nichts ausmacht und Sie die vielen Extradateien stören (siehe dazu Abschnitt +\begin_inset space ~ +\end_inset + + +\begin_inset CommandInset ref +LatexCommand ref +reference "subsec:Sicherung-Dokumente" + +\end_inset + +), + per Voreinstellung sind aber alle Maßnahmen aktiviert um Ihnen die größtmögliche Sicherheit zu gewähren. +\end_layout + +\begin_layout Standard +Im Folgenden erläutern wir die verschiedenen Dateitypen und wann sie nützlich werden können. +\end_layout + +\begin_layout Subsection +Sicherungsdateien +\end_layout + +\begin_layout Standard +Per Voreinstellung legt \SpecialChar LyX + Kopien von Dateien an, + sobald diese gespeichert werden. + Diese Dateien werden normalerweise im gleichen Verzeichnis gespeichert wie die Originaldateien, + und sie haben auch denselben Namen, + aber die Endung +\family typewriter +.lyx~ +\family default + (bspw. + +\family typewriter +meineDatei.lyx~ +\family default +). + Wenn Sie es bevorzugen, + alle Sicherungsdateien in einem separaten Ordner (und vielleicht auf einer anderen Festplatte) abzulegen, + können Sie in den \SpecialChar LyX +-Einstellungen ein +\family sans +Sicherungsverzeichnis +\family default + festlegen, + in dem dann alle Sicherungsdateien abgelegt werden (siehe +\begin_inset space ~ +\end_inset + + +\begin_inset CommandInset ref +LatexCommand ref +reference "sec:Pfade" +plural "false" +caps "false" +noprefix "false" +nolink "false" + +\end_inset + +). + Um Dateinamenkonflikte zu verhindern, + haben die Sicherungsdateien in diesem Fall nicht einfach nur den Namen des Originaldokuments, + sondern tragen auch den Dateipfad, + durch +\begin_inset Quotes gld +\end_inset + +! +\begin_inset Quotes grd +\end_inset + + getrennt, + im Namen (bspw. + +\family typewriter +!home!paula!Dateien!meineDatei.lyx~ +\family default +). +\end_layout + +\begin_layout Standard +Bitte beachten Sie, + dass manche Dateimanager Sicherungsdateien per Voreinstellung verstecken. + Sie müssen +\begin_inset Quotes gld +\end_inset + +Versteckte Dateien anzeigen +\begin_inset Quotes grd +\end_inset + + aktivieren, + um sie zu sehen. +\end_layout + +\begin_layout Standard +Sicherungsdateien enthalten die zuletzt gespeicherte Version eines Dokuments. + Sie werden von \SpecialChar LyX + niemals gelöscht, + aber sie werden durch neuere Versionen überschrieben, + sobald Änderungen im Originaldokument gespeichert werden. +\end_layout + +\begin_layout Subsection +Automatische Schnappschüsse +\end_layout + +\begin_layout Standard +Per Voreinstellung erstellt \SpecialChar LyX + außerdem regelmäßig automatische Schnappschüsse aller geöffneten Dokumente, + die ungesicherte Änderungen haben (das Intervall, + in dem das geschieht, + können Sie in den Einstellungen anpassen, + siehe Abschnitt +\begin_inset space ~ +\end_inset + + +\begin_inset CommandInset ref +LatexCommand ref +reference "subsec:Sicherung-Dokumente" + +\end_inset + +). + Im Gegensatz zu den Sicherungsdateien enthalten diese Schnappschüsse auch ungespeicherte Änderungen, + sie sind also unter Umständen aktueller als die Sicherungsdateien. +\end_layout + +\begin_layout Standard +Die Schnappschüsse werden immer in dem Verzeichnis gespeichert, + in dem das Originaldokument liegt. + Sie
[LyX/master] Minor corrections
commit b4febc33da37077a674717ecb9451527779acada Author: Juergen Spitzmueller Date: Fri Feb 17 11:28:11 2023 +0100 Minor corrections --- lib/doc/UserGuide.lyx | 16 +--- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx index d1dfb7c..1961b92 100644 --- a/lib/doc/UserGuide.lyx +++ b/lib/doc/UserGuide.lyx @@ -1145,11 +1145,12 @@ Backup Files \begin_layout Standard -\change_inserted -712698321 1676624410 +\change_inserted -712698321 1676629660 By default, \SpecialChar LyX makes backup copies of files when they are saved. - These files normally are stored in the same directory than the original file and with the same file name but the extension + Normally, + these files are stored in the same directory than the original file and with the same file name but the extension \family typewriter .lyx~ \family default @@ -1306,11 +1307,12 @@ Emergency files \begin_layout Standard -\change_inserted -712698321 1676624951 +\change_inserted -712698321 1676629567 If \SpecialChar LyX crashes and documents have unsaved changes, the program furthermore tries to write an emergency file, - which is a version of the document containing all unsaved changes. + which is a version of the document containing all unsaved changes, + even those that have been made after the latest snapshot. \end_layout \begin_layout Standard @@ -1452,12 +1454,12 @@ The fourth type of file, \begin_layout Standard -\change_inserted -712698321 1676626368 +\change_inserted -712698321 1676629641 So much for the safety net. - We hope you will not not it, + We hope you will not need it, but if so, that it catches you as high up as possible. - Now let us turn to the actual writing process. + Now let us return to the actual writing process. \change_unchanged \end_layout -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Amend 176caed5c7ef527
commit cbcc369a94cce7c7021305e45150f1a7c779121e Author: Juergen Spitzmueller Date: Fri Feb 17 10:41:44 2023 +0100 Amend 176caed5c7ef527 Forgot to save before committing. How fitting given the topic of this section. --- lib/doc/UserGuide.lyx | 334 - 1 files changed, 332 insertions(+), 2 deletions(-) diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx index 42db4c0..d1dfb7c 100644 --- a/lib/doc/UserGuide.lyx +++ b/lib/doc/UserGuide.lyx @@ -1097,7 +1097,7 @@ Safety Nets: \begin_layout Standard -\change_inserted -712698321 1676623839 +\change_inserted -712698321 1676623979 \SpecialChar LyX lays much stress on safety. We know how much effort you invest in your work, @@ -1107,7 +1107,7 @@ Safety Nets: \SpecialChar LyX might crash (although we put in all effort that it doesn't), you might face a power outage while you are working on a document with unsaved changes, - disks might get corrupt or files might get lost or damaged during synchronization. + disks might get corrupt or files might get lost or damaged during synchronization or simply because you deleted it by mistake. For such cases, \SpecialChar LyX provides a multi-layered safety net that will hopefully prevent you from major hassles. @@ -1128,6 +1128,336 @@ reference "subsec:Backup documents" ), but all measures are on by default to provide you with most possible security. +\end_layout + +\begin_layout Standard + +\change_inserted -712698321 1676624009 +In what follows, + we elaborate on the diverse files and when they might become useful. +\end_layout + +\begin_layout Subsection + +\change_inserted -712698321 1676624109 +Backup Files +\end_layout + +\begin_layout Standard + +\change_inserted -712698321 1676624410 +By default, + \SpecialChar LyX + makes backup copies of files when they are saved. + These files normally are stored in the same directory than the original file and with the same file name but the extension +\family typewriter +.lyx~ +\family default + (e. +\begin_inset space \thinspace{} +\end_inset + +g., + +\family typewriter +myfile.lyx~ +\family default +). + If you prefer to have all backups in a central place (and maybe on a separate disk), + you can specify a +\family sans +Backup Path +\family default + in preferences (see section +\begin_inset space ~ +\end_inset + + +\begin_inset CommandInset ref +LatexCommand ref +reference "sec:Paths" +plural "false" +caps "false" +noprefix "false" +nolink "false" + +\end_inset + +), + then all backups are stored there. + In order to prevent file name clashes, + the files then do not simply have the original file name, + but also the path in their name, + separated by +\begin_inset Quotes eld +\end_inset + +! +\begin_inset Quotes erd +\end_inset + + (e. +\begin_inset space \thinspace{} +\end_inset + +g., + +\family typewriter +!home!paula!work!myfile.lyx~ +\family default +). +\end_layout + +\begin_layout Standard + +\change_inserted -712698321 1676624464 +Note that some file managers hide backup files by default, + and you need to enable +\begin_inset Quotes eld +\end_inset + +Show hidden files +\begin_inset Quotes erd +\end_inset + + in order to see them. +\end_layout + +\begin_layout Standard + +\change_inserted -712698321 1676624516 +Backup files provide the latest saved version of a document. + They are never deleted by \SpecialChar LyX +, + but overwritten if new changes are saved in the original file. +\end_layout + +\begin_layout Subsection + +\change_inserted -712698321 1676624541 +Auto-save snapshots +\end_layout + +\begin_layout Standard + +\change_inserted -712698321 1676624657 +By default, + \SpecialChar LyX + also makes automatic snapshots of all opened documents that have unsaved changes in a regular time interval (which can be adjusted in preferences, + see section +\begin_inset space ~ +\end_inset + + +\begin_inset CommandInset ref +LatexCommand ref +reference "subsec:Backup documents" + +\end_inset + +). + As opposed to the backup files, + these also contain unsaved changes and thus might be newer than the backups. +\end_layout + +\begin_layout Standard + +\change_inserted -712698321 1676624841 +These files are always stored in the same directory than the original file and with the same name, + but embraced by +\begin_inset Quotes eld +\end_inset + +# +\begin_inset Quotes erd +\end_inset + + (e. +\begin_inset space \thinspace{} +\end_inset + +g., + +\family typewriter +#myfile.lyx# +\family default +). + Auto-save snapshots are deleted when a document is closed normally, + i. +\begin_inset space \thinspace{} +\end_inset + +e., + with all changes saved. + They are left on disk in case of non-normal termination (e. +\begin_inset space \thinspace{} +\end_inset + +g., + program crash or power outage), + and this is when they might become useful. +\end_layout + +\begin_layout Subsection + +\change_inserted -712698321 1676624864 +Emergency files +\end_layout +
[LyX/master] UserGuide: Add documentation on our backup and safety framework
commit 176caed5c7ef527f8b0710241ff0f1a2f842b77e Author: Juergen Spitzmueller Date: Fri Feb 17 10:34:58 2023 +0100 UserGuide: Add documentation on our backup and safety framework Explain the diverse types of backup, rescue and snapshot files, where to find them and when to use which one. --- lib/doc/UserGuide.lyx | 163 +++- 1 files changed, 159 insertions(+), 4 deletions(-) diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx index 38afa84..42db4c0 100644 --- a/lib/doc/UserGuide.lyx +++ b/lib/doc/UserGuide.lyx @@ -1078,6 +1078,58 @@ d version Control \family default you can register the changes you made to a document so that others can identify them as your changes. +\change_inserted -712698321 1676620203 + +\end_layout + +\begin_layout Section + +\change_inserted -712698321 1676622914 +\begin_inset CommandInset label +LatexCommand label +name "sec:Safety-Nets" + +\end_inset + +Safety Nets: + Rescuing Files If Things Go Awry +\end_layout + +\begin_layout Standard + +\change_inserted -712698321 1676623839 +\SpecialChar LyX + lays much stress on safety. + We know how much effort you invest in your work, + and thus the last thing we want is that this work gets lost. + However, + we cannot completely prevent bad things from happening: + \SpecialChar LyX + might crash (although we put in all effort that it doesn't), + you might face a power outage while you are working on a document with unsaved changes, + disks might get corrupt or files might get lost or damaged during synchronization. + For such cases, + \SpecialChar LyX + provides a multi-layered safety net that will hopefully prevent you from major hassles. + This means that \SpecialChar LyX + does not simply make a backup file, + it makes several such files that might be useful in different scenarios. + Parts of this multi-layered net can be switched off, + if you prefer to go a bit more risky over having multiple files (see section +\begin_inset space ~ +\end_inset + + +\begin_inset CommandInset ref +LatexCommand ref +reference "subsec:Backup documents" + +\end_inset + +), + but all measures are on by default to provide you with most possible security. +\change_unchanged + \end_layout \begin_layout Section @@ -57292,7 +57344,11 @@ Documents \family sans Backup original documents when saving \family default - creates a backup copy of the file in the state when it was opened or when it was saved the last time. + creates a backup copy of the file in the state when it was +\change_deleted -712698321 1676618729 +opened or when it was +\change_unchanged +saved the last time. It is stored in the \family sans Backup @@ -57323,21 +57379,103 @@ directory \family default is specified. The backup file has the file extension +\change_deleted -712698321 1676618692 + +\family typewriter + \begin_inset Quotes eld \end_inset -\family sans +\change_unchanged .lyx~ +\change_deleted -712698321 1676618694 + +\family default + +\begin_inset Quotes erd +\end_inset + + +\change_inserted -712698321 1676618670 + and the same name than the original file. + If a +\family sans +Backup +\begin_inset space ~ +\end_inset + +directory \family default + is specified, + the file has the full path in its file name, + separated by +\begin_inset Quotes eld +\end_inset +! \begin_inset Quotes erd \end_inset +, + e. +\begin_inset space \thinspace{} +\end_inset + +g. + +\family typewriter +!MyDir!MySubDir!Filename.lyx~ +\family default . +\change_deleted -712698321 1676618585 +. +\change_unchanged + \end_layout \begin_layout Standard + +\change_inserted -712698321 1676622933 +If the option +\family sans +Make auto-save snapshots every X minutes +\family default + is checked, + LyX furthermore automatically saves snapshots of the current document (including unsaved changes) in the specified interval if there are unsaved changes. + These files which are stored as +\family typewriter +#.lyx# +\family default + in the document's directory are overwritten on each auto-save cycle and deleted when the document is closed normally. + Should \SpecialChar LyX + crash with unsaved changes and the restoration from the emergency file fail, + this file can be used as a resort. +\end_layout + +\begin_layout Standard + +\change_inserted -712698321 1676623063 +Please read section +\begin_inset space ~ +\end_inset + + +\begin_inset CommandInset ref +LatexCommand ref +reference "sec:Safety-Nets" + +\end_inset + + for more details on \SpecialChar LyX +'s diverse backup and safety mechanisms. +\change_unchanged + +\end_layout + +\begin_layout Standard + +\change_deleted -712698321 1676619117 With the option \family sans Backup documents, @@ -57345,6 +57483,8 @@ Backup documents, \family default , you can specify the time between backup saves. +\change_unchanged + \end_layout \begin_layout Standard @@ -57367,13 +57507,28 @@ nolink "false" ). This applies to newly created