You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
consthandle=this.notificationService.prompt(Severity.Warning,localize('conflicts detected',"Unable to sync due to conflicts in {0}. Please resolve them to continue.",conflictsArea),
293
+
consthandle=this.notificationService.prompt(Severity.Warning,localize('conflicts detected',"Unable to sync due to conflicts in {0}. Please resolve them to continue.",conflictsArea.toLowerCase()),
294
294
[
295
295
{
296
296
label: localize('accept remote',"Accept Remote"),
@@ -1133,8 +1133,8 @@ class AcceptChangesContribution extends Disposable implements IEditorContributio
? localize('confirm replace and overwrite local',"Would you like to accept Remote {0} and replace Local {1}?",syncAreaLabel,syncAreaLabel)
1137
-
: localize('confirm replace and overwrite remote',"Would you like to accept Local {0} and replace Remote {1}?",syncAreaLabel,syncAreaLabel),
1136
+
? localize('confirm replace and overwrite local',"Would you like to accept Remote {0} and replace Local {1}?",syncAreaLabel.toLowerCase(),syncAreaLabel.toLowerCase())
1137
+
: localize('confirm replace and overwrite remote',"Would you like to accept Local {0} and replace Remote {1}?",syncAreaLabel.toLowerCase(),syncAreaLabel.toLowerCase()),
0 commit comments