maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Title case (fixes #27569)

Browse source
This commit is contained in:
Christof Marti 2017-05-31 10:39:31 -07:00
parent 6aa3aca8cc
commit 005c78dbf0
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
extensions/merge-conflict/package.nls.json
View file

@ -1,14 +1,14 @@
{
"command.category": "Merge Conflict",
"command.accept.all-incoming": "Accept all incoming",
"command.accept.all-both": "Accept all both",
"command.accept.current": "Accept current",
"command.accept.incoming": "Accept incoming",
"command.accept.selection": "Accept selection",
"command.accept.all-incoming": "Accept All Incoming",
"command.accept.all-both": "Accept All Both",
"command.accept.current": "Accept Current",
"command.accept.incoming": "Accept Incoming",
"command.accept.selection": "Accept Selection",
"command.accept.both": "Accept Both",
"command.next": "Next conflict",
"command.previous": "Previous conflict",
"command.compare": "Compare current conflict",
"command.next": "Next Conflict",
"command.previous": "Previous Conflict",
"command.compare": "Compare Current Conflict",
"config.title": "Merge Conflict",
"config.codeLensEnabled": "Enable/disable merge conflict block CodeLens within editor",
"config.decoratorsEnabled": "Enable/disable merge conflict decorators within editor"

8
extensions/merge-conflict/src/codelensProvider.ts
View file

@ -63,25 +63,25 @@ export default class MergeConflictCodeLensProvider implements vscode.CodeLensPro
conflicts.forEach(conflict => {
let acceptCurrentCommand: vscode.Command = {
command: 'merge-conflict.accept.current',
title: localize('acceptCurrentChange', 'Accept current change'),
title: localize('acceptCurrentChange', 'Accept Current Change'),
arguments: ['known-conflict', conflict]
};
let acceptIncomingCommand: vscode.Command = {
command: 'merge-conflict.accept.incoming',
title: localize('acceptIncomingChange', 'Accept incoming change'),
title: localize('acceptIncomingChange', 'Accept Incoming Change'),
arguments: ['known-conflict', conflict]
};
let acceptBothCommand: vscode.Command = {
command: 'merge-conflict.accept.both',
title: localize('acceptBothChanges', 'Accept both changes'),
title: localize('acceptBothChanges', 'Accept Both Changes'),
arguments: ['known-conflict', conflict]
};
let diffCommand: vscode.Command = {
command: 'merge-conflict.compare',
title: localize('compareChanges', 'Compare changes'),
title: localize('compareChanges', 'Compare Changes'),
arguments: [conflict]
};

2
extensions/merge-conflict/src/commandHandler.ts
View file

@ -90,7 +90,7 @@ export default class CommandHandler implements vscode.Disposable {
range = conflict.incoming.content;
const rightUri = leftUri.with({ query: JSON.stringify(range) });
const title = localize('compareChangesTitle', '{0}: Current changes ⟷ Incoming changes', fileName);
const title = localize('compareChangesTitle', '{0}: Current Changes ⟷ Incoming Changes', fileName);
vscode.commands.executeCommand('vscode.diff', leftUri, rightUri, title);
}

4
extensions/merge-conflict/src/mergeDecorator.ts
View file

@ -80,7 +80,7 @@ export default class MergeDectorator implements vscode.Disposable {
backgroundColor: new vscode.ThemeColor('merge.currentHeaderBackground'),
color: new vscode.ThemeColor('editor.foreground'),
after: {
contentText: ' ' + localize('currentChange', '(Current change)'),
contentText: ' ' + localize('currentChange', '(Current Change)'),
color: new vscode.ThemeColor('descriptionForeground')
}
});
@ -95,7 +95,7 @@ export default class MergeDectorator implements vscode.Disposable {
color: new vscode.ThemeColor('editor.foreground'),
isWholeLine: this.decorationUsesWholeLine,
after: {
contentText: ' ' + localize('incomingChange', '(Incoming change)'),
contentText: ' ' + localize('incomingChange', '(Incoming Change)'),
color: new vscode.ThemeColor('descriptionForeground')
}
});