From 81bff38d56fcb583819daddb518604d799888840 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Wed, 14 Oct 2009 20:08:37 +0000 Subject: [PATCH] in trunk too git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31622 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/scons/scons_manifest.py | 2 +- lib/Makefile.am | 2 +- lib/doc/Additional.lyx | 7 +++---- lib/ui/stdmenus.inc | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py index 824a1f5cae..81d9101787 100644 --- a/development/scons/scons_manifest.py +++ b/development/scons/scons_manifest.py @@ -1528,7 +1528,7 @@ lib_images_files = Split(''' vc-check-out.png vc-locking-toggle.png vc-register.png - vc-repo-synchro.png + vc-repo-update.png vc-revert.png view-others.png ''') diff --git a/lib/Makefile.am b/lib/Makefile.am index 8a450bcedb..623c567f84 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -433,7 +433,7 @@ dist_images_DATA = \ images/vc-check-out.png \ images/vc-locking-toggle.png \ images/vc-register.png \ - images/vc-repo-synchro.png \ + images/vc-repo-update.png \ images/vc-revert.png \ images/view-others.png diff --git a/lib/doc/Additional.lyx b/lib/doc/Additional.lyx index a5e22c662d..d78ff2116b 100644 --- a/lib/doc/Additional.lyx +++ b/lib/doc/Additional.lyx @@ -18405,7 +18405,7 @@ Control ssh, you will be asked in terminal window. LyX was tested against SVN 1.5 and 1.6 \begin_inset Foot -status open +status collapsed \begin_layout Plain Layout Most of the commands will work with 1.4 too, see @@ -18649,9 +18649,8 @@ Update local directory from repository \end_inset - 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. + command updates the whole directory and in case of merge conflicts local + version of the files are left, so no unintended data loss occurs. If local changes are detected user is warned before update starts. \end_layout diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc index 7f30b5916f..070763d180 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 from repository" "vc-repo-update" + OptItem "Update local directory from repository|d" "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" -- 2.39.2