Please find, for review, the debconf templates of ucf. Please note that the review changes Choices names which may need adaptations of the package's code. To the maintainer: we suggest you wait for the end of this review and translation update process before making changes. Of course, feel free to comment about the proposed changes. This review will last from Tuesday, May 15, 2007 to Friday, May 25, 2007. Please send reviews as unified diffs (diff -u) against the original files. Comments about your proposed changes will be appreciated. Your review should be sent as an answer to this mail. When appropriate, I will send intermediate requests for review, with "[RFRn]" (n>=2) as a subject tag. When we will reach a consensus, I send a "Last Chance For Comments" mail with "[LCFC]" as a subject tag. Finally, the reviewed templates will be sent to the package maintainer as a bug report, and a mail will be sent to this list with "[BTS]" as a subject tag. Rationale: --- /home/bubulle/travail/debian/rewrite/INTENT/ucf/ucf.old/debian/templates.master 2007-05-06 07:51:03.688498603 +0200 +++ /home/bubulle/travail/debian/rewrite/INTENT/ucf/ucf/debian/templates.master 2007-05-15 07:31:41.537584477 +0200 @@ -5,21 +5,23 @@ Template: ucf/changeprompt_threeway Type: select -__Choices: install the package maintainer's version, keep your currently-installed version, show the differences between the versions, show a side-by-side difference between the versions, show a 3 way difference between available versions of the file, do a 3 way merge between available versions of the file [Very Experimental], start a new shell to examine the situation -Default: keep your currently-installed version -_Description: What would you like to do about ${BASENAME}? - A new version of configuration file ${FILE} is available, but your version - has been locally modified. +# Translators, please keep translations *short* (less than 65 columns) Important comment: the choices are rather long and translators will have hard times keepign them short, which is required for them to fit on 80x25 screens when using the dialog interface of debconf +__Choices: install the package maintainer's version, keep the currently installed version, 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 (experimental), start a new shell to examine the situation "currently-installed": I'm not sure that the hyphen is needed Remplace "you/your" by a more impersonal wording. After all, most of the time, the system is not "my" system..:-) "3-way": use an hyphen as I think that *here* it is needed shorten down some choices: remove "of the file", transform the "Very experimental" to "experimental" +Default: keep the currently installed version +_Description: Action for ${BASENAME}: Important change: prompts for select/multiselect should not be questions. + A new version of the ${FILE} configuration file is available, but the local + copy has been modified. Remove personnalization ("your local file") Template: ucf/changeprompt Type: select -__Choices: install the package maintainer's version, keep your currently-installed version, show the differences between the versions, show a side-by-side difference between the versions, start a new shell to examine the situation -Default: keep your currently-installed version -_Description: What would you like to do about ${BASENAME}? - A new version of configuration file ${FILE} is available, but your version - has been locally modified. +__Choices: install the package maintainer's version, keep the currently installed version, show the differences between the versions, show a side-by-side difference between the versions, start a new shell to examine the situation Same rationale than above +Default: keep the currently installed version +_Description: Action for ${BASENAME}: Ditto. + A new version of the ${FILE} configuration file is available, but the local + copy has been modified. I think that "new version of configuration file ${FILE}" with the name of the file following 'configuration file' is less correct than my proposal. Template: ucf/show_diff Type: note -_Description: The differences +#flag:translate!:2 +_Description: File differences ${DIFF} Matter of taste. I find my wording more neutral and more written as a title, which it is. Avoid translating the variable to minimize translator's errors. See po-debconf(5). --- /home/bubulle/travail/debian/rewrite/INTENT/ucf/ucf.old/debian/control 2007-05-06 07:51:03.692498633 +0200 +++ /home/bubulle/travail/debian/rewrite/INTENT/ucf/ucf/debian/control 2007-05-15 07:28:09.463443986 +0200 @@ -11,31 +11,31 @@ Architecture: all Depends: debconf (>= 1.4.72) | debconf-2.0, coreutils (>= 5.91) Recommends: debconf-utils -Description: Update Configuration File: preserves user changes to config files. - Debian policy states that configuration files must preserve user - changes during package upgrade. The easy way to achieve this behavior - is to make the configuration file a `conffile', in which case dpkg +Description: preservation of user changes to configuration files I think it's more important to give the package's rationale than explain the acronym. Also avoids a leading capital which is discouraged. + The Debian policy states that configuration files must preserve user + changes during package upgrades. The easy way to achieve this behavior + is to make the configuration file a 'conffile', in which case dpkg "The" Debian policy Remove double spaces (policy we did choose for these reviews) Simpler way for quoting: also a policy we did choose for these reviews. handles the file specially during upgrades, prompting the user as needed. . This is appropriate only if it is possible to distribute a default version that will work for most installations, although some system - administrators may choose to modify it. This implies that the + administrators may choose to modify it. This implies that the default version will be part of the package distribution, and must not be modified by the maintainer scripts during installation (or at any other time). . - This script attempts to provide conffile like handling for files that + This script attempts to provide conffile-like handling for files that I feel like the hyphen is needed here. can not be labelled conffiles, are not shipped in a Debian package, - but handled by the postinst instead. This script allows one to + but handled by the postinst instead. This script allows one to See above maintain files in /etc, preserving user changes and in general offering the same facilities while upgrading that dpkg normally - provides for "conffiles". + provides for 'conffiles'. Consistent quoting . Additionally, this script provides facilities for transitioning a - file that had not been provided conffile like protection to come + file that had not been provided with conffile-like protection to come See above under this schema, and attempts to minimize questions asked at - install time. Indeed, the transitioning facility is better than the + installation time. Indeed, the transitioning facility is better than the Less jargonic. one offered by dpkg while transitioning a file from a non-conffile to conffile status. --
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 currently installed version, 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 (experimental), start a new shell to examine the situation Default: keep the currently installed version _Description: Action for ${BASENAME}: A new version of the ${FILE} configuration file is available, but the local copy has been modified. Template: ucf/changeprompt Type: select __Choices: install the package maintainer's version, keep the currently installed version, show the differences between the versions, show a side-by-side difference between the versions, start a new shell to examine the situation Default: keep the currently installed version _Description: Action for ${BASENAME}: A new version of the ${FILE} configuration file is available, but the local copy has been modified. Template: ucf/show_diff Type: note #flag:translate!:2 _Description: File differences ${DIFF}
--- ../ucf.old/debian/templates.master 2007-05-06 07:51:03.688498603 +0200 +++ debian/templates.master 2007-05-15 07:31:41.537584477 +0200 @@ -5,21 +5,23 @@ Template: ucf/changeprompt_threeway Type: select -__Choices: install the package maintainer's version, keep your currently-installed version, show the differences between the versions, show a side-by-side difference between the versions, show a 3 way difference between available versions of the file, do a 3 way merge between available versions of the file [Very Experimental], start a new shell to examine the situation -Default: keep your currently-installed version -_Description: What would you like to do about ${BASENAME}? - A new version of configuration file ${FILE} is available, but your version - has been locally modified. +# Translators, please keep translations *short* (less than 65 columns) +__Choices: install the package maintainer's version, keep the currently installed version, 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 (experimental), start a new shell to examine the situation +Default: keep the currently installed version +_Description: Action for ${BASENAME}: + A new version of the ${FILE} configuration file is available, but the local + copy has been modified. Template: ucf/changeprompt Type: select -__Choices: install the package maintainer's version, keep your currently-installed version, show the differences between the versions, show a side-by-side difference between the versions, start a new shell to examine the situation -Default: keep your currently-installed version -_Description: What would you like to do about ${BASENAME}? - A new version of configuration file ${FILE} is available, but your version - has been locally modified. +__Choices: install the package maintainer's version, keep the currently installed version, show the differences between the versions, show a side-by-side difference between the versions, start a new shell to examine the situation +Default: keep the currently installed version +_Description: Action for ${BASENAME}: + A new version of the ${FILE} configuration file is available, but the local + copy has been modified. Template: ucf/show_diff Type: note -_Description: The differences +#flag:translate!:2 +_Description: File differences ${DIFF} --- ../ucf.old/debian/control 2007-05-06 07:51:03.692498633 +0200 +++ debian/control 2007-05-15 07:28:09.463443986 +0200 @@ -11,31 +11,31 @@ Architecture: all Depends: debconf (>= 1.4.72) | debconf-2.0, coreutils (>= 5.91) Recommends: debconf-utils -Description: Update Configuration File: preserves user changes to config files. - Debian policy states that configuration files must preserve user - changes during package upgrade. The easy way to achieve this behavior - is to make the configuration file a `conffile', in which case dpkg +Description: preservation of user changes to configuration files + The Debian policy states that configuration files must preserve user + changes during package upgrades. The easy way to achieve this behavior + is to make the configuration file a 'conffile', in which case dpkg handles the file specially during upgrades, prompting the user as needed. . This is appropriate only if it is possible to distribute a default version that will work for most installations, although some system - administrators may choose to modify it. This implies that the + administrators may choose to modify it. This implies that the default version will be part of the package distribution, and must not be modified by the maintainer scripts during installation (or at any other time). . - This script attempts to provide conffile like handling for files that + This script attempts to provide conffile-like handling for files that can not be labelled conffiles, are not shipped in a Debian package, - but handled by the postinst instead. This script allows one to + but handled by the postinst instead. This script allows one to maintain files in /etc, preserving user changes and in general offering the same facilities while upgrading that dpkg normally - provides for "conffiles". + provides for 'conffiles'. . Additionally, this script provides facilities for transitioning a - file that had not been provided conffile like protection to come + file that had not been provided with conffile-like protection to come under this schema, and attempts to minimize questions asked at - install time. Indeed, the transitioning facility is better than the + installation time. Indeed, the transitioning facility is better than the one offered by dpkg while transitioning a file from a non-conffile to conffile status.
Source: ucf XS-VCS-Arch: http://arch.debian.org/arch/private/srivasta/grab/ucf XS-VCS-Browse: http://arch.debian.org/cgi-bin/archzoom.cgi/srivasta@debian.org--lenny/ucf?expand Section: utils Priority: optional Maintainer: Manoj Srivastava <srivasta@debian.org> Build-Depends-Indep: po-debconf, gettext Standards-Version: 3.7.2.0 Package: ucf Architecture: all Depends: debconf (>= 1.4.72) | debconf-2.0, coreutils (>= 5.91) Recommends: debconf-utils Description: preservation of user changes to configuration files The Debian policy states that configuration files must preserve user changes during package upgrades. The easy way to achieve this behavior is to make the configuration file a 'conffile', in which case dpkg handles the file specially during upgrades, prompting the user as needed. . This is appropriate only if it is possible to distribute a default version that will work for most installations, although some system administrators may choose to modify it. This implies that the default version will be part of the package distribution, and must not be modified by the maintainer scripts during installation (or at any other time). . This script attempts to provide conffile-like handling for files that can not be labelled conffiles, are not shipped in a Debian package, but handled by the postinst instead. This script allows one to maintain files in /etc, preserving user changes and in general offering the same facilities while upgrading that dpkg normally provides for 'conffiles'. . Additionally, this script provides facilities for transitioning a file that had not been provided with conffile-like protection to come under this schema, and attempts to minimize questions asked at installation time. Indeed, the transitioning facility is better than the one offered by dpkg while transitioning a file from a non-conffile to conffile status.
Attachment:
signature.asc
Description: Digital signature