Skip to content

Commit 0e679d8

Browse files
committed
Aligns language to inline blame
1 parent 67195ef commit 0e679d8

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,41 +66,41 @@
6666
"configuration": [
6767
{
6868
"id": "current-line-blame",
69-
"title": "Current Line Blame",
69+
"title": "Inline Blame",
7070
"order": 10,
7171
"properties": {
7272
"gitlens.currentLine.enabled": {
7373
"type": "boolean",
7474
"default": true,
75-
"markdownDescription": "Specifies whether to provide a blame annotation for the current line, by default. Use the `Toggle Line Blame Annotations` command (`gitlens.toggleLineBlame`) to toggle the annotations on and off for the current window",
75+
"markdownDescription": "Specifies whether to provide an inline blame annotation for the current line, by default. Use the `Toggle Line Blame Annotations` command (`gitlens.toggleLineBlame`) to toggle the annotations on and off for the current window",
7676
"scope": "window",
7777
"order": 10
7878
},
7979
"gitlens.currentLine.pullRequests.enabled": {
8080
"type": "boolean",
8181
"default": true,
82-
"markdownDescription": "Specifies whether to provide information about the Pull Request (if any) that introduced the commit in the current line blame annotation. Requires a connection to a supported remote service (e.g. GitHub)",
82+
"markdownDescription": "Specifies whether to provide information about the Pull Request (if any) that introduced the commit in the inline blame annotation. Requires a connection to a supported remote service (e.g. GitHub)",
8383
"scope": "window",
8484
"order": 20
8585
},
8686
"gitlens.currentLine.format": {
8787
"type": "string",
8888
"default": "${author, }${agoOrDate}${' via 'pullRequest}${ • message|50?}",
89-
"markdownDescription": "Specifies the format of the current line blame annotation. See [_Commit Tokens_](https://github.com/gitkraken/vscode-gitlens/wiki/Custom-Formatting#commit-tokens) in the GitLens docs. Date formatting is controlled by the `#gitlens.currentLine.dateFormat#` setting",
89+
"markdownDescription": "Specifies the format of the inline blame annotation. See [_Commit Tokens_](https://github.com/gitkraken/vscode-gitlens/wiki/Custom-Formatting#commit-tokens) in the GitLens docs. Date formatting is controlled by the `#gitlens.currentLine.dateFormat#` setting",
9090
"scope": "window",
9191
"order": 30
9292
},
9393
"gitlens.currentLine.uncommittedChangesFormat": {
9494
"type": "string",
9595
"default": null,
96-
"markdownDescription": "Specifies the uncommitted changes format of the current line blame annotation. See [_Commit Tokens_](https://github.com/gitkraken/vscode-gitlens/wiki/Custom-Formatting#commit-tokens) in the GitLens docs. Date formatting is controlled by the `#gitlens.currentLine.dateFormat#` setting.\n\n**NOTE**: Setting this to an empty string will disable current line blame annotations for uncommitted changes.",
96+
"markdownDescription": "Specifies the uncommitted changes format of the inline blame annotation. See [_Commit Tokens_](https://github.com/gitkraken/vscode-gitlens/wiki/Custom-Formatting#commit-tokens) in the GitLens docs. Date formatting is controlled by the `#gitlens.currentLine.dateFormat#` setting.\n\n**NOTE**: Setting this to an empty string will disable inline blame annotations for uncommitted changes.",
9797
"scope": "window",
9898
"order": 31
9999
},
100100
"gitlens.currentLine.scrollable": {
101101
"type": "boolean",
102102
"default": true,
103-
"markdownDescription": "Specifies whether the current line blame annotation can be scrolled into view when it is outside the viewport. **NOTE**: Setting this to `false` will inhibit the hovers from showing over the annotation; Set `#gitlens.hovers.currentLine.over#` to `line` to enable the hovers to show anywhere over the line.",
103+
"markdownDescription": "Specifies whether the inline blame annotation can be scrolled into view when it is outside the viewport. **NOTE**: Setting this to `false` will inhibit the hovers from showing over the annotation; Set `#gitlens.hovers.currentLine.over#` to `line` to enable the hovers to show anywhere over the line.",
104104
"scope": "window",
105105
"order": 40
106106
},
@@ -110,7 +110,7 @@
110110
"null"
111111
],
112112
"default": null,
113-
"markdownDescription": "Specifies how to format absolute dates (e.g. using the `${date}` token) for the current line blame annotation. See the [Moment.js docs](https://momentjs.com/docs/#/displaying/format/) for supported formats",
113+
"markdownDescription": "Specifies how to format absolute dates (e.g. using the `${date}` token) for the cinline blame annotation. See the [Moment.js docs](https://momentjs.com/docs/#/displaying/format/) for supported formats",
114114
"scope": "window",
115115
"order": 50
116116
}
@@ -3444,7 +3444,7 @@
34443444
},
34453445
"currentLine": {
34463446
"type": "boolean",
3447-
"description": "Specifies whether to show a blame annotation for the current line when this user-defined mode is active"
3447+
"description": "Specifies whether to show an inline blame annotation for the current line when this user-defined mode is active"
34483448
},
34493449
"hovers": {
34503450
"type": "boolean",
@@ -3477,7 +3477,7 @@
34773477
},
34783478
"currentLine": {
34793479
"type": "boolean",
3480-
"description": "Specifies whether to show a blame annotation for the current line when this user-defined mode is active"
3480+
"description": "Specifies whether to show an inline blame annotation for the current line when this user-defined mode is active"
34813481
},
34823482
"hovers": {
34833483
"type": "boolean",
@@ -3528,7 +3528,7 @@
35283528
},
35293529
"currentLine": {
35303530
"type": "boolean",
3531-
"description": "Specifies whether to show a blame annotation for the current line when this user-defined mode is active"
3531+
"description": "Specifies whether to show an inline blame annotation for the current line when this user-defined mode is active"
35323532
},
35333533
"hovers": {
35343534
"type": "boolean",
@@ -4024,7 +4024,7 @@
40244024
},
40254025
{
40264026
"id": "gitlens.trailingLineBackgroundColor",
4027-
"description": "Specifies the background color of the blame annotation for the current line",
4027+
"description": "Specifies the background color of the inline blame annotation for the current line",
40284028
"defaults": {
40294029
"dark": "#00000000",
40304030
"light": "#00000000",
@@ -4033,7 +4033,7 @@
40334033
},
40344034
{
40354035
"id": "gitlens.trailingLineForegroundColor",
4036-
"description": "Specifies the foreground color of the blame annotation for the current line",
4036+
"description": "Specifies the foreground color of the inline blame annotation for the current line",
40374037
"defaults": {
40384038
"dark": "#99999959",
40394039
"light": "#99999959",

src/webviews/apps/settings/partials/current-line.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
data-setting
99
data-add-settings-off="hovers.currentLine.over=line"
1010
/>
11-
<label for="currentLine.enabled">Current Line Blame</label>
11+
<label for="currentLine.enabled">Inline Blame</label>
1212
<a
1313
class="link__learn-more"
1414
title="Learn more"

src/webviews/apps/settings/settings.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ <h2>Jump to</h2>
110110
class="sidebar__jump-link"
111111
data-action="jump"
112112
href="#current-line"
113-
title="Jump to Current Line Blame settings"
114-
>Current Line Blame</a
113+
title="Jump to Inline Blame settings"
114+
>Inline Blame</a
115115
>
116116
</li>
117117
<li>

0 commit comments

Comments
 (0)