diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 386 | ||||
| -rw-r--r-- | debian/control | 25 | ||||
| -rw-r--r-- | debian/copyright | 4 | ||||
| -rw-r--r-- | debian/cron.daily | 15 | ||||
| -rw-r--r-- | debian/po/cs.po | 24 | ||||
| -rw-r--r-- | debian/po/da.po | 57 | ||||
| -rw-r--r-- | debian/po/de.po | 25 | ||||
| -rw-r--r-- | debian/po/es.po | 85 | ||||
| -rw-r--r-- | debian/po/eu.po | 17 | ||||
| -rw-r--r-- | debian/po/fi.po | 17 | ||||
| -rw-r--r-- | debian/po/fr.po | 51 | ||||
| -rw-r--r-- | debian/po/gl.po | 17 | ||||
| -rw-r--r-- | debian/po/it.po | 40 | ||||
| -rw-r--r-- | debian/po/ja.po | 56 | ||||
| -rw-r--r-- | debian/po/nl.po | 17 | ||||
| -rw-r--r-- | debian/po/pl.po | 47 | ||||
| -rw-r--r-- | debian/po/pt.po | 40 | ||||
| -rw-r--r-- | debian/po/ru.po | 44 | ||||
| -rw-r--r-- | debian/po/sv.po | 29 | ||||
| -rw-r--r-- | debian/po/templates.pot | 17 | ||||
| -rw-r--r-- | debian/po/vi.po | 55 | ||||
| -rw-r--r-- | debian/postinst | 26 | ||||
| -rw-r--r-- | debian/postrm | 31 | ||||
| -rw-r--r-- | debian/preinst | 13 | ||||
| -rw-r--r-- | debian/prerm | 19 | ||||
| -rwxr-xr-x | debian/rules | 5 | ||||
| -rw-r--r-- | debian/templates | 9 |
27 files changed, 1032 insertions, 139 deletions
diff --git a/debian/changelog b/debian/changelog index b1521a3..2dba9a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,388 @@ -etckeeper (0.22) UNRELEASED; urgency=low +etckeeper (0.58) UNRELEASED; urgency=low - * Use new git add -A from git 1.6.0 (Miklos Vajna) + * Changed to store all permissions of files and directories, even those + with standard permissions of 644 and 755. This is unfortunately necessary + in order to support etckeeper init on a checkout that was made with a + nonstandard umask, in which case the files that were expected to be + 644 and 755, won't be. Closes: #649701 + Thanks to Дмитрий Матросов for reporting the bug and developing + a fixup script (attached to the bug) which could be used if you've + already encountered this problem. + * Bugfix for filenames containing single quotes. + * Use git add -A, which automatically removes deleted files, + and avoids a separate call to git add -u. + Thanks to Miklos Vajna, whose patch in 2008 was deferred + because -A was then too new, and languished in a branch until found today. - -- Joey Hess <joeyh@debian.org> Sun, 14 Sep 2008 18:46:08 -0400 + -- Joey Hess <joeyh@debian.org> Fri, 25 Nov 2011 12:00:55 -0400 + +etckeeper (0.57) unstable; urgency=low + + * Use find -path instead of less portable find -wholename. + + -- Joey Hess <joeyh@debian.org> Fri, 04 Nov 2011 17:03:46 -0400 + +etckeeper (0.56) unstable; urgency=low + + * Converted to use dh_python2. Closes: #616800 + * Handle files with % in their names. + + -- Joey Hess <joeyh@debian.org> Tue, 12 Jul 2011 14:38:09 -0400 + +etckeeper (0.55) unstable; urgency=low + + * Fix error propigation to yum, which makes AVOID_COMMIT_BEFORE_INSTALL work. + Closes: https://bugzilla.redhat.com/show_bug.cgi?id=709487 + Thanks, Thomas Moschny + * Avoid being noisy in post-install after automatic yum updates. + (Tuomo Soini) + * Ignore FHS violating prelink.cache and openvpn-status.log. + * Ignore *.LOCK files, as used by selinux policies. + * Add AVOID_SPECIAL_FILE_WARNING to config file, and set it in cron + job to avoid daily noise. (gulikoza) + + -- Joey Hess <joeyh@debian.org> Sun, 19 Jun 2011 15:21:20 -0400 + +etckeeper (0.54) unstable; urgency=low + + * Ignore inssev's FHS violating /etc/init.d/.depend.* files. + Closes: #619407 See #619409 + * Use hg pre-commit hook, rather than its precommit hook, + as the latter is run after the files staged for commit are + determined and so .etckeeper cannot be staged as part of the current + commit. Closes: #621827 + + -- Joey Hess <joeyh@debian.org> Mon, 30 May 2011 18:11:40 -0400 + +etckeeper (0.53) unstable; urgency=low + + [ Joey Hess ] + * Install bzr hook lazily, clean up some compatibility code. (Jelmer Vernooij) + + [ Josh Triplett ] + * Only set environment variables for commit authorship (EMAIL, + GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_COMMITTER_EMAIL) if they don't + already exist. + + [ Joey Hess ] + * Add .pyc and .pyo files to ignore. + * Add lvm/backup and lvm/cache to ignore. Closes: #462355 + * Avoid warning about special or hard linked files that are ignored + by hg. Thanks Sjoerd Mullender for patch. + Closes: https://bugzilla.redhat.com/show_bug.cgi?id=688991 + + -- Joey Hess <joeyh@debian.org> Fri, 18 Mar 2011 15:37:54 -0400 + +etckeeper (0.52) unstable; urgency=low + + * Rewrote 50git-rm to avoid using git ls-files, and thus avoid encoding + problems with filenames. + + -- Joey Hess <joeyh@debian.org> Sun, 06 Feb 2011 00:00:55 -0400 + +etckeeper (0.51) unstable; urgency=low + + * Updated Vietnamese translation of debconf templates. Closes: #601921 + * Improve rpm version change detection. + * Move etckeeper out of sbin, to avoid needing to work around broken + root PATH settings in eg, crontab. Closes: #602438 + * Added Polish translation of debconf templates. Closes: #607563 + + -- Joey Hess <joeyh@debian.org> Sat, 25 Dec 2010 14:39:57 -0400 + +etckeeper (0.50) unstable; urgency=low + + * Add Danish translation of debconf templates. Closes: #597768 + * Ignore /etc/.initctl. Closes: #598121 + * Do not warn about special files or hardlinks if they are ignored by + git. Fixes #549354 for git, but not for other VCSs. + * Set GIT_COMMITTER_EMAIL to root@$hostname to avoid git prompting + the user to configure it in .gitconfig. Closes: #599749 + * Deal with strange systems that include the domain name in the hostname, + by stripping it. Closes: #600026 + + -- Joey Hess <joeyh@debian.org> Wed, 20 Oct 2010 14:06:21 -0400 + +etckeeper (0.49) unstable; urgency=low + + * Ensure that PATH contains the directory containing etckeeper, so + that hook scripts that re-exec etckeeper are guaranteed to find it. + * Ignore -m switch to etckeeper commit, in case someone tries to use + it with that option common to several VCS. Closes: #592050 + * Remove HOME setting in etckeeper. sudo now defaults to setting HOME + itself as of version 1.7.4p4, so it is not necessary for etckeeper + to work around its behavior anymore. (sudo also allows disabling that + for those who enjoy using guns around feet.) Closes: #583899 + * Fix file quoting problem in processing .etckeeper file in init. + + -- Joey Hess <joeyh@debian.org> Mon, 13 Sep 2010 13:10:43 -0400 + +etckeeper (0.48) unstable; urgency=low + + * Fix backwards test for HGUSER. (Mike Rich) + Closes: #589242 + * 'etckeeper vcs' can be used to run arbitrary VCS subcommands + in the etckeeper environment. (Thanks, Stefan Tomanek) + + -- Joey Hess <joeyh@debian.org> Fri, 16 Jul 2010 15:14:05 -0400 + +etckeeper (0.47) unstable; urgency=low + + * Set HOME=~root so that VCS like bzr do not drop root-owned files in + user home directory when sudo etckeeper is run. Closes: #583581 + * hg: Set HGUSER (if not already set) to avoid warning message when + committing. Closes: #533298 + * Both git and bzr default to showing the author of a commit, + and not the committer. So, set the author to the user running sudo + for both. The committer will then be root. + + -- Joey Hess <joeyh@debian.org> Sun, 30 May 2010 16:50:09 -0400 + +etckeeper (0.46) unstable; urgency=low + + * Support etckeeper commit --stdin + * Fix bug where after a large upgrade, etckeeper's automatic commit message + was so long it exceeded command line length limits. Closes: #581678 + + -- Joey Hess <joeyh@debian.org> Sun, 16 May 2010 19:10:57 -0400 + +etckeeper (0.45) unstable; urgency=low + + * Revert darcs to using --logfile again, necessary for multiline commit + messages. Closes: #577915 + * Fix logic error in darcs user code. Closes: #577918 + + -- Joey Hess <joeyh@debian.org> Thu, 15 Apr 2010 11:50:22 -0400 + +etckeeper (0.44) unstable; urgency=low + + * Add example to README of how to automatically push changes to a backup + repository. + * Add fuse lock file to ignore list. + * Changed darcs to specify --author instead of noting the committing + user inside the commit log. + * Add -a to DARCS_COMMIT_OPTIONS so commits are noninteractive by default, + but users who want darcs prompting can disable it. + * Use darcs record -m to specify commit message, instead of using a logfile. + * Closes: #519228 + * Update depends for git-core to git transition. Closes: #577732 + * Avoid using hostname -f, since on Solaris that sets the hostname to -f. + Yay, Unix portability! (Instead, use dnsdomainname if available, and + otherwise, fall back to the unqualified hostname.) + * Other portability fixes for non-GNU tools and OS X. Thanks, Neil Mayhew. + + -- Joey Hess <joeyh@debian.org> Wed, 14 Apr 2010 15:43:14 -0400 + +etckeeper (0.43) unstable; urgency=low + + * Fix cleanup of /var/cache/etckeeper/packagelist.pre-install after + an upgrade where no conffiles are changed. + * Prevent cron job autocommit from happening if pre-install file + is present, to avoid committing state in the middle of an apt run. + Closes: #567538 + * Add /etc/webmin/webmin/oscache to ignore list. Closes: #567255 + * Check owner of tty to determine who has su'd to root when committing, + based on a patch by Jakov Sosic. + * Add apparmor.d/cache/ to default ignores. + * Record real committer username in the darcs log, so that the man page + can say that for every VCS the username is recorded. + + -- Joey Hess <joeyh@debian.org> Thu, 18 Feb 2010 14:01:45 -0500 + +etckeeper (0.42) unstable; urgency=low + + * Deal with removal of the cache directory. Closes: #559418 + * Add ucf backups to ignore list. (See #462355) + * Add webmin fsdump status files to ignore list. Closes: #567000 + * Add *.old to ignore list (See #462355) + * Add *.elc to ignore list (See #491401) + * Add ntp.conf.dhcp and X11/xdm/authdir/authfiles/* to ignore list. + Closes: #491401 + * Fix handling of "#*#" ignores for git and hg. + * Add runit and daemontools supervise files to ignore list. + Closes: #529253 + + -- Joey Hess <joeyh@debian.org> Tue, 26 Jan 2010 16:20:38 -0500 + +etckeeper (0.41) unstable; urgency=low + + * Change etckeeper uninit to not remove .gitignore (etc) file + if it lacks the "managed by etckeeper" comment. Closes: #545137 + * Fix hgrc setup code to not warn if the hgrc already contains + a call to etckeeper. (Thanks, Jakov Sosic) + * Updated Czech debconf translation from Miroslav Kure. Closes: #546411 + + -- Joey Hess <joeyh@debian.org> Sat, 26 Sep 2009 15:58:15 -0400 + +etckeeper (0.40) unstable; urgency=low + + * Add Spanish debconf translation. Closes: #539589 + * Updated Italian debconf translation. Closes: #540516 + * Avoid infinite loop when displaying message about failure + to commit changes in /etc. Closes: #540596 + + -- Joey Hess <joeyh@debian.org> Sat, 08 Aug 2009 21:21:27 -0400 + +etckeeper (0.39) unstable; urgency=low + + * Document ETCKEEPER_CONF_DIR in man page. + * Typo. Closes: #536799 + * bzr: Set author to root when committing via sudo. Committer + will be the sudo user, as it is in git. + + -- Joey Hess <joeyh@debian.org> Fri, 31 Jul 2009 13:47:09 -0400 + +etckeeper (0.38) unstable; urgency=low + + * Use hostname if hostname -f fails. Closes: #533295 + * Automatically commit on initial install, so users can + begin relying on etckeeper right away. Closes: #533290 + + -- Joey Hess <joeyh@debian.org> Wed, 08 Jul 2009 14:40:58 -0400 + +etckeeper (0.37) unstable; urgency=low + + * Make postinst check for the configured VCS before trying to run + etckeeper init. Closes: #530497 + * Update French debconf translation. Closes: #530795 + * Fix typo in cruft file. Closes: #530819 + * Update Portuguese debconf translation. Closes: #528109 + * Update German debconf translation. Closes: #532346 + + -- Joey Hess <joeyh@debian.org> Mon, 08 Jun 2009 13:24:13 -0400 + +etckeeper (0.36) unstable; urgency=low + + * Add cruft ignore file. Closes: #522513 + * Update Japanese debconf translation. Closes: #527921 + * Update Swedish debconf translation. Closes: #528575 + * Update Russian debconf translation. Closes: #528798 + + -- Joey Hess <joeyh@debian.org> Sat, 16 May 2009 18:22:49 -0400 + +etckeeper (0.35) unstable; urgency=low + + * Make etckeeper uninit -f disable the prompt. + * Uninit on purge, guarded by a debconf prompt. Closes: #527218 + + -- Joey Hess <joeyh@debian.org> Wed, 06 May 2009 14:52:30 -0400 + +etckeeper (0.34) unstable; urgency=low + + * Add support for mktemp if tempfile is not available. + * Fix uninit prompt to accept 'y' as well as 'yes'. Closes: #517911 + * README: Typo. Closes: #517914 + + -- Joey Hess <joeyh@debian.org> Mon, 02 Mar 2009 17:01:09 -0500 + +etckeeper (0.33) unstable; urgency=low + + * Add support for yum. Thanks, Jimmy Tang. + + -- Joey Hess <joeyh@debian.org> Wed, 25 Feb 2009 14:38:12 -0500 + +etckeeper (0.32) unstable; urgency=low + + * Add uninit subcommand, which cleans up all etckeeper and VCS droppings + in /etc. This is useful if you want to switch to a different VCS and + don't have any history to preserve. (Preserving history and converting + is of course possible, but significantly harder.) + * Run etckeeper init on initial install. Closes: #505772 + (The idea being that if someone doesn't want to use git, they can + immediatly uninit to easily reverse this.) + * Document how to change the VCS used by etckeeper, without preserving + any history. Preserving history left as an exersise for the reader. + Closes: #515237 + * Implement list-installed for rpm. + * Added a spec file contributed by Jimmy Tang. + + -- Joey Hess <joeyh@debian.org> Tue, 24 Feb 2009 23:01:55 -0500 + +etckeeper (0.31) unstable; urgency=low + + * Avoid relying on USER being set, won't be for cron job. + Closes: #515602 + * Add .sw? to ignores. vim uses that if editing an + unspecified file name. Closes: #515628 + + -- Joey Hess <joeyh@debian.org> Mon, 16 Feb 2009 15:40:42 -0500 + +etckeeper (0.30) unstable; urgency=low + + * Add vim .*.sw? files to default ignores. + * Also add emacs #*# autosave files to default ignores. + * And DEADJOE files, for good measure. + * etckeeper update-ignore will automatically update the VCS ignore + file, only touching the part inside a "# managed by etckeeper" + comment block. (You may want to add such a comment block to your existing + .gitignore, or delete the file and regenerate it.) + * Run etckeeper update-ignore on upgrade. + * Fix handling of -d in recursive calls to etckeeper + + -- Joey Hess <joeyh@debian.org> Sat, 14 Feb 2009 01:21:22 -0500 + +etckeeper (0.29) unstable; urgency=low + + * Add a daily cron job to autocommit changes to /etc. Closes: #515100 + The cron job is enabled by default but can be disabled + via etckeeper.conf. + (Thanks to Thierry Carrez) + * Fix executable bits on two darcs support scripts. + + -- Joey Hess <joeyh@debian.org> Fri, 13 Feb 2009 13:43:02 -0500 + +etckeeper (0.28) unstable; urgency=low + + * Support darcs. Thanks to Gian Piero Carrubba. Closes: #510032 + + -- Joey Hess <joeyh@debian.org> Thu, 12 Feb 2009 17:13:23 -0500 + +etckeeper (0.27) unstable; urgency=low + + * Use SUDO_USER as the committer if set. Closes: #498739 + (Thierry Carrez) + * bzr: Avoid use of etckeeper pre-commit on Trees not on the + filesystem. (Jelmer Vernooij) + + -- Joey Hess <joeyh@debian.org> Sun, 01 Feb 2009 17:20:11 -0500 + +etckeeper (0.26) unstable; urgency=low + + * Add Japanese debconf translation. Closes: #512869 + * Prevent git from removing a directory when the last file in it + has been removed, but the directory is left existing and empty, + by touching a flag file before calling git rm. Closes: 513006 + + -- Joey Hess <joeyh@debian.org> Sun, 25 Jan 2009 13:55:56 -0500 + +etckeeper (0.25) unstable; urgency=low + + * Fix filter_unknown calls. Closes: 509888 + + -- Joey Hess <joeyh@debian.org> Wed, 31 Dec 2008 13:01:31 -0500 + +etckeeper (0.24) unstable; urgency=low + + * Make .etckeeper test that files actually exist + before acting on them. Closes: #509888 + + -- Joey Hess <joeyh@debian.org> Mon, 29 Dec 2008 15:37:25 -0500 + +etckeeper (0.23) unstable; urgency=low + + * Fix hook scripts to use new etckeeper path. Closes: #509742 + + -- Joey Hess <joeyh@debian.org> Thu, 25 Dec 2008 16:25:25 -0500 + +etckeeper (0.22) unstable; urgency=low + + * Move etckeeper to sbin, and man page to section 8, since only an admin + can really use etckeeper. Closes: #509152 + * Mention README file from man page. + * Build using python-central. For some reason bzr does not pick up on + plugins built using python-support. + + -- Joey Hess <joeyh@debian.org> Tue, 23 Dec 2008 18:51:14 -0500 etckeeper (0.21) unstable; urgency=low diff --git a/debian/control b/debian/control index 7a956ee..c578d82 100644 --- a/debian/control +++ b/debian/control @@ -1,22 +1,25 @@ Source: etckeeper Section: admin Priority: optional -Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.9.0), bzr (>= 1.4~), python-support (>= 0.5.3) +Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.9.0), bzr (>= 1.5~), python Maintainer: Joey Hess <joeyh@debian.org> -Standards-Version: 3.8.0 +Standards-Version: 3.9.2 +XS-Python-Version: all Vcs-Git: git://git.kitenet.net/etckeeper Homepage: http://kitenet.net/~joey/code/etckeeper/ Package: etckeeper Architecture: all Section: admin -Depends: git-core (>= 1:1.6.0) | mercurial | bzr (>= 1.4~), ${misc:Depends} -Conflicts: bzr (<< 1.4~) -Description: store /etc in git, mercurial, or bzr +Depends: git (>= 1:1.7) | mercurial | bzr (>= 1.5~) | darcs, ${misc:Depends} +Recommends: cron +Suggests: sudo (>= 1.7.4p4) +Conflicts: bzr (<< 1.5~) +Description: store /etc in git, mercurial, bzr or darcs The etckeeper program is a tool to let /etc be stored in a git, mercurial, - or bzr repository. It hooks into APT to automatically commit changes made to - /etc during package upgrades. It tracks file metadata that - version control systems do 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 version control. + bzr or darcs repository. It hooks into APT to automatically commit changes + made to /etc during package upgrades. It tracks file metadata that version + control systems do 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 version + control. diff --git a/debian/copyright b/debian/copyright index 36a8d76..6b87dc1 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,7 @@ +Format: http://dep.debian.net/deps/dep5/ + Files: * -Copyright: © 2007-2008 Joey Hess <joey@kitenet.net> +Copyright: © 2007-2011 Joey Hess <joey@kitenet.net> License: GPL-2+ The full text of the GPL is distributed as doc/GPL in etckeeper's source, and is distributed in /usr/share/common-licenses/GPL-2 on Debian systems. diff --git a/debian/cron.daily b/debian/cron.daily new file mode 100644 index 0000000..b46e7a2 --- /dev/null +++ b/debian/cron.daily @@ -0,0 +1,15 @@ +#!/bin/sh +set -e +if [ -x /usr/bin/etckeeper ] && [ -e /etc/etckeeper/etckeeper.conf ]; then + . /etc/etckeeper/etckeeper.conf + if [ "$AVOID_DAILY_AUTOCOMMITS" != "1" ]; then + # avoid autocommit if an install run is in progress + if [ ! -e /var/cache/etckeeper/packagelist.pre-install ]; then + AVOID_SPECIAL_FILE_WARNING=1 + export AVOID_SPECIAL_FILE_WARNING + if etckeeper unclean; then + etckeeper commit "daily autocommit" >/dev/null + fi + fi + fi +fi diff --git a/debian/po/cs.po b/debian/po/cs.po index 6982576..b7d7c54 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -1,14 +1,14 @@ # Czech translation of etckeeper debconf messages. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the etckeeper package. -# Miroslav Kure <kurem@debian.cz>, 2007 +# Miroslav Kure <kurem@debian.cz>, 2007,2009 # msgid "" msgstr "" "Project-Id-Version: etckeeper\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2008-03-14 01:55-0400\n" -"PO-Revision-Date: 2007-12-24 13:10+0100\n" +"POT-Creation-Date: 2009-05-06 14:41-0400\n" +"PO-Revision-Date: 2009-09-13 09:09+0200\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -36,6 +36,24 @@ msgid "" msgstr "" "Před pokračováním byste měli ručně vyřešit problémy s nezapsanými změnami." +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "Remove etckeeper ${VCS} repository and associated files?" +msgstr "Odstranit ${VCS} repositář etckeeperu a přidružené soubory?" + +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "" +"Etckeeper is being purged from the system, and was used to store /etc in a " +"${VCS} repository. If you choose to remove the repository, this will DESTROY " +"all history etckeeper has recorded for /etc." +msgstr "" +"Etckeeper se na tomto systému používal pro uchování /etc v ${VCS} " +"repositáři, avšak nyní je ze systému odstraňován. Pokud povolíte odstranění " +"repositáře, ZNIČÍTE tím veškerou historii, kterou etckeeper uchovával." + #~ msgid "Commit changed files in /etc to ${VCS}?" #~ msgstr "Zapsat změněné soubory v /etc do ${VCS}?" diff --git a/debian/po/da.po b/debian/po/da.po new file mode 100644 index 0000000..48bae8d --- /dev/null +++ b/debian/po/da.po @@ -0,0 +1,57 @@ +# Danish translation etckeeper. +# Copyright (C) 2010 etckeeper & nedenst??ende overs??ttere. +# This file is distributed under the same license as the etckeeper package. +# Joe Hansen <joedalton2@yahoo.dk>, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: etckeeper\n" +"Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" +"POT-Creation-Date: 2009-05-06 14:41-0400\n" +"PO-Revision-Date: 2010-09-22 17:30+01:00\n" +"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" +"Language-Team: Danish <debian-l10n-danish@lists.debian.org> \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: error +#. Description +#: ../templates:2001 +msgid "Commit failed" +msgstr "Indsendelse (commit) mislykkedes" + +#. Type: error +#. Description +#: ../templates:2001 +msgid "An attempt to commit /etc changes to ${VCS} failed." +msgstr "Et fors??g p?? at indsende (commit) /etc-??ndringer til ${VCS} mislykkedes." + +#. Type: error +#. Description +#: ../templates:2001 +msgid "" +"You may manually resolve the issues with the uncommitted changes before " +"continuing." +msgstr "" +"Du skal manuelt l??se problemstillingerne med de ikke indsendte (uncommitted) " +"??ndringer, f??r du forts??tter." + +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "Remove etckeeper ${VCS} repository and associated files?" +msgstr "Fjern etckeeper ${VCS}-arkiv og associerede filer?" + +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "" +"Etckeeper is being purged from the system, and was used to store /etc in a " +"${VCS} repository. If you choose to remove the repository, this will DESTROY " +"all history etckeeper has recorded for /etc." +msgstr "" +"Etckeeper afinstalleres fra systemet, og blev brugt til at gemme /etc i et " +"${VCS}-arkiv. Hvis du v??lger at fjerne arkivet, vil dette ??DEL??GGE al historik " +"som etckeeper har optaget for /etc." + diff --git a/debian/po/de.po b/debian/po/de.po index 170630f..069ff84 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -1,13 +1,13 @@ # Translation of etckeeper debconf templates to German -# Copyright (C) Helge Kreutzmann <debian@helgefjell.de>, 2008. +# Copyright (C) Helge Kreutzmann <debian@helgefjell.de>, 2008, 2009. # This file is distributed under the same license as the etckeeper package. # msgid "" msgstr "" "Project-Id-Version: etckeeper 0.10\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2008-03-14 01:55-0400\n" -"PO-Revision-Date: 2008-01-29 21:41+0100\n" +"POT-Creation-Date: 2009-05-06 14:41-0400\n" +"PO-Revision-Date: 2009-06-08 19:05+0200\n" "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n" "Language-Team: de <debian-l10n-german@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -37,6 +37,25 @@ msgstr "" "Sie knnen das Problem mit den nicht-bergebenen nderungen manuell beheben, " "bevor Sie fortfahren." +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "Remove etckeeper ${VCS} repository and associated files?" +msgstr "Das ${VCS}-Depot von Etckeeper und die zugehrigen Dateien entfernen?" + +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "" +"Etckeeper is being purged from the system, and was used to store /etc in a " +"${VCS} repository. If you choose to remove the repository, this will DESTROY " +"all history etckeeper has recorded for /etc." +msgstr "" +"Etckeeper wurde zum Speichern von /etc in einem ${VCS}-Depot verwandt und " +"wird jetzt vollstndig vom System gelscht. Falls Sie entscheiden, das Depot " +"zu entfernen, wird dies den Verlauf, den Etckeeper fr /etc aufgezeichnet " +"hat, ZERSTREN." + #~ msgid "Commit changed files in /etc to ${VCS}?" #~ msgstr "Genderte Dateien in /etc an ${VCS} bergeben?" diff --git a/debian/po/es.po b/debian/po/es.po new file mode 100644 index 0000000..441cfbd --- /dev/null +++ b/debian/po/es.po @@ -0,0 +1,85 @@ +# etckeeper po-debconf translation to Spanish. +# Copyright (C) 2009 Software in the Public Interest. +# This file is distributed under the same license as the etckeeper package. +# +# Changes: +# - Initial translation +# Fernando González de Requena <fgrequena@gmail.com>, 2009. +# +# +# Traductores, si no conoce el formato PO, merece la pena leer la +# documentación de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Equipo de traducción al español, por favor lean antes de traducir +# los siguientes documentos: +# +# - El proyecto de traducción de Debian al español +# http://www.debian.org/intl/spanish/ +# especialmente las notas y normas de traducción en +# http://www.debian.org/intl/spanish/notas +# +# - La guía de traducción de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Si tiene dudas o consultas sobre esta traducción consulte con el último +# traductor (campo Last-Translator) y ponga en copia a la lista de +# traducción de Debian al español (<debian-l10n-spanish@lists.debian.org>) +# +msgid "" +msgstr "" +"Project-Id-Version: etckeeper 0.38\n" +"Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" +"POT-Creation-Date: 2009-05-06 14:41-0400\n" +"PO-Revision-Date: 2009-07-11 16:07+0200\n" +"Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n" +"Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: error +#. Description +#: ../templates:2001 +msgid "Commit failed" +msgstr "El envío de los cambios ha fallado" + +#. Type: error +#. Description +#: ../templates:2001 +msgid "An attempt to commit /etc changes to ${VCS} failed." +msgstr "Ha fallado un intento de enviar los cambios en «/etc» a ${VCS}." + +#. Type: error +#. Description +#: ../templates:2001 +msgid "" +"You may manually resolve the issues with the uncommitted changes before " +"continuing." +msgstr "" +"Puede resolver manualmente los problemas con los cambios que no se han enviado " +"antes de continuar." + +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "Remove etckeeper ${VCS} repository and associated files?" +msgstr "¿Desea eliminar el repositorio ${VCS} de etckeeper y los ficheros asociados?" + +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "" +"Etckeeper is being purged from the system, and was used to store /etc in a " +"${VCS} repository. If you choose to remove the repository, this will DESTROY " +"all history etckeeper has recorded for /etc." +msgstr "" +"Se está eliminando completamente etckeeper de su sistema. Etckeeper se ha " +"utilizado para almacenar el directorio «/etc» en un repositorio ${VCS}. Si elige " +"eliminar el repositorio, se DESTRUIRÁ todo el historial que etckeeper ha " +"guardado para «/etc»." + diff --git a/debian/po/eu.po b/debian/po/eu.po index 8cdae6c..9f5ceba 100644 --- a/debian/po/eu.po +++ b/debian/po/eu.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: etckeeper-eu\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2008-03-14 01:55-0400\n" +"POT-Creation-Date: 2009-05-06 14:41-0400\n" "PO-Revision-Date: 2007-12-17 12:47+0100\n" "Last-Translator: Aitor Ibañez <aitiba@gmail.com>\n" "Language-Team: Euskara <Librezale@librezale.org>\n" @@ -40,6 +40,21 @@ msgstr "" "Aurrera jarraitu baino lehen, eskuz erresolbitu beharko ditu onartu gabeko " "aldaketak." +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "Remove etckeeper ${VCS} repository and associated files?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "" +"Etckeeper is being purged from the system, and was used to store /etc in a " +"${VCS} repository. If you choose to remove the repository, this will DESTROY " +"all history etckeeper has recorded for /etc." +msgstr "" + #~ msgid "Commit changed files in /etc to ${VCS}?" #~ msgstr "Aldaturiko fitxategiak ${VCS}-en onartu?" diff --git a/debian/po/fi.po b/debian/po/fi.po index c6fbcde..51204bc 100644 --- a/debian/po/fi.po +++ b/debian/po/fi.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: etckeeper 0.3\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2008-03-14 01:55-0400\n" +"POT-Creation-Date: 2009-05-06 14:41-0400\n" "PO-Revision-Date: 2007-12-12 19:54+0200\n" "Last-Translator: Esko Arajärvi <edu@iki.fi>\n" "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n" @@ -33,6 +33,21 @@ msgid "" msgstr "" "Voit selvittää tallettamattomien muutosten ongelmat käsin ennen jatkamista." +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "Remove etckeeper ${VCS} repository and associated files?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "" +"Etckeeper is being purged from the system, and was used to store /etc in a " +"${VCS} repository. If you choose to remove the repository, this will DESTROY " +"all history etckeeper has recorded for /etc." +msgstr "" + #~ msgid "Commit changed files in /etc to ${VCS}?" #~ msgstr "Talletetaanko hakemiston /etc muutetut tiedostot ${VCS}in?" diff --git a/debian/po/fr.po b/debian/po/fr.po index e8e0ec1..d4125fa 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -1,22 +1,24 @@ -# Translation of etckeeper debconf templates to French -# Copyright (C) 2007 Jean-Baka Domelevo Entfellner <domelevo@gmail.com> +# Translation of etckeeper debconf template to French +# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org> # This file is distributed under the same license as the etckeeper package. # +# Translators: # Jean-Baka Domelevo Entfellner <domelevo@gmail.com>, 2007. -# +# Bruno Travouillon <debian@travouillon.fr>, 2009. msgid "" msgstr "" "Project-Id-Version: etckeeper\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2008-03-14 01:55-0400\n" -"PO-Revision-Date: 2007-12-12 08:28+0100\n" -"Last-Translator: Jean-Baka Domelevo Entfellner <domelevo@gmail.com>\n" +"POT-Creation-Date: 2009-05-06 14:41-0400\n" +"PO-Revision-Date: 2009-05-17 11:42+0200\n" +"Last-Translator: Bruno Travouillon <debian@travouillon.fr>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: French\n" "X-Poedit-Country: FRANCE\n" +"X-Generator: KBabel 1.11.4\n" #. Type: error #. Description @@ -29,7 +31,8 @@ msgstr "Échec de la synchronisation" #: ../templates:2001 msgid "An attempt to commit /etc changes to ${VCS} failed." msgstr "" -"La tentative d'enregistrement des modifications de /etc vers ${VCS} a échoué." +"La tentative d'enregistrement (« commit ») des modifications de /etc vers " +"${VCS} a échoué." #. Type: error #. Description @@ -41,18 +44,22 @@ msgstr "" "Avant de poursuivre, vous devriez résoudre vous-même les problèmes liés aux " "changements non sauvegardés." -#~ msgid "Commit changed files in /etc to ${VCS}?" -#~ msgstr "" -#~ "Faut-il enregistrer dans ${VCS} les modifications de fichiers faites " -#~ "dans /etc ?" +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "Remove etckeeper ${VCS} repository and associated files?" +msgstr "" +"Faut-il supprimer le référentiel ${VCS} d'etckeeper et les fichiers " +"associés ?" -#~ msgid "" -#~ "The /etc directory contains uncommitted files or other changes. It's best " -#~ "for all files in /etc to be committed to ${VCS} before running APT. Added " -#~ "and changed files listed below can be committed automatically:" -#~ msgstr "" -#~ "Le répertoire /etc contient des fichiers non synchronisés ou d'autres " -#~ "changements. Il est préférable que toutes les modifications apportées " -#~ "dans /etc soient enregistrées dans ${VCS} avant de lancer APT. Les ajouts " -#~ "et modifications de fichiers dont la liste suit peuvent être enregistrés " -#~ "automatiquement :" +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "" +"Etckeeper is being purged from the system, and was used to store /etc in a " +"${VCS} repository. If you choose to remove the repository, this will DESTROY " +"all history etckeeper has recorded for /etc." +msgstr "" +"Etckeeper est purgé du système, et était utilisé pour stocker /etc dans un " +"référentiel ${VCS}. Si vous choisissez de supprimer ce référentiel, cela va " +"DÉTRUIRE tout l'historique qu'etckeeper a enregistré pour /etc." diff --git a/debian/po/gl.po b/debian/po/gl.po index fe33fcb..937ccca 100644 --- a/debian/po/gl.po +++ b/debian/po/gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: etckeeper\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2008-03-14 01:55-0400\n" +"POT-Creation-Date: 2009-05-06 14:41-0400\n" "PO-Revision-Date: 2007-12-11 20:52+0000\n" "Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n" "Language-Team: Galician <proxecto@trasno.net>\n" @@ -34,6 +34,21 @@ msgid "" "continuing." msgstr "configurar apt para que instale paquetes adicionais do CD.<" +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "Remove etckeeper ${VCS} repository and associated files?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "" +"Etckeeper is being purged from the system, and was used to store /etc in a " +"${VCS} repository. If you choose to remove the repository, this will DESTROY " +"all history etckeeper has recorded for /etc." +msgstr "" + #~ msgid "Commit changed files in /etc to ${VCS}?" #~ msgstr "¿Gardar en ${VCS} os ficheiros modificados de /etc?" diff --git a/debian/po/it.po b/debian/po/it.po index 80a4b3f..b3b44aa 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -1,14 +1,14 @@ # Italian (it) translation of debconf templates for etckeeper # Copyright (C) 2007 Software in the Public Interest # This file is distributed under the same license as the etckeeper package. -# Luca Monducci <luca.mo@tiscali.it>, 2007. +# Luca Monducci <luca.mo@tiscali.it>, 2007-2009. # msgid "" msgstr "" -"Project-Id-Version: etckeeper 0.3 debconf templates\n" +"Project-Id-Version: etckeeper 0.36 debconf templates\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2008-03-14 01:55-0400\n" -"PO-Revision-Date: 2007-12-14 20:32+0100\n" +"POT-Creation-Date: 2009-05-06 14:41-0400\n" +"PO-Revision-Date: 2009-08-08 15:32+0200\n" "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n" "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -34,18 +34,24 @@ msgid "" "You may manually resolve the issues with the uncommitted changes before " "continuing." msgstr "" -"Potrebbe essere necessario risolvere i problemi con le modifiche delle quali " -"non è stato fatto il commit prima di continuare." +"Potrebbe essere necessario risolvere manualmente i problemi con le modifiche " +"delle quali non è stato fatto il commit prima di continuare." -#~ msgid "Commit changed files in /etc to ${VCS}?" -#~ msgstr "Commit dei file modificati in /etc a ${VCS}?" +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "Remove etckeeper ${VCS} repository and associated files?" +msgstr "Eliminare il repository ${VCS} di etckeeper e i file associati?" -#~ msgid "" -#~ "The /etc directory contains uncommitted files or other changes. It's best " -#~ "for all files in /etc to be committed to ${VCS} before running APT. Added " -#~ "and changed files listed below can be committed automatically:" -#~ msgstr "" -#~ "La directory /etc contiene dei file di cui non è stato ancora fatto il " -#~ "commit o altre modifiche. Si consiglia di effettuare il commit di tutti i " -#~ "file in /etc a ${VCS} prima di eseguire APT. È possibile fare " -#~ "automaticamente il commit dei file nuovi o modificati elencati in seguito:" +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "" +"Etckeeper is being purged from the system, and was used to store /etc in a " +"${VCS} repository. If you choose to remove the repository, this will DESTROY " +"all history etckeeper has recorded for /etc." +msgstr "" +"Etckeeper sta per essere completamente rimosso dal sistema, è stato usato " +"per memorizzare il contenuto di /etc in un repository ${VCS}. Nel caso si " +"scelga di eliminare il repository, si DISTRUGGE tutta la storia di /etc " +"registrata da etckeeper." diff --git a/debian/po/ja.po b/debian/po/ja.po new file mode 100644 index 0000000..6b6c2f1 --- /dev/null +++ b/debian/po/ja.po @@ -0,0 +1,56 @@ +# Copyright (C) 2008-2009 Joey Hess <joeyh@debian.org> +# This file is distributed under the same license as etckeeper package. +# Hideki Yamane (Debian-JP) <henrich@debian.or.jp>, 2008-2009. +# +msgid "" +msgstr "" +"Project-Id-Version: etckeeper 0.35\n" +"Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" +"POT-Creation-Date: 2009-05-06 14:41-0400\n" +"PO-Revision-Date: 2009-05-09 19:26+0900\n" +"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n" +"Language-Team: Japanese <debian-japanese@lists.debian.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: error +#. Description +#: ../templates:2001 +msgid "Commit failed" +msgstr "コミットに失敗しました" + +#. Type: error +#. Description +#: ../templates:2001 +msgid "An attempt to commit /etc changes to ${VCS} failed." +msgstr "/etc の変更を ${VCS} にコミットしようとしましたが失敗しました。" + +#. Type: error +#. Description +#: ../templates:2001 +msgid "" +"You may manually resolve the issues with the uncommitted changes before " +"continuing." +msgstr "" +"続ける前に、この問題とコミットされていない変更について、手動で解決する必要が" +"あるでしょう。" + +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "Remove etckeeper ${VCS} repository and associated files?" +msgstr "etckeeper の$ {VCS} リポジトリおよび関連ファイルを削除しますか?" + +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "" +"Etckeeper is being purged from the system, and was used to store /etc in a " +"${VCS} repository. If you choose to remove the repository, this will DESTROY " +"all history etckeeper has recorded for /etc." +msgstr "" +"Etckeeper はシステムから完全に削除されようとしており、/etc の保存には ${VCS} " +"リポジトリを利用していました。リポジトリを削除すると、/etc について etckeeper " +"が記録してた全ての履歴は「破壊」されます。" + diff --git a/debian/po/nl.po b/debian/po/nl.po index a4dd509..75115fe 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: etckeeper\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2008-03-14 01:55-0400\n" +"POT-Creation-Date: 2009-05-06 14:41-0400\n" "PO-Revision-Date: 2008-01-01 21:21+0100\n" "Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n" "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n" @@ -39,6 +39,21 @@ msgstr "" "U kunt de problemen met de niet-vastgelegde aanpassingen handmatig oplossen " "alvorens verder te gaan." +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "Remove etckeeper ${VCS} repository and associated files?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "" +"Etckeeper is being purged from the system, and was used to store /etc in a " +"${VCS} repository. If you choose to remove the repository, this will DESTROY " +"all history etckeeper has recorded for /etc." +msgstr "" + #~ msgid "Commit changed files in /etc to ${VCS}?" #~ msgstr "Wilt u aangepaste bestanden uit de map '/etc' vastleggen in ${VCS}?" diff --git a/debian/po/pl.po b/debian/po/pl.po new file mode 100644 index 0000000..406f5eb --- /dev/null +++ b/debian/po/pl.po @@ -0,0 +1,47 @@ +# Polish translation +# Copyright (C) 2010 +# This file is distributed under the same license as the etckeeper package. +# Artur R. Czechowski <arturcz@hell.pl>, 2010 +# +msgid "" +msgstr "" +"Project-Id-Version: etckeeper 0.50\n" +"Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" +"POT-Creation-Date: 2009-05-06 14:41-0400\n" +"PO-Revision-Date: 2010-12-19 20:07+0100\n" +"Last-Translator: Artur R. Czechowski <arturcz@hell.pl>\n" +"Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: error +#. Description +#: ../templates:2001 +msgid "Commit failed" +msgstr "Błąd zapisu." + +#. Type: error +#. Description +#: ../templates:2001 +msgid "An attempt to commit /etc changes to ${VCS} failed." +msgstr "Nieudana próba zapisania zmian przy użyciu ${VCS}" + +#. Type: error +#. Description +#: ../templates:2001 +msgid "You may manually resolve the issues with the uncommitted changes before continuing." +msgstr "Przed kontynuacją możesz ręcznie rozwiązać problemy z niezapisanymi zmianami." + +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "Remove etckeeper ${VCS} repository and associated files?" +msgstr "Usunąć repozytorium etckeeper ${VCS} i powiązane pliki?" + +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "Etckeeper is being purged from the system, and was used to store /etc in a ${VCS} repository. If you choose to remove the repository, this will DESTROY all history etckeeper has recorded for /etc." +msgstr "Etckeeper jest usuwany z systemu, ale był używany do przechowywania zawartości katalogu /etc w repozytorium ${VCS}. Jeśli wybierzesz usunięcie repozytorium, historia zmian zapisana dla katalogu /etc zostanie BEZPOWROTNIE USUNIĘTA." + diff --git a/debian/po/pt.po b/debian/po/pt.po index de1feeb..cac10cf 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -1,14 +1,14 @@ # translation of etckeeper debconf to Portuguese -# Copyright (C) 2007 Américo Monteiro +# Copyright (C) 2007 the etckeeper's copyright holder # This file is distributed under the same license as the etckeeper package. # -# Américo Monteiro <a_monteiro@netcabo.pt>, 2007. +# Américo Monteiro <a_monteiro@netcabo.pt>, 2007, 2009. msgid "" msgstr "" -"Project-Id-Version: etckeeper 0.3\n" +"Project-Id-Version: etckeeper 0.35\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2008-03-14 01:55-0400\n" -"PO-Revision-Date: 2007-12-11 20:01+0000\n" +"POT-Creation-Date: 2009-05-06 14:41-0400\n" +"PO-Revision-Date: 2009-05-10 22:10+0100\n" "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" #. Description #: ../templates:2001 msgid "Commit failed" -msgstr "Submissão falhada" +msgstr "Submissão falhou" #. Type: error #. Description @@ -38,15 +38,21 @@ msgstr "" "Você pode resolver manualmente as situações com as alterações não submetidas " "antes de continuar. " -#~ msgid "Commit changed files in /etc to ${VCS}?" -#~ msgstr "Submeter ficheiros alterados em /etc para o ${VCS}?" +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "Remove etckeeper ${VCS} repository and associated files?" +msgstr "Remover o repositório ${VCS} do etckeeper e os ficheiros associados?" + +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "" +"Etckeeper is being purged from the system, and was used to store /etc in a " +"${VCS} repository. If you choose to remove the repository, this will DESTROY " +"all history etckeeper has recorded for /etc." +msgstr "" +"O etckeeper está a ser purgado do sistema, e foi usado para guardar o /etc num " +"repositório ${VCS}. Se escolher remover o repositório, isto irá DESTRUIR todo " +"o histórico que o etckeeper guardou de /etc." -#~ msgid "" -#~ "The /etc directory contains uncommitted files or other changes. It's best " -#~ "for all files in /etc to be committed to ${VCS} before running APT. Added " -#~ "and changed files listed below can be committed automatically:" -#~ msgstr "" -#~ "O directório /etc contém ficheiros não submetidos ou outras alterações. É " -#~ "melhor que todos os ficheiros em /etc sejam submetidos ao ${VCS} antes de " -#~ "correr o APT. Os ficheiros adicionados e alterados da lista em baixo " -#~ "podem ser submetidos automaticamente:" diff --git a/debian/po/ru.po b/debian/po/ru.po index 5776848..b72b888 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -3,20 +3,20 @@ # This file is distributed under the same license as the PACKAGE package. # # Yuri Kozlov <kozlov.y@gmail.com>, 2007. +# Yuri Kozlov <yuray@komyakino.ru>, 2009. msgid "" msgstr "" -"Project-Id-Version: 0.3\n" +"Project-Id-Version: etckeeper 0.35\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2008-03-14 01:55-0400\n" -"PO-Revision-Date: 2007-12-12 21:23+0300\n" -"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n" +"POT-Creation-Date: 2009-05-06 14:41-0400\n" +"PO-Revision-Date: 2009-05-15 21:25+0400\n" +"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. Type: error #. Description @@ -37,18 +37,24 @@ msgid "" "You may manually resolve the issues with the uncommitted changes before " "continuing." msgstr "" -"Перед тем как продолжить вы можете исправить это вручную через " -"незафиксированные изменения." +"Перед тем как продолжить вы можете вручную исправить положение " +"с незафиксированными изменениями." -#~ msgid "Commit changed files in /etc to ${VCS}?" -#~ msgstr "Зафиксировать изменённые файлы /etc в ${VCS}?" +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "Remove etckeeper ${VCS} repository and associated files?" +msgstr "Удалить репозиторий etckeeper ${VCS} и связанные с ним файлы?" + +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "" +"Etckeeper is being purged from the system, and was used to store /etc in a " +"${VCS} repository. If you choose to remove the repository, this will DESTROY " +"all history etckeeper has recorded for /etc." +msgstr "" +"Etckeeper вычищается из системы, но использовался для хранения каталога " +"/etc в репозитории ${VCS}. Если вы выберете удаление репозитория, то " +"это УНИЧТОЖИТ всю историю, которую etckeeper вёл для /etc." -#~ msgid "" -#~ "The /etc directory contains uncommitted files or other changes. It's best " -#~ "for all files in /etc to be committed to ${VCS} before running APT. Added " -#~ "and changed files listed below can be committed automatically:" -#~ msgstr "" -#~ "Каталог /etc содержит незафиксированные файлы или другие изменения. Перед " -#~ "работой APT лучше зафиксировать все файлы /etc в ${VCS}. Перечисленные " -#~ "ниже добавленные и изменённые файлы могут быть зафиксированы " -#~ "автоматически:" diff --git a/debian/po/sv.po b/debian/po/sv.po index e1f5025..c40476d 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -8,15 +8,15 @@ msgid "" msgstr "" "Project-Id-Version: etckeeper_0.20_sv\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2008-03-14 01:55-0400\n" -"PO-Revision-Date: 2008-07-17 17:25+0200\n" -"Last-Translator: Martin Ågren <martin.agren@gmail.com>\n" +"POT-Creation-Date: 2009-05-06 14:41-0400\n" +"PO-Revision-Date: 2009-05-12 20:08+0100\n" +"Last-Translator: Martin Bagge <brother@bsnet.se>\n" "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Type: error #. Description @@ -37,6 +37,23 @@ msgid "" "You may manually resolve the issues with the uncommitted changes before " "continuing." msgstr "" -"Du kan lösa problemen med de overkställda ändringarna manuellt innan " -"du fortsätter." +"Du kan lösa problemen med de overkställda ändringarna manuellt innan du " +"fortsätter." +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "Remove etckeeper ${VCS} repository and associated files?" +msgstr "Ska ${VCS}-förrådet för etckeeper och alla tillhörande filer tas bort?" + +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "" +"Etckeeper is being purged from the system, and was used to store /etc in a " +"${VCS} repository. If you choose to remove the repository, this will DESTROY " +"all history etckeeper has recorded for /etc." +msgstr "" +"Etckeeper håller på att tas bort från systemet, användningsområdet för " +"etckeeper är att spara /etc i ett ${VCS}-förråd. Om du väljer att ta bort " +"förrådet kommer all historik för /etc att raderas." diff --git a/debian/po/templates.pot b/debian/po/templates.pot index e5472e3..93e0fdd 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2008-03-14 01:55-0400\n" +"POT-Creation-Date: 2009-05-06 14:41-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -35,3 +35,18 @@ msgid "" "You may manually resolve the issues with the uncommitted changes before " "continuing." msgstr "" + +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "Remove etckeeper ${VCS} repository and associated files?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "" +"Etckeeper is being purged from the system, and was used to store /etc in a " +"${VCS} repository. If you choose to remove the repository, this will DESTROY " +"all history etckeeper has recorded for /etc." +msgstr "" diff --git a/debian/po/vi.po b/debian/po/vi.po index 779a239..4a75241 100644 --- a/debian/po/vi.po +++ b/debian/po/vi.po @@ -1,61 +1,54 @@ # Vietnamese translation for ETC Keeper. -# Copyright © 2007 Free Software Foundation, Inc. -# Clytie Siddall <clytie@riverland.net.au>, 2007 +# Copyright © 2010 Free Software Foundation, Inc. +# Clytie Siddall <clytie@riverland.net.au>, 2007-2010. # msgid "" msgstr "" -"Project-Id-Version: etckeeper 0.3\n" +"Project-Id-Version: etckeeper 0.50\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2008-03-14 01:55-0400\n" -"PO-Revision-Date: 2007-12-21 22:43+1030\n" +"POT-Creation-Date: 2009-05-06 14:41-0400\n" +"PO-Revision-Date: 2010-10-31 13:59+1030\n" "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: LocFactoryEditor 1.7b1\n" +"X-Generator: LocFactoryEditor 1.8\n" +#: ../templates:2001 #. Type: error #. Description -#: ../templates:2001 msgid "Commit failed" msgstr "Lỗi ghi chép" +#: ../templates:2001 #. Type: error #. Description -#: ../templates:2001 -#, fuzzy #| msgid "An attempt to commit /etc changes to git failed." msgid "An attempt to commit /etc changes to ${VCS} failed." -msgstr "Gặp lỗi khi thử ghi vào git các thay đổi trong « /etc »." +msgstr "Gặp lỗi khi thử ghi chép vào ${VCS} các thay đổi trong « /etc »." +#: ../templates:2001 #. Type: error #. Description -#: ../templates:2001 msgid "" "You may manually resolve the issues with the uncommitted changes before " "continuing." msgstr "" -"Bạn vẫn có thể tự giải quyết các vấn đề về các thay đổi chưa ghi chép, trước " -"khi tiếp tục." +"Bạn cũng có thể tự giải quyết vấn đề về các thay đổi chưa ghi chép, trước khi tiếp tục." -#, fuzzy -#~| msgid "Commit changed files in /etc to git?" -#~ msgid "Commit changed files in /etc to ${VCS}?" -#~ msgstr "Ghi vào git các tập tin bị thay đổi trong « /etc » không?" +#: ../templates:3001 +#. Type: boolean +#. Description +msgid "Remove etckeeper ${VCS} repository and associated files?" +msgstr "Gỡ bỏ kho lưu ${VCS} etckeeper và các tập tin tương ứng ?" -#, fuzzy -#~| msgid "" -#~| "The /etc directory contains uncommitted files or other changes. It's " -#~| "best for all files in /etc to be committed to git before running APT. " -#~| "Added and changed files listed below can be committed automatically:" -#~ msgid "" -#~ "The /etc directory contains uncommitted files or other changes. It's best " -#~ "for all files in /etc to be committed to ${VCS} before running APT. Added " -#~ "and changed files listed below can be committed automatically:" -#~ msgstr "" -#~ "Thư mục « /etc » chứa các tập tin hay thay đổi khác mà chưa ghi chép. Tốt " -#~ "nhất nếu mọi tập tin trong « /etc » được ghi chép, trước khi chạy APT. Có " -#~ "thể tự động ghi chép các tập tin được thêm và bị thay đổi trong danh sách " -#~ "bên dưới:" +#: ../templates:3001 +#. Type: boolean +#. Description +msgid "" +"Etckeeper is being purged from the system, and was used to store /etc in a " +"${VCS} repository. If you choose to remove the repository, this will DESTROY " +"all history etckeeper has recorded for /etc." +msgstr "Gói etckeeper đang bị tẩy khỏi hệ thống: nó từng được sử dụng để lưu trữ « /etc » vào một kho ${VCS}. Sự chọn gỡ bỏ kho lưu này thì HỦY toàn bộ lịch sử được etckeeper giữ đối với « /etc »." diff --git a/debian/postinst b/debian/postinst index e4fb0b3..496a5d8 100644 --- a/debian/postinst +++ b/debian/postinst @@ -65,4 +65,30 @@ configure) mv_conffile "/etc/etckeeper/init.d/20restore-metadata" \ "/etc/etckeeper/init.d/10restore-metadata" fi + if dpkg --compare-versions "$2" le "0.28"; then + for c in commit.d/30darcs-add init.d/60darcs-deleted-symlinks; do + if [ -e /etc/etckeeper/$c ]; then + chmod +x /etc/etckeeper/$c + fi + done + fi + + if [ "$2" = "" ] && [ -e "/etc/etckeeper/etckeeper.conf" ]; then + # Fresh install. + . /etc/etckeeper/etckeeper.conf || true + if [ -n "$VCS" ] && [ -x "`which $VCS 2>/dev/null`" ]; then + if etckeeper init; then + if ! etckeeper commit "Initial commit"; then + echo "etckeeper commit failed; run it by hand" >&2 + fi + else + echo "etckeeper init failed; run it by hand" >&2 + fi + else + echo "etckeeper init not ran as $VCS is not installed" >&2 + fi + fi + + # prints error and exits nonzero if the ignore file cannot be updated + etckeeper update-ignore || true esac diff --git a/debian/postrm b/debian/postrm new file mode 100644 index 0000000..7fd06f6 --- /dev/null +++ b/debian/postrm @@ -0,0 +1,31 @@ +#!/bin/sh +set -e + +if [ "$1" = purge ]; then + if [ -e /etc/.etckeeper ]; then + . /usr/share/debconf/confmodule + + # uninit on purge is tricky because etckeeper's configuration + # and code has been removed at this point. This relies on a + # stashed away copy. + if [ -e /var/cache/etckeeper/stash/etckeeper.conf ] && + [ -d /var/cache/etckeeper/stash/uninit.d ] && + [ -x /var/cache/etckeeper/stash/etckeeper ]; then + . /var/cache/etckeeper/stash/etckeeper.conf + if [ -n "$VCS" ]; then + db_subst etckeeper/purge VCS "$VCS" + db_input critical etckeeper/purge || true + db_go || true + db_get etckeeper/purge + if [ "$RET" = true ]; then + ETCKEEPER_CONF_DIR=/var/cache/etckeeper/stash + export ETCKEEPER_CONF_DIR + /var/cache/etckeeper/stash/etckeeper uninit -f || true + fi + fi + fi + fi + rm -rf /var/cache/etckeeper +fi + +#DEBHELPER# diff --git a/debian/preinst b/debian/preinst index b4495fe..a510cef 100644 --- a/debian/preinst +++ b/debian/preinst @@ -69,4 +69,17 @@ install|upgrade) rm_conffile etckeeper "/etc/etckeeper/commit.d/$c" done fi + if dpkg --compare-versions "$2" le "0.50"; then + for c in 20warn-hardlinks 20warn-special-file; do + rm_conffile etckeeper "/etc/etckeeper/pre-commit.d/$c" + done + fi + if dpkg --compare-versions "$2" le "0.58"; then + for c in commit.d/40git-rm; do + rm_conffile etckeeper "/etc/etckeeper/pre-commit.d/$c" + done + fi + + # delete files the prerm stashes away to handle purging + rm -rf /var/cache/etckeeper/stash esac diff --git a/debian/prerm b/debian/prerm new file mode 100644 index 0000000..e13f086 --- /dev/null +++ b/debian/prerm @@ -0,0 +1,19 @@ +#!/bin/sh +set -e + +#DEBHELPER# + +if [ "$1" = remove ]; then + # In case etckeeper is being purged, stash away a copy of + # the files purging will need. + mkdir -p /var/cache/etckeeper/stash + if [ -e /etc/etckeeper/etckeeper.conf ]; then + cp -a /etc/etckeeper/etckeeper.conf /var/cache/etckeeper/stash + fi + if [ -d /etc/etckeeper/uninit.d ]; then + cp -a /etc/etckeeper/uninit.d /var/cache/etckeeper/stash + fi + if [ -x /usr/bin/etckeeper ]; then + cp -a /usr/bin/etckeeper /var/cache/etckeeper/stash + fi +fi diff --git a/debian/rules b/debian/rules index 4fe53ed..b6b9b90 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,9 @@ #!/usr/bin/make -f + +export PYTHON_INSTALL_OPTS=--install-layout=deb + %: - dh $@ + dh --with python2 $@ # Not intended for use by anyone except the author. announcedir: diff --git a/debian/templates b/debian/templates index 660d594..2cec92c 100644 --- a/debian/templates +++ b/debian/templates @@ -14,3 +14,12 @@ _Description: Commit failed . You may manually resolve the issues with the uncommitted changes before continuing. + +Template: etckeeper/purge +Type: boolean +Default: true +_Description: Remove etckeeper ${VCS} repository and associated files? + Etckeeper is being purged from the system, and was used to + store /etc in a ${VCS} repository. If you choose to remove the + repository, this will DESTROY all history etckeeper has recorded + for /etc. |