Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Kinzler2010-10-19 22:42:27 +0000
committerMatthias Sohn2010-10-19 22:42:27 +0000
commit0afe023665d9d2536773a9a10be65b0ea1779cb8 (patch)
treec4d0d3a2b207a1eae6a41216f45b0ce3587d913e /org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
parent989bfc4c0f426ce9dfbf7a42cdadeb69616c8c21 (diff)
downloadegit-0afe023665d9d2536773a9a10be65b0ea1779cb8.tar.gz
egit-0afe023665d9d2536773a9a10be65b0ea1779cb8.tar.xz
egit-0afe023665d9d2536773a9a10be65b0ea1779cb8.zip
Simplify PullResultDialog in case of "already up-to-date"
If fetch and/or merge was not needed during a pull, we shouldn't bother the end user with the complex tables, but simply display a message indicating that everything was up-to-date. Change-Id: Iebb8d5c70b3198b78d12f2e5af29d64b7a359817 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.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.properties2
1 files changed, 2 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 ff312e391..6e0309430 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
@@ -379,8 +379,10 @@ HistoryPreferencePage_title=Git
PullCurrentBranchActionHandler_PullCanceledMessage=The Pull operation was canceled
PullCurrentBranchActionHandler_PullCanceledTitle=Pull Canceled
PullCurrentBranchActionHandler_PullJobname=Pulling branch {0}
+PullResultDialog_NothingToFetchFromLocal=Nothing to fetch (the fetch source is the local Repository)
PullResultDialog_DialogTitle=Pull Result
PullResultDialog_FetchResultGroupHeader=Fetch Result
+PullResultDialog_MergeAlreadyUpToDateMessage=Nothing to merge - everything up to date
PullResultDialog_MergeResultGroupHeader=Merge Result
PushAction_wrongURIDescription=Remote repositories URIs configuration is corrupted.
PushAction_wrongURITitle=Corrupted Configuration

Back to the top