Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMalgorzata Janczarska2011-11-17 13:37:16 +0000
committerTomasz Zarna2011-11-17 13:37:16 +0000
commitcfa9a16b8044938883a013f0f31a1919520603be (patch)
tree5e9660f8dc0b2e01ee155d16ea0404ea3e7445c9 /bundles/org.eclipse.team.core/src/org/eclipse/team/internal
parent3f762b893c48833cd921ed0dda5d75a9a9f5524f (diff)
downloadeclipse.platform.team-cfa9a16b8044938883a013f0f31a1919520603be.tar.gz
eclipse.platform.team-cfa9a16b8044938883a013f0f31a1919520603be.tar.xz
eclipse.platform.team-cfa9a16b8044938883a013f0f31a1919520603be.zip
bug 263919: Synchronize must not abort when log-in to repository failsv20111117-1337
Diffstat (limited to 'bundles/org.eclipse.team.core/src/org/eclipse/team/internal')
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/Messages.java2
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties2
2 files changed, 4 insertions, 0 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/Messages.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/Messages.java
index f547d578a..5c550403e 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/Messages.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/Messages.java
@@ -88,6 +88,8 @@ public class Messages extends NLS {
public static String SyncInfoTree_0;
public static String ResourceVariantTreeSubscriber_1;
public static String ResourceVariantTreeSubscriber_2;
+ public static String ResourceVariantTreeSubscriber_3;
+ public static String ResourceVariantTreeSubscriber_4;
public static String SyncByteConverter_1;
public static String BatchingLock_11;
public static String SubscriberEventHandler_12;
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties
index e3bacf8ef..608e4b55f 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties
@@ -77,6 +77,8 @@ CachedResourceVariant_1=As error occurred computing the content type of resource
SyncInfoTree_0=Sync info is missing for resource {0}.
ResourceVariantTreeSubscriber_1=Problems reported while synchronizing {0}. {1} of {2} resources were synchronized.
ResourceVariantTreeSubscriber_2=An error occurred synchronizing {0}: {1}
+ResourceVariantTreeSubscriber_3=Problems reported while synchronizing {0}. {1} of {2} resources were synchronized, number of synchronizations canceled: {3}.
+ResourceVariantTreeSubscriber_4=Synchronization of {0} canceled because login was canceled.
SyncByteConverter_1=Malformed sync byte format detected in {0}
BatchingLock_11=An error occurred while flushing batched changes
SubscriberEventHandler_12=Synchronization state collection canceled by a user action.

Back to the top