1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
import { __, s__ } from '~/locale';
export const GENERIC_ERROR = __('Something went wrong on our end. Please try again!');
export const DIFF_FILE_HEADER = {
optionsDropdownTitle: __('Options'),
fileReviewLabel: __('Viewed'),
fileReviewTooltip: __('Collapses this file (only for you) until it’s changed again.'),
};
export const DIFF_FILE = {
tooLarge: s__('MRDiffFile|Changes are too large to be shown.'),
blobView: s__('MRDiffFile|View file @ %{commitSha}'),
editInFork: __(
"You're not allowed to %{tag_start}edit%{tag_end} files in this project directly. Please fork this project, make your changes there, and submit a merge request.",
),
fork: __('Fork'),
cancel: __('Cancel'),
autoCollapsed: __('Files with large changes are collapsed by default.'),
expand: __('Expand file'),
};
export const SETTINGS_DROPDOWN = {
whitespace: __('Show whitespace changes'),
fileByFile: __('Show one file at a time'),
preferences: __('Preferences'),
};
export const CONFLICT_TEXT = {
both_modified: __('Conflict: This file was modified in both the source and target branches.'),
modified_source_removed_target: __(
'Conflict: This file was modified in the source branch, but removed in the target branch.',
),
modified_target_removed_source: __(
'Conflict: This file was removed in the source branch, but modified in the target branch.',
),
renamed_same_file: __(
'Conflict: This file was renamed differently in the source and target branches.',
),
removed_source_renamed_target: __(
'Conflict: This file was removed in the source branch, but renamed in the target branch.',
),
removed_target_renamed_source: __(
'Conflict: This file was renamed in the source branch, but removed in the target branch.',
),
both_added: __(
'Conflict: This file was added both in the source and target branches, but with different contents.',
),
};
|
