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
|
# These templates have been reviewed by the debian-l10n-english
# team
#
# If modifications/additions/rewording are needed, please ask
# for an advice to debian-l10n-english@lists.debian.org
#
# Even minor modifications require translation updates and such
# changes should be coordinated with translators and reviewers.
Template: ucf/title
Type: title
_Description: Modified configuration file
Template: ucf/changeprompt_threeway
Type: select
# Translators, please keep translations *short* (less than 65 columns)
__Choices: install the package maintainer's version, keep the local version currently installed, show the differences between the versions, show a side-by-side difference between the versions, show a 3-way difference between available versions, do a 3-way merge between available versions, start a new shell to examine the situation
Choices-C: install_new, keep_current, diff, sdiff, diff_threeway, merge_threeway, shell
Default: keep_current
_Description: What do you want to do about modified configuration file ${BASENAME}?
A new version (${NEW}) of configuration file ${FILE} is available, but the version installed
currently has been locally modified.
Template: ucf/changeprompt
Type: select
__Choices: install the package maintainer's version, keep the local version currently installed, show the differences between the versions, show a side-by-side difference between the versions, start a new shell to examine the situation
Choices-C: install_new, keep_current, diff, sdiff, shell
Default: keep_current
_Description: What do you want to do about modified configuration file ${BASENAME}?
${BASENAME}: A new version (${NEW}) of configuration file ${FILE} is available, but the version installed
currently has been locally modified.
Template: ucf/show_diff
Type: note
#flag:translate!:2
_Description: Line by line differences between versions
${DIFF}
Template: ucf/conflicts_found
Type: error
_Description: Conflicts found in three-way merge
Conflicts found during three-way merge! Please edit `${dest_file}' and sort
them out manually.
.
The file `${dest_file}.${ERR_SUFFIX}' has a record of the failed merge of
the configuration file.
|
