diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/po/cs.po | 38 | ||||
| -rw-r--r-- | debian/po/de.po | 42 | ||||
| -rw-r--r-- | debian/po/eu.po | 40 | ||||
| -rw-r--r-- | debian/po/fi.po | 40 | ||||
| -rw-r--r-- | debian/po/fr.po | 46 | ||||
| -rw-r--r-- | debian/po/gl.po | 40 | ||||
| -rw-r--r-- | debian/po/it.po | 40 | ||||
| -rw-r--r-- | debian/po/nl.po | 40 | ||||
| -rw-r--r-- | debian/po/pt.po | 40 | ||||
| -rw-r--r-- | debian/po/ru.po | 39 | ||||
| -rw-r--r-- | debian/po/templates.pot | 23 | ||||
| -rw-r--r-- | debian/po/vi.po | 54 | ||||
| -rw-r--r-- | debian/templates | 12 | ||||
| -rwxr-xr-x | init.d/10restore-etckeeper | 1 | ||||
| -rwxr-xr-x | pre-commit.d/20store-empty-directory | 4 | ||||
| -rwxr-xr-x | pre-commit.d/20warn-hardlinks | 2 | ||||
| -rwxr-xr-x | pre-commit.d/20warn-special-file | 2 | ||||
| -rwxr-xr-x | pre-install.d/50uncommitted-changes | 48 |
19 files changed, 219 insertions, 339 deletions
diff --git a/debian/changelog b/debian/changelog index d95002d..568ffe1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +etckeeper (0.13) UNRELEASED; urgency=low + + * Drop the debconf prompt before committing in pre-install. + Closes: #470577, #462161 + + -- Joey Hess <joeyh@debian.org> Fri, 14 Mar 2008 01:51:53 -0400 + etckeeper (0.12) unstable; urgency=low * Use git ls-files instead of git status. Depend on new enough git for this. diff --git a/debian/po/cs.po b/debian/po/cs.po index c8df38f..6982576 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.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-01-04 18:15-0500\n" +"POT-Creation-Date: 2008-03-14 01:55-0400\n" "PO-Revision-Date: 2007-12-24 13:10+0100\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" @@ -15,41 +15,35 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: boolean -#. Description -#: ../templates:2001 -msgid "Commit changed files in /etc to ${VCS}?" -msgstr "Zapsat změněné soubory v /etc do ${VCS}?" - -#. Type: boolean -#. Description -#: ../templates:2001 -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 "" -"Adresář /etc obsahuje nezapsané soubory nebo jiné změny. Před spuštěním APT " -"je lepší mít všechny soubory v /etc uloženy do ${VCS}. Přidané a změněné " -"soubory vypsané níže budou uloženy automaticky:" - #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "Commit failed" msgstr "Zápis selhal" #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "An attempt to commit /etc changes to ${VCS} failed." msgstr "Pokus o zapsání změn v /etc do ${VCS} selhal." #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "" "You may manually resolve the issues with the uncommitted changes before " "continuing." msgstr "" "Před pokračováním byste měli ručně vyřešit problémy s nezapsanými změnami." + +#~ msgid "Commit changed files in /etc to ${VCS}?" +#~ msgstr "Zapsat změněné soubory v /etc do ${VCS}?" + +#~ 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 "" +#~ "Adresář /etc obsahuje nezapsané soubory nebo jiné změny. Před spuštěním " +#~ "APT je lepší mít všechny soubory v /etc uloženy do ${VCS}. Přidané a " +#~ "změněné soubory vypsané níže budou uloženy automaticky:" diff --git a/debian/po/de.po b/debian/po/de.po index 46ec8bc..170630f 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: etckeeper 0.10\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2008-01-04 18:15-0500\n" +"POT-Creation-Date: 2008-03-14 01:55-0400\n" "PO-Revision-Date: 2008-01-29 21:41+0100\n" "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n" "Language-Team: de <debian-l10n-german@lists.debian.org>\n" @@ -14,45 +14,39 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: boolean -#. Description -#: ../templates:2001 -msgid "Commit changed files in /etc to ${VCS}?" -msgstr "Genderte Dateien in /etc an ${VCS} bergeben?" - -#. Type: boolean -#. Description -#: ../templates:2001 -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 "" -"Das Verzeichnis /etc enthlt Dateien, die noch nicht an Git bergeben wurden " -"(uncommitted sind) oder andere nderungen. Am besten werden alle Dateien " -"in /etc an ${VCS} bergeben, bevor APT ausgefhrt wird. Die im folgenden " -"aufgefhrten hinzugefgten und genderten Dateien knnen automatisch " -"bergeben werden:" - #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "Commit failed" msgstr "bergabe (commit) fehlgeschlagen" #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "An attempt to commit /etc changes to ${VCS} failed." msgstr "" "Ein Versuch, die nderungen an /etc an ${VCS} zu bergeben, schlug fehl." #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "" "You may manually resolve the issues with the uncommitted changes before " "continuing." msgstr "" "Sie knnen das Problem mit den nicht-bergebenen nderungen manuell beheben, " "bevor Sie fortfahren." + +#~ msgid "Commit changed files in /etc to ${VCS}?" +#~ msgstr "Genderte Dateien in /etc an ${VCS} bergeben?" + +#~ 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 "" +#~ "Das Verzeichnis /etc enthlt Dateien, die noch nicht an Git bergeben " +#~ "wurden (uncommitted sind) oder andere nderungen. Am besten werden alle " +#~ "Dateien in /etc an ${VCS} bergeben, bevor APT ausgefhrt wird. Die im " +#~ "folgenden aufgefhrten hinzugefgten und genderten Dateien knnen " +#~ "automatisch bergeben werden:" diff --git a/debian/po/eu.po b/debian/po/eu.po index ab23cba..8cdae6c 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-01-04 18:15-0500\n" +"POT-Creation-Date: 2008-03-14 01:55-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" @@ -18,43 +18,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#. Type: boolean -#. Description -#: ../templates:2001 -msgid "Commit changed files in /etc to ${VCS}?" -msgstr "Aldaturiko fitxategiak ${VCS}-en onartu?" - -#. Type: boolean -#. Description -#: ../templates:2001 -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 direktorioak onartu gabeko fitxategiak edo beste aldaketa batzuk ditu. /" -"etc-n dauden fitxategi guztientzat hobe da ${VCS}-en onarpena egitea APT " -"exekutatu baino lehen.Azpian dauden erantsi eta aldatutako fitxategiak " -"automatikoki onartu daitezke:" - #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "Commit failed" msgstr "Onarpenak failatu du" #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "An attempt to commit /etc changes to ${VCS} failed." msgstr "/etc-ko aldaketak ${VCS}-en onartzearen saiakerak huts egin du." #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "" "You may manually resolve the issues with the uncommitted changes before " "continuing." msgstr "" "Aurrera jarraitu baino lehen, eskuz erresolbitu beharko ditu onartu gabeko " "aldaketak." + +#~ msgid "Commit changed files in /etc to ${VCS}?" +#~ msgstr "Aldaturiko fitxategiak ${VCS}-en onartu?" + +#~ 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 direktorioak onartu gabeko fitxategiak edo beste aldaketa batzuk " +#~ "ditu. /etc-n dauden fitxategi guztientzat hobe da ${VCS}-en onarpena " +#~ "egitea APT exekutatu baino lehen.Azpian dauden erantsi eta aldatutako " +#~ "fitxategiak automatikoki onartu daitezke:" diff --git a/debian/po/fi.po b/debian/po/fi.po index efead83..c6fbcde 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-01-04 18:15-0500\n" +"POT-Creation-Date: 2008-03-14 01:55-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" @@ -12,42 +12,36 @@ msgstr "" "X-Poedit-Language: Finnish\n" "X-Poedit-Country: Finland\n" -#. Type: boolean -#. Description -#: ../templates:2001 -msgid "Commit changed files in /etc to ${VCS}?" -msgstr "Talletetaanko hakemiston /etc muutetut tiedostot ${VCS}in?" - -#. Type: boolean -#. Description -#: ../templates:2001 -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 "" -"Hakemisto /etc sisältää tallettamattomia tiedostoja tai muita muutoksia. On " -"parasta tallettaa kaikki /etc:n tiedostot ${VCS}-varastoon ennen APTin " -"ajamista. Alla luetellut lisätyt tai muutetut tiedostot voidaan tallettaa " -"automaattisesti." - #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "Commit failed" msgstr "Tallettaminen epäonnistui" #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "An attempt to commit /etc changes to ${VCS} failed." msgstr "Yritys tallettaa /etc:n muutokset ${VCS}-varastoon epäonnistui." #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "" "You may manually resolve the issues with the uncommitted changes before " "continuing." msgstr "" "Voit selvittää tallettamattomien muutosten ongelmat käsin ennen jatkamista." + +#~ msgid "Commit changed files in /etc to ${VCS}?" +#~ msgstr "Talletetaanko hakemiston /etc muutetut tiedostot ${VCS}in?" + +#~ 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 "" +#~ "Hakemisto /etc sisältää tallettamattomia tiedostoja tai muita muutoksia. " +#~ "On parasta tallettaa kaikki /etc:n tiedostot ${VCS}-varastoon ennen APTin " +#~ "ajamista. Alla luetellut lisätyt tai muutetut tiedostot voidaan tallettaa " +#~ "automaattisesti." diff --git a/debian/po/fr.po b/debian/po/fr.po index 7958128..e8e0ec1 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: etckeeper\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2008-01-04 18:15-0500\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" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -18,47 +18,41 @@ msgstr "" "X-Poedit-Language: French\n" "X-Poedit-Country: FRANCE\n" -#. Type: boolean -#. Description -#: ../templates:2001 -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:2001 -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: error #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "Commit failed" msgstr "Échec de la synchronisation" #. Type: error #. Description -#: ../templates:3001 +#: ../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é." #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "" "You may manually resolve the issues with the uncommitted changes before " "continuing." 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 ?" + +#~ 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 :" diff --git a/debian/po/gl.po b/debian/po/gl.po index 6b9166b..fe33fcb 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-01-04 18:15-0500\n" +"POT-Creation-Date: 2008-03-14 01:55-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" @@ -14,41 +14,35 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: boolean -#. Description -#: ../templates:2001 -msgid "Commit changed files in /etc to ${VCS}?" -msgstr "¿Gardar en ${VCS} os ficheiros modificados de /etc?" - -#. Type: boolean -#. Description -#: ../templates:2001 -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 directorio /etc contén ficheiros ou outros cambios sen gardar. É mellor " -"que se garden en ${VCS} tódolos ficheiros de /etc antes de executar APT. Os " -"ficheiros engadidos e modificados da lista de embaixo pódense gardar " -"automaticamente:" - #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "Commit failed" msgstr "O gardado fallou" #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "An attempt to commit /etc changes to ${VCS} failed." msgstr "Fallou unha tentativa de gardar en ${VCS} os cambios de /etc." #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "" "You may manually resolve the issues with the uncommitted changes before " "continuing." msgstr "configurar apt para que instale paquetes adicionais do CD.<" + +#~ msgid "Commit changed files in /etc to ${VCS}?" +#~ msgstr "¿Gardar en ${VCS} os ficheiros modificados 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 directorio /etc contén ficheiros ou outros cambios sen gardar. É mellor " +#~ "que se garden en ${VCS} tódolos ficheiros de /etc antes de executar APT. " +#~ "Os ficheiros engadidos e modificados da lista de embaixo pódense gardar " +#~ "automaticamente:" diff --git a/debian/po/it.po b/debian/po/it.po index 11358f2..80a4b3f 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: etckeeper 0.3 debconf templates\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2008-01-04 18:15-0500\n" +"POT-Creation-Date: 2008-03-14 01:55-0400\n" "PO-Revision-Date: 2007-12-14 20:32+0100\n" "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n" "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n" @@ -15,43 +15,37 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: boolean -#. Description -#: ../templates:2001 -msgid "Commit changed files in /etc to ${VCS}?" -msgstr "Commit dei file modificati in /etc a ${VCS}?" - -#. Type: boolean -#. Description -#: ../templates:2001 -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: error #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "Commit failed" msgstr "Commit fallito" #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "An attempt to commit /etc changes to ${VCS} failed." msgstr "Il tentativo di commit delle modifiche in /etc a ${VCS} è fallito." #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 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." + +#~ msgid "Commit changed files in /etc to ${VCS}?" +#~ msgstr "Commit dei file modificati in /etc a ${VCS}?" + +#~ 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:" diff --git a/debian/po/nl.po b/debian/po/nl.po index 4f3fabc..a4dd509 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-01-04 18:15-0500\n" +"POT-Creation-Date: 2008-03-14 01:55-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" @@ -16,44 +16,38 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Dutch\n" -#. Type: boolean -#. Description -#: ../templates:2001 -msgid "Commit changed files in /etc to ${VCS}?" -msgstr "Wilt u aangepaste bestanden uit de map '/etc' vastleggen in ${VCS}?" - -#. Type: boolean -#. Description -#: ../templates:2001 -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 "" -"De map '/etc' bevat niet-vastgelegde bestanden of andere aanpassingen. Het " -"is sterk aan te raden om alle aanpassingen in '/etc/' vast te leggen in " -"${VCS} vooraleer u APT uitvoert. De hieronder aangegeven toegevoegde en " -"veranderde bestanden worden automatisch opgeslagen." - #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "Commit failed" msgstr "Vastleggen is mislukt." #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "An attempt to commit /etc changes to ${VCS} failed." msgstr "" "De poging om de aanpassingen in '/etc' vast te leggen in ${VCS} is mislukt." #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "" "You may manually resolve the issues with the uncommitted changes before " "continuing." msgstr "" "U kunt de problemen met de niet-vastgelegde aanpassingen handmatig oplossen " "alvorens verder te gaan." + +#~ msgid "Commit changed files in /etc to ${VCS}?" +#~ msgstr "Wilt u aangepaste bestanden uit de map '/etc' vastleggen in ${VCS}?" + +#~ 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 "" +#~ "De map '/etc' bevat niet-vastgelegde bestanden of andere aanpassingen. " +#~ "Het is sterk aan te raden om alle aanpassingen in '/etc/' vast te leggen " +#~ "in ${VCS} vooraleer u APT uitvoert. De hieronder aangegeven toegevoegde " +#~ "en veranderde bestanden worden automatisch opgeslagen." diff --git a/debian/po/pt.po b/debian/po/pt.po index 8110996..de1feeb 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: etckeeper 0.3\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2008-01-04 18:15-0500\n" +"POT-Creation-Date: 2008-03-14 01:55-0400\n" "PO-Revision-Date: 2007-12-11 20:01+0000\n" "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" @@ -16,43 +16,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#. Type: boolean -#. Description -#: ../templates:2001 -msgid "Commit changed files in /etc to ${VCS}?" -msgstr "Submeter ficheiros alterados em /etc para o ${VCS}?" - -#. Type: boolean -#. Description -#: ../templates:2001 -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:" - #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "Commit failed" msgstr "Submissão falhada" #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "An attempt to commit /etc changes to ${VCS} failed." msgstr "A tentativa de submeter as alterações de /etc ao ${VCS} falhou." #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "" "You may manually resolve the issues with the uncommitted changes before " "continuing." 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}?" + +#~ 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 04e2952..5776848 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.3\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2008-01-04 18:15-0500\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" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" @@ -18,42 +18,37 @@ msgstr "" "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: boolean -#. Description -#: ../templates:2001 -msgid "Commit changed files in /etc to ${VCS}?" -msgstr "Зафиксировать изменённые файлы /etc в ${VCS}?" - -#. Type: boolean -#. Description -#: ../templates:2001 -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}. Перечисленные ниже " -"добавленные и изменённые файлы могут быть зафиксированы автоматически:" - #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "Commit failed" msgstr "Фиксация завершилась неудачно" #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "An attempt to commit /etc changes to ${VCS} failed." msgstr "Попытка зафиксировать изменения /etc в ${VCS} завершилась неудачно." #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 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}?" + +#~ 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/templates.pot b/debian/po/templates.pot index ba70e31..e5472e3 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-01-04 18:15-0500\n" +"POT-Creation-Date: 2008-03-14 01:55-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" @@ -16,36 +16,21 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: boolean -#. Description -#: ../templates:2001 -msgid "Commit changed files in /etc to ${VCS}?" -msgstr "" - -#. Type: boolean -#. Description -#: ../templates:2001 -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 "" - #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "Commit failed" msgstr "" #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "An attempt to commit /etc changes to ${VCS} failed." msgstr "" #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "" "You may manually resolve the issues with the uncommitted changes before " "continuing." diff --git a/debian/po/vi.po b/debian/po/vi.po index f69b8a6..779a239 100644 --- a/debian/po/vi.po +++ b/debian/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: etckeeper 0.3\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" -"POT-Creation-Date: 2008-01-04 18:15-0500\n" +"POT-Creation-Date: 2008-03-14 01:55-0400\n" "PO-Revision-Date: 2007-12-21 22:43+1030\n" "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n" @@ -16,41 +16,15 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: LocFactoryEditor 1.7b1\n" -#. Type: boolean -#. Description -#: ../templates:2001 -#, 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?" - -#. Type: boolean -#. Description -#: ../templates:2001 -#, 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:" - #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 msgid "Commit failed" msgstr "Lỗi ghi chép" #. Type: error #. Description -#: ../templates:3001 +#: ../templates:2001 #, fuzzy #| msgid "An attempt to commit /etc changes to git failed." msgid "An attempt to commit /etc changes to ${VCS} failed." @@ -58,10 +32,30 @@ msgstr "Gặp lỗi khi thử ghi vào git các thay đổi trong « /etc »." #. Type: error #. Description -#: ../templates:3001 +#: ../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." + +#, 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?" + +#, 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:" diff --git a/debian/templates b/debian/templates index 87f634b..660d594 100644 --- a/debian/templates +++ b/debian/templates @@ -7,18 +7,6 @@ # Even minor modifications require translation updates and such # changes should be coordinated with translators and reviewers. -Template: etckeeper/unclean -Type: boolean -Default: true -#flag:translate!:3 -_Description: Commit changed files in /etc to ${VCS}? - 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: - . - ${STATUS} - Template: etckeeper/commit_failed Type: error _Description: Commit failed diff --git a/init.d/10restore-etckeeper b/init.d/10restore-etckeeper index f49e70c..984d521 100755 --- a/init.d/10restore-etckeeper +++ b/init.d/10restore-etckeeper @@ -7,4 +7,5 @@ if [ -e .etckeeper ]; then . ./.etckeeper else touch .etckeeper + chmod 600 .etckeeper fi diff --git a/pre-commit.d/20store-empty-directory b/pre-commit.d/20store-empty-directory index a52a383..22fde89 100755 --- a/pre-commit.d/20store-empty-directory +++ b/pre-commit.d/20store-empty-directory @@ -11,8 +11,8 @@ if [ "$VCS" = git ] || [ "$VCS" = hg ]; then if [ -e .etckeeper ]; then egrep -v '^mkdir ' .etckeeper > .etckeeper.new || true fi - find -type d -empty | grep -v /.git/ | grep -v /.hg/ | sort | - sed -e "s/^/mkdir -p '/" -e "s/\$/'/" >> .etckeeper.new + find -type d -empty | grep -v /.git/ | grep -v /.hg/ | grep -v /.bzr/ | + sort | sed -e "s/^/mkdir -p '/" -e "s/\$/'/" >> .etckeeper.new if [ ! -e .etckeeper ] || ! cmp -s .etckeeper .etckeeper.new ; then mv -f .etckeeper.new .etckeeper diff --git a/pre-commit.d/20warn-hardlinks b/pre-commit.d/20warn-hardlinks index e82740a..c1fd8f7 100755 --- a/pre-commit.d/20warn-hardlinks +++ b/pre-commit.d/20warn-hardlinks @@ -2,7 +2,7 @@ set -e if [ "$VCS" = git ] || [ "$VCS" = hg ] || [ "$VCS" = bzr ]; then - hardlinks=$(find -type f -not -links 1 | grep -v /.git/) || true + hardlinks=$(find -type f -not -links 1 | grep -v /.git/ | grep -v /.hg/ | grep -v /.bzr/) || true if [ -n "$hardlinks" ]; then echo "etckeeper warning: hardlinked files could cause problems with $VCS:" >&2 echo "$hardlinks" >&2 diff --git a/pre-commit.d/20warn-special-file b/pre-commit.d/20warn-special-file index 0835687..5712bc5 100755 --- a/pre-commit.d/20warn-special-file +++ b/pre-commit.d/20warn-special-file @@ -2,7 +2,7 @@ set -e if [ "$VCS" = git ] || [ "$VCS" = hg ] || [ "$VCS" = bzr ]; then - special=$(find -not -type d -not -type f -not -type l | grep -v /.git/) || true + special=$(find -not -type d -not -type f -not -type l | grep -v /.git/ | grep -v /.hg/ | grep -v /.bzr/) || true if [ -n "$special" ]; then echo "etckeeper warning: special files could cause problems with $VCS:" >&2 echo "$special" >&2 diff --git a/pre-install.d/50uncommitted-changes b/pre-install.d/50uncommitted-changes index 4e573dc..d06883d 100755 --- a/pre-install.d/50uncommitted-changes +++ b/pre-install.d/50uncommitted-changes @@ -1,33 +1,7 @@ #!/bin/sh set -e -status() { - if [ "$VCS" = git ]; then - git status - elif [ "$VCS" = hg ]; then - hg status - fi -} - -if [ "$1" = "ask-debconf" ]; then - . /usr/share/debconf/confmodule - db_capb escape - db_title etckeeper - - db_reset etckeeper/unclean || true - db_subst etckeeper/unclean VCS "$VCS" - db_subst etckeeper/unclean STATUS $(status | debconf-escape -e) || true - db_input critical etckeeper/unclean || true - db_go || true - db_get etckeeper/unclean - val="$RET" - db_reset etckeeper/unclean || true - if [ "$val" = true ]; then - exit 0 - else - exit 1 - fi -elif [ "$1" = "fail-debconf" ]; then +if [ "$1" = "fail-debconf" ]; then . /usr/share/debconf/confmodule db_subst etckeeper/commit_failed VCS "$VCS" db_input critical etckeeper/commit_failed || true @@ -36,22 +10,12 @@ elif [ "$1" = "fail-debconf" ]; then fi if etckeeper unclean; then - docommit="true" - if [ -e /usr/share/debconf/confmodule ]; then - if $0 ask-debconf; then - docommit=true + if ! etckeeper commit "saving uncommitted changes in /etc prior to $HIGHLEVEL_PACKAGE_MANAGER run"; then + if [ -e /usr/share/debconf/confmodule ]; then + $0 fail-debconf else - docommit=false - fi - fi - if [ "$docommit" = true ]; then - if ! etckeeper commit "saving uncommitted changes in /etc prior to $HIGHLEVEL_PACKAGE_MANAGER run"; then - if [ -e /usr/share/debconf/confmodule ]; then - $0 fail-debconf - else - echo "error: etckeeper failed to commit changes in /etc using $VCS" - exit 1 - fi + echo "error: etckeeper failed to commit changes in /etc using $VCS" + exit 1 fi fi fi |