[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: [LCFC] templates://etckeeper/{templates}



Christian Perrier wrote:
> This is the last call for comments for the review of debconf
> templates for etckeeper.


> Template: etckeeper/commit_failed
[...]
>  You should manually solve issues with the uncommitted changes
>  before continuing.

"Solve issues" is mildly unidiomatic; you "solve" problems or
puzzles, but "resolve" issues or conflicts.  Joey had it referring
to resolving the changes, which is a common usage in VCS-ese, but if
we're going to de-jargonise I think it would be better as:

   You should manually resolve the issues with the uncommitted changes
   before continuing.

-- 
JBR	with qualifications in linguistics, experience as a Debian
	sysadmin, and probably no clue about this particular package
--- ../etckeeper.old/debian/templates	2007-11-11 01:08:20.000000000 +0000
+++ debian/templates	2007-12-05 11:29:59.000000000 +0000
@@ -1,16 +1,19 @@
 Template: etckeeper/unclean
 Type: boolean
 Default: true
+#flag:translate!:3
 _Description: Commit changed files in /etc to git?
- etckeeper has detected that /etc contains uncommitted files
- or other changes. It's best to have everything in /etc committed
- to git before running apt. etckeeper can add any new files listed below,
- and commit all the changed files for you.
+ The /etc directory contains uncommitted files
+ or other changes. All files in /etc should be committed
+ to git before running APT. The following files may be added
+ automatically now:
  .
  ${STATUS}
 
 Template: etckeeper/commit_failed
 Type: error
-_Description: git commit failed
- etckeeper failed to commit changes in /etc using git.
- You may want to resolve the uncommitted changes by hand before continuing.
+_Description: Commit failed
+ An attempt to commit /etc changes to git failed.
+ .
+ You should manually resolve the issues with the uncommitted changes
+ before continuing.
--- ../etckeeper.old/debian/control	2007-11-11 06:12:12.000000000 +0000
+++ debian/control	2007-12-05 11:21:07.000000000 +0000
@@ -11,11 +11,10 @@
 Architecture: all
 Section: admin
 Depends: metastore, git-core, ${misc:Depends}, debconf | debconf-2.0
-Description: store /etc in git
- etckeeper is a collection of tools to let /etc be stored in a git
- repository. It hooks into apt to automatically commit changes made to /etc
- during package upgrades. It uses `metastore` to track file metadata that
+Description: tool to keep /etc changes in git
+ The etckeeper program is a collection of tools to let /etc be stored in a git
+ repository. It hooks into APT to automatically commit changes made to /etc
+ during package upgrades. It uses 'metastore' to track file metadata that
  git does not normally support, but that is important for /etc, such as the
- permissions of `/etc/shadow`. It's quite modular and configurable, while
+ permissions of /etc/shadow. It's quite modular and configurable, while
  also being simple to use if you understand the basics of working with git.
-
Template: etckeeper/unclean
Type: boolean
Default: true
#flag:translate!:3
_Description: Commit changed files in /etc to git?
 The /etc directory contains uncommitted files
 or other changes. All files in /etc should be committed
 to git before running APT. The following files may be added
 automatically now:
 .
 ${STATUS}

Template: etckeeper/commit_failed
Type: error
_Description: Commit failed
 An attempt to commit /etc changes to git failed.
 .
 You should manually resolve the issues with the uncommitted changes
 before continuing.
Source: etckeeper
Section: admin
Priority: optional
Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.9.0)
Maintainer: Joey Hess <joeyh@debian.org>
Standards-Version: 3.7.2
Vcs-Git: git://git.kitenet.net/etckeeper
Homepage: http://kitenet.net/~joey/code/etckeeper/

Package: etckeeper
Architecture: all
Section: admin
Depends: metastore, git-core, ${misc:Depends}, debconf | debconf-2.0
Description: tool to keep /etc changes in git
 The etckeeper program is a collection of tools to let /etc be stored in a git
 repository. It hooks into APT to automatically commit changes made to /etc
 during package upgrades. It uses 'metastore' to track file metadata that
 git does not normally support, but that is important for /etc, such as the
 permissions of /etc/shadow. It's quite modular and configurable, while
 also being simple to use if you understand the basics of working with git.

Reply to: