From: Georg Baum Date: Sun, 3 Feb 2013 16:03:08 +0000 (+0100) Subject: Fix typos X-Git-Tag: 2.1.0beta1~817 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=e82cc5d498244b0d0f0571249f12480e1f514355;p=features.git Fix typos --- diff --git a/lib/doc/Additional.lyx b/lib/doc/Additional.lyx index dfbf65670c..f9cf459244 100644 --- a/lib/doc/Additional.lyx +++ b/lib/doc/Additional.lyx @@ -144,7 +144,7 @@ Additional LyX Features \end_layout \begin_layout Subtitle -Version 2.0.x +Version 2.1.x \end_layout \begin_layout Author @@ -18966,7 +18966,7 @@ man rcsintro Before you begin to use the version control features in LyX, you should be familiar with RCS/CVS/SVN usage. The implementation in LyX assumes a recent version of the GNU RCS or CVS/SVN - package—no guarantees are made for older versions. + package — no guarantees are made for older versions. Most of the log messages are not currently displayed after operations — you can check them in the Messages pane if unsure. Regular users of version control will appreciate VC toolbar, which can @@ -19099,7 +19099,6 @@ When you are finished editing a file, you check in your changes. This is stored in the history log. The version number is bumped, your changes are applied to the master RCS file, the document is unlocked and set to Read-Only mode. - \end_layout \begin_layout Standard @@ -19120,7 +19119,6 @@ By doing this you lock the document so that only you can edit it. You will usually continue editing for a while and when you are finished you check in your changes. The status line is changed to reflect that you have locked the file. - \end_layout \begin_layout Standard @@ -19157,7 +19155,6 @@ Undo Last Checkin This makes as if the last check in never happened. No changes are made to the document loaded into LyX, but the last version is removed from the master RCS file. - \end_layout \begin_layout Standard @@ -19197,7 +19194,7 @@ LyX supports RCS version number, author name, date and time of last commit. rlog -r \family default . - For other details see + See \begin_inset CommandInset ref LatexCommand ref reference "sub:VCS-Revision-Information" @@ -19244,7 +19241,7 @@ If you start from scratch with CVS you have to create your repository and If your documents are under revision control and others are using the same repository problems arise when different changes to the same document at the same location happen. - Standard CVS repositories doesn't operate with a file locking mechanism. + Standard CVS repositories don't operate with a file locking mechanism. This may be surprising, but conflicts only occur if people disagree on the proper content of the same part of a document. So, if co-workers are used to communicate regularly, these conflicts occur @@ -19717,6 +19714,27 @@ cvs log "" is shown in a browser. \end_layout +\begin_layout Subsubsection +Revision info +\end_layout + +\begin_layout Standard +LyX supports CVS version number, author name, date and time of last commit. + All those are extracted from +\family typewriter +cvs log -r +\family default +. + See +\begin_inset CommandInset ref +LatexCommand ref +reference "sub:VCS-Revision-Information" + +\end_inset + + for details. +\end_layout + \begin_layout Subsection SVN commands in LyX \end_layout @@ -19772,7 +19790,6 @@ R egister \family default item is not visible. - \end_layout \begin_layout Standard @@ -19783,7 +19800,6 @@ This command registers in SVN your document ONLY in case you have already \family default file exists). This means you have to checkout the archive by yourself. - \end_layout \begin_layout Standard @@ -19812,7 +19828,6 @@ Read man svn \family default to understand the switches. - \end_layout \begin_layout Subsubsection @@ -19897,7 +19912,6 @@ Revert To Repository Version This will discard all changes made to the document since the last check in. You get a warning before changes are discarded. - \end_layout \begin_layout Standard diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp index 244dff156d..8ef5439332 100644 --- a/src/LyXVC.cpp +++ b/src/LyXVC.cpp @@ -188,7 +188,7 @@ string LyXVC::checkIn() if (response.empty()) response = empty; //shell collisions - response = subst(response, from_utf8("\""), from_utf8("\\\"")); + response = subst(response, from_ascii("\""), from_ascii("\\\"")); log = vcs->checkIn(to_utf8(response)); // Reserve empty string for cancel button diff --git a/src/LyXVC.h b/src/LyXVC.h index a860bda8ec..860a880051 100644 --- a/src/LyXVC.h +++ b/src/LyXVC.h @@ -79,17 +79,17 @@ public: /// Unlock and commit changes. Returns log. std::string checkIn(); - /// Does the current VC supports this operation? + /// Does the current VC support this operation? bool checkInEnabled() const; /// Lock/update and prepare to edit document. Returns log. std::string checkOut(); - /// Does the current VC supports this operation? + /// Does the current VC support this operation? bool checkOutEnabled() const; /// Synchronize the whole archive with repository std::string repoUpdate(); - /// Does the current VC supports this operation? + /// Does the current VC support this operation? bool repoUpdateEnabled() const; /** @@ -105,7 +105,7 @@ public: /// Undo last check-in. void undoLast(); - /// Does the current VC supports this operation? + /// Does the current VC support this operation? bool undoLastEnabled() const; /** * Prepare revision rev of the file into newly created temporary file @@ -119,7 +119,7 @@ public: * for retrieving normal revisions (rev>0) or backtracking (rev<0). */ bool prepareFileRevision(std::string const & rev, std::string & f); - /// Does the current VC supports this operation? + /// Does the current VC support this operation? bool prepareFileRevisionEnabled(); /** diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp index 98417074a1..3e1bca672d 100644 --- a/src/VCBackend.cpp +++ b/src/VCBackend.cpp @@ -154,7 +154,7 @@ FileName const RCS::findFile(FileName const & file) bool RCS::retrieve(FileName const & file) { LYXERR(Debug::LYXVC, "LyXVC::RCS: retrieve.\n\t" << file); - // The caller ensures that file does not exists, so no need to check that. + // The caller ensures that file does not exist, so no need to check that. return doVCCommandCall("co -q -r " + quoteName(file.toFilesystemEncoding()), FileName()) == 0; } @@ -557,7 +557,7 @@ void CVS::scanMaster() bool CVS::retrieve(FileName const & file) { LYXERR(Debug::LYXVC, "LyXVC::CVS: retrieve.\n\t" << file); - // The caller ensures that file does not exists, so no need to check that. + // The caller ensures that file does not exist, so no need to check that. return doVCCommandCall("cvs -q update " + quoteName(file.toFilesystemEncoding()), file.onlyPath()) == 0; } @@ -1145,7 +1145,7 @@ bool SVN::isLocked() const bool SVN::retrieve(FileName const & file) { LYXERR(Debug::LYXVC, "LyXVC::SVN: retrieve.\n\t" << file); - // The caller ensures that file does not exists, so no need to check that. + // The caller ensures that file does not exist, so no need to check that. return doVCCommandCall("svn update -q --non-interactive " + quoteName(file.onlyFileName()), file.onlyPath()) == 0; } @@ -1403,12 +1403,13 @@ string SVN::lockingToggle() return string(); tmpf.erase(); - frontend::Alert::warning(_("VCN File Locking"), + frontend::Alert::warning(_("SVN File Locking"), (locking ? _("Locking property unset.") : _("Locking property set.")) + "\n" + _("Do not forget to commit the locking property into the repository."), true); - return string("SVN: ") + N_("Locking property set."); + return string("SVN: ") + (locking ? + N_("Locking property unset.") : N_("Locking property set.")); }