Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDariusz Luksza2011-05-12 18:10:09 -0400
committerChris Aniszczyk2011-05-23 15:42:30 -0400
commite039d918ce4a57136ddd17b8917336af72fb7ae5 (patch)
treea69f4fee4338cd90282e6a8bcc8ea12bb7e5a96c /org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
parenta8e1af9c9dcf76a1cb6caa5c759a23ef253f5ab0 (diff)
downloadegit-e039d918ce4a57136ddd17b8917336af72fb7ae5.tar.gz
egit-e039d918ce4a57136ddd17b8917336af72fb7ae5.tar.xz
egit-e039d918ce4a57136ddd17b8917336af72fb7ae5.zip
[sync] Add preference option to disable automatic fetch
Adds preference option to disable automatic fetch before synchronization launch. Also user is informed that he can disable automatic fetch in preferences when fetch failed. Change-Id: I8ca2578e366894081aae120e2ba422d2e90240f5 Signed-off-by: Dariusz Luksza <dariusz@luksza.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties')
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties3
1 files changed, 3 insertions, 0 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
index 6486ef9ef..230643652 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
@@ -145,6 +145,7 @@ GitHistoryPage_IncompleteListTooltip=Not all commits are shown, the limit may be
GitHistoryPage_ListIncompleteWarningMessage=The list is incomplete
GitHistoryPage_ShowSubMenuLabel=&Show
GitPreferenceRoot_automaticallyEnableChangesetModel=Automatically enable chan&ge set grouping in Git synchronizations
+GitPreferenceRoot_fetchBeforeSynchronization=Always launch fetch before synchronization
GitPreferenceRoot_CloningRepoGroupHeader=Cloning Repositories
GitPreferenceRoot_DefaultRepoFolderLabel=Default Repository &folder:
GitPreferenceRoot_DefaultRepoFolderTooltip=This folder will be suggested as parent folder when cloning a Remote Repository
@@ -1278,3 +1279,5 @@ SynchronizeWithMenu_custom=&Custom...
SynchronizeFetchJob_JobName=Fetching changes before synchronization launch
SynchronizeFetchJob_TaskName=Fetching changes for synchronization
SynchronizeFetchJob_SubTaskName=Fetching changes from {0}
+SynchronizeFetchJob_FetchFailedTitle=Fetch from {0} failed
+SynchronizeFetchJob_FetchFailedMessage=Fetch operation failed.\n\nSychronization will be continued based on data that are currently in repository.\n\nYou can disable fetching changes before synchronization in preferences:\nTeam > Git > {0}

Back to the top