diff options
| author | Manoj Srivastava <srivasta@debian.org> | 2007-09-19 14:55:28 +0000 |
|---|---|---|
| committer | Manoj Srivastava <srivasta@debian.org> | 2007-09-19 14:55:28 +0000 |
| commit | 936c9d1629c6dc736bae88896e66009ce3c3fa35 (patch) | |
| tree | 203274d0c9b8446dcd4e3e70d0184f2a04c6b0e1 /ucf | |
| parent | ac5304ed8790d52f594329796afc0d112af503a9 (diff) | |
Make ucf fit the template
The template (and some of the questions) have been changed; make ucf
itself reflect that.
* ucf (choice_keep_current): Change the name to fit the changed template
(choice_diff_threeway): Ditto
Closes: Bug#443179
git-archimport-id: srivasta@debian.org--lenny/ucf--devel--3.0--patch-1
Diffstat (limited to 'ucf')
| -rwxr-xr-x | ucf | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -195,11 +195,11 @@ fi # These are strings that must match the untranslated choices # of the debconf question. choice_install_new="install the package maintainer's version" -choice_keep_current="keep your currently-installed version" +choice_keep_current="keep the local version currently installed" choice_diff="show the differences between the versions" choice_sdiff="show a side-by-side difference between the versions" choice_diff_threeway="show a 3 way difference between available versions of the file" -choice_merge_threeway="do a 3 way merge between available versions of the file [Very Experimental]" +choice_merge_threeway="do a 3 way merge between available versions (experimental)" choice_shell="start a new shell to examine the situation" |