From 32d48ba0d7e3e9f334a00107c3591e36ddc69344 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Wed, 14 Oct 2009 19:35:54 +0000 Subject: [PATCH] Sounds better git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31619 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/doc/Additional.lyx | 11 ++++++----- lib/ui/stdmenus.inc | 2 +- lib/ui/stdtoolbars.inc | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/doc/Additional.lyx b/lib/doc/Additional.lyx index f89071adac..a5e22c662d 100644 --- a/lib/doc/Additional.lyx +++ b/lib/doc/Additional.lyx @@ -18589,7 +18589,7 @@ name "sub:SVN-Repo-Update" \end_inset -Update of the local directory checkout with repository +Update of the local directory checkout from repository \begin_inset Foot status collapsed @@ -18644,14 +18644,15 @@ One need to organize the files structure so that all external files are status collapsed \begin_layout Plain Layout -Synchronize local directory with repository +Update local directory from repository \end_layout \end_inset - command firstly reverts all local changes (to avoid merge conflicts aftwards) - and then updates the whole directory structure from the archive. - If local changes are detected user is warned before reversion starts. + command updates the whole directory in which resides your document. + In case of merge conflicts local version of the files are left, so no unintende +d data loss occurs. + If local changes are detected user is warned before update starts. \end_layout \begin_layout Labeling diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc index 87013805ff..7f30b5916f 100644 --- a/lib/ui/stdmenus.inc +++ b/lib/ui/stdmenus.inc @@ -72,7 +72,7 @@ Menuset OptItem "Register...|R" "vc-register" OptItem "Check In Changes...|I" "vc-check-in" OptItem "Check Out for Edit|O" "vc-check-out" - OptItem "Update local directory with repository" "vc-repo-update" + OptItem "Update local directory from repository" "vc-repo-update" OptItem "Revert to Repository Version|v" "vc-revert" OptItem "Undo Last Check In|U" "vc-undo-last" OptItem "Show History...|H" "dialog-show vclog" diff --git a/lib/ui/stdtoolbars.inc b/lib/ui/stdtoolbars.inc index e0a8ca2bc6..bc94474ff2 100644 --- a/lib/ui/stdtoolbars.inc +++ b/lib/ui/stdtoolbars.inc @@ -258,7 +258,7 @@ ToolbarSet Separator Item "Use SVN file locking property" "vc-locking-toggle" Separator - Item "Update local directory with repository" "vc-repo-update" + Item "Update local directory from repository" "vc-repo-update" End Toolbar "math_panels" "Math Panels"