[Pkg-jed-commit] r361 - in jed/branches/0.99.19: . po
Jörg Sommer
jo-guest at costa.debian.org
Sat Aug 12 15:22:43 UTC 2006
Author: jo-guest
Date: 2006-08-12 15:22:42 +0000 (Sat, 12 Aug 2006)
New Revision: 361
Modified:
jed/branches/0.99.19/jed-common.preinst
jed/branches/0.99.19/jed-common.templates
jed/branches/0.99.19/po/cs.po
jed/branches/0.99.19/po/fr.po
jed/branches/0.99.19/po/pt_BR.po
jed/branches/0.99.19/po/templates.pot
Log:
* Merged changes of revision 360 into the 0.99.19 branch.
Modified: jed/branches/0.99.19/jed-common.preinst
===================================================================
--- jed/branches/0.99.19/jed-common.preinst 2006-08-11 16:22:52 UTC (rev 360)
+++ jed/branches/0.99.19/jed-common.preinst 2006-08-12 15:22:42 UTC (rev 361)
@@ -6,29 +6,38 @@
install|upgrade)
. /usr/share/debconf/confmodule
- if [ -e /etc/jed-init.d/00site.sl ] ||
- [ -e /etc/jed-init.d/99defaults.sl ]; then
-
- # the md5sums posted by Rafael on pkg-jed-devel at l.a.d.o
- if ( [ -e /etc/jed-init.d/00site.sl ] &&
- echo '2e00fef46fcee03fe504cea3b58510b6 /etc/jed-init.d/00site.sl' |
- md5sum -c 2>/dev/null ) ||
- ( [ -e /etc/jed-init.d/99defaults.sl ] &&
- echo '1514586554dfe5aefcee84aa967fb01b /etc/jed-init.d/99default.sl' |
- md5sum -c 2>/dev/null )
- then
- db_input medium jed-common/rm-site-defaults || true
- db_go || true
- else
- # they aren't modified
- db_set jed-common/rm-site-defaults true
+ file_0=/etc/jed-init.d/00site.sl
+ file_1=/etc/jed-init.d/99default.sl
+ file_2=/etc/jed-init.d/00debian.sl
+ file_3=/etc/jed.conf
+
+ # the md5sums posted by Rafael on pkg-jed-devel at l.a.d.o
+ md5sum_0=2e00fef46fcee03fe504cea3b58510b6
+ md5sum_1=1514586554dfe5aefcee84aa967fb01b
+ # md5sum from jed-common 0.99.16â€5 aka Sarge
+ md5sum_2=5bf498a3703c5330e3acea00d0fa7a87
+ md5sum_3=5f0954b045b6b81f1ef0ba545d42c000
+
+ prompt=false
+ for i in 0 1 2 3; do
+ eval "file=\$file_$i; md5sum=\$md5sum_$i"
+ if [ â€e $file ]; then
+ if echo "$md5sum $file" | md5sum â€c >/dev/null 2>&1; then
+ prompt=true
+ else
+ rm $file
+ fi
fi
+ done
+
+ if $prompt; then
+ db_input medium jed-common/rm-site-defaults || true
+ db_go || true
+ db_get jed-common/rm-site-defaults
+ if [ "$RET" = true ]; then
+ rm -f /etc/jed-init.d/00site.sl /etc/jed-init.d/defaults.sl
+ fi
fi
-
- db_get jed-common/rm-site-defaults
- if [ "$RET" = true ]; then
- rm -f /etc/jed-init.d/00site.sl /etc/jed-init.d/defaults.sl
- fi
;;
abort-upgrade)
Modified: jed/branches/0.99.19/jed-common.templates
===================================================================
--- jed/branches/0.99.19/jed-common.templates 2006-08-11 16:22:52 UTC (rev 360)
+++ jed/branches/0.99.19/jed-common.templates 2006-08-12 15:22:42 UTC (rev 361)
@@ -1,10 +1,10 @@
Template: jed-common/rm-site-defaults
Type: boolean
Default: false
-_Description: Remove old files 00site.sl and 99defaults.sl?
- Due to a bug in dpkg (#108587) the config files 00site.sl and
- 99defaults.sl in /etc/jed-init.d/ aren't removed after an upgrade to
- 0.99.15-1 or higher.
+_Description: Remove old files in /etc/?
+ Due to a bug in dpkg (#108587) the config files 00site.sl, 00debian.sl and
+ 99defaults.sl in /etc/jed-init.d/ and /etc/jed.conf aren't removed after
+ an upgrade to 0.99.15-1 or higher.
.
It seems you have modified one of this files, because their md5 sums
differ from the originals.
Modified: jed/branches/0.99.19/po/cs.po
===================================================================
--- jed/branches/0.99.19/po/cs.po 2006-08-11 16:22:52 UTC (rev 360)
+++ jed/branches/0.99.19/po/cs.po 2006-08-12 15:22:42 UTC (rev 361)
@@ -14,8 +14,8 @@
msgid ""
msgstr ""
"Project-Id-Version: jed\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-14 17:41+0200\n"
+"Report-Msgid-Bugs-To: pkg-jed-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2006-08-11 00:49+0200\n"
"PO-Revision-Date: 2006-06-04 11:27+0200\n"
"Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -25,16 +25,19 @@
#. Type: boolean
#. Description
-#: ../jed-common.templates:4
-msgid "Remove old files 00site.sl and 99defaults.sl?"
+#: ../jed-common.templates:1001
+#, fuzzy
+msgid "Remove old files in /etc/?"
msgstr "Odstranit staré soubory 00site.sl a 99defaults.sl?"
#. Type: boolean
#. Description
-#: ../jed-common.templates:4
+#: ../jed-common.templates:1001
+#, fuzzy
msgid ""
-"Due to a bug in dpkg (#108587) the config files 00site.sl and 99defaults.sl "
-"in /etc/jed-init.d/ aren't removed after an upgrade to 0.99.15-1 or higher."
+"Due to a bug in dpkg (#108587) the config files 00site.sl, 00debian.sl and "
+"99defaults.sl in /etc/jed-init.d/ and /etc/jed.conf aren't removed after an "
+"upgrade to 0.99.15-1 or higher."
msgstr ""
"Kvůli chybě v dpkg (#108587) nejsou po aktualizaci na verzi 0.99.15-1 a "
"vyÅ¡Å¡Ã odstranÄ›ny z /etc/jed-init.d/ konfiguraÄnà soubory 00site.sl a "
@@ -42,10 +45,10 @@
#. Type: boolean
#. Description
-#: ../jed-common.templates:4
+#: ../jed-common.templates:1001
msgid ""
"It seems you have modified one of this files, because their md5 sums differ "
"from the originals."
msgstr ""
-"Jelikož se md5 souÄty tÄ›chto souborů liÅ¡Ã od originálů, zdá se, že jste "
-"je upravovali."
+"Jelikož se md5 souÄty tÄ›chto souborů liÅ¡Ã od originálů, zdá se, že jste je "
+"upravovali."
Modified: jed/branches/0.99.19/po/fr.po
===================================================================
--- jed/branches/0.99.19/po/fr.po 2006-08-11 16:22:52 UTC (rev 360)
+++ jed/branches/0.99.19/po/fr.po 2006-08-12 15:22:42 UTC (rev 361)
@@ -11,12 +11,11 @@
#
# Developers do not need to manually edit POT or PO files.
#
-#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: jed 0.99.18\n"
-"Report-Msgid-Bugs-To: debian-l10n-french at lists.debian.org\n"
-"POT-Creation-Date: 2006-05-14 17:41+0200\n"
+"Report-Msgid-Bugs-To: pkg-jed-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2006-08-11 00:49+0200\n"
"PO-Revision-Date: 2006-05-14 18:20+0200\n"
"Last-Translator: Rafael Laboissiere <rafael at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -26,28 +25,30 @@
#. Type: boolean
#. Description
-#: ../jed-common.templates:4
-msgid "Remove old files 00site.sl and 99defaults.sl?"
-msgstr "Effacer les fichiers anciens 00site.sl et 99defaults.sl?"
+#: ../jed-common.templates:1001
+#, fuzzy
+msgid "Remove old files in /etc/?"
+msgstr "Faut-il effacer les anciens fichiers 00site.sl et 99defaults.sl ?"
#. Type: boolean
#. Description
-#: ../jed-common.templates:4
+#: ../jed-common.templates:1001
+#, fuzzy
msgid ""
-"Due to a bug in dpkg (#108587) the config files 00site.sl and 99defaults.sl "
-"in /etc/jed-init.d/ aren't removed after an upgrade to 0.99.15-1 or higher."
+"Due to a bug in dpkg (#108587) the config files 00site.sl, 00debian.sl and "
+"99defaults.sl in /etc/jed-init.d/ and /etc/jed.conf aren't removed after an "
+"upgrade to 0.99.15-1 or higher."
msgstr ""
-"Due à un bogue de dpkg (#108587), les fichiers de configuration\n"
-"00site.sl et 99defaults.sl dans /etc/jed-init.d/ ne sont pas effacés\n"
-"après la mise à jour à la version 0.99.15-1 où à une autre plus\n"
-"récente."
+"En raison d'un bogue de dpkg (n° 108587), les fichiers de configuration "
+"00site.sl et 99defaults.sl dans /etc/jed-init.d/ ne sont pas effacés après "
+"la mise à niveau vers les versions 0.99.15-1 et supérieures."
#. Type: boolean
#. Description
-#: ../jed-common.templates:4
+#: ../jed-common.templates:1001
msgid ""
"It seems you have modified one of this files, because their md5 sums differ "
"from the originals."
msgstr ""
-"Il semble que vous avez modifié un de ces fichiers parce que leurs\n"
-"sommes md5 sont différentes de celles des fichiers originaux."
+"Un de ces fichiers semble avoir été modifié, car leurs sommes MD5 sont "
+"différentes de celles des fichiers originaux."
Modified: jed/branches/0.99.19/po/pt_BR.po
===================================================================
--- jed/branches/0.99.19/po/pt_BR.po 2006-08-11 16:22:52 UTC (rev 360)
+++ jed/branches/0.99.19/po/pt_BR.po 2006-08-12 15:22:42 UTC (rev 361)
@@ -15,8 +15,8 @@
msgid ""
msgstr ""
"Project-Id-Version: jed 0.99.18\n"
-"Report-Msgid-Bugs-To: debian-l10n-portuguese at debian.org\n"
-"POT-Creation-Date: 2006-05-14 17:41+0200\n"
+"Report-Msgid-Bugs-To: pkg-jed-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2006-08-11 00:49+0200\n"
"PO-Revision-Date: 2006-05-14 18:21+0200\n"
"Last-Translator: Rafael Laboissiere <rafael at debian.org>\n"
"Language-Team: Debian-BR Project <debian-l10n-portuguese at lists.debian.org>\n"
@@ -26,16 +26,19 @@
#. Type: boolean
#. Description
-#: ../jed-common.templates:4
-msgid "Remove old files 00site.sl and 99defaults.sl?"
+#: ../jed-common.templates:1001
+#, fuzzy
+msgid "Remove old files in /etc/?"
msgstr "Remover antigos arquivos 00site.sl e 99defaults.sl?"
#. Type: boolean
#. Description
-#: ../jed-common.templates:4
+#: ../jed-common.templates:1001
+#, fuzzy
msgid ""
-"Due to a bug in dpkg (#108587) the config files 00site.sl and 99defaults.sl "
-"in /etc/jed-init.d/ aren't removed after an upgrade to 0.99.15-1 or higher."
+"Due to a bug in dpkg (#108587) the config files 00site.sl, 00debian.sl and "
+"99defaults.sl in /etc/jed-init.d/ and /etc/jed.conf aren't removed after an "
+"upgrade to 0.99.15-1 or higher."
msgstr ""
"Devido a um bug do dpkg (#108587) os arquivos de configuração\n"
"00site.sl e 99defaults.sl em /etc/jed-init.d/ não são removidos após a\n"
@@ -43,7 +46,7 @@
#. Type: boolean
#. Description
-#: ../jed-common.templates:4
+#: ../jed-common.templates:1001
msgid ""
"It seems you have modified one of this files, because their md5 sums differ "
"from the originals."
Modified: jed/branches/0.99.19/po/templates.pot
===================================================================
--- jed/branches/0.99.19/po/templates.pot 2006-08-11 16:22:52 UTC (rev 360)
+++ jed/branches/0.99.19/po/templates.pot 2006-08-12 15:22:42 UTC (rev 361)
@@ -1,22 +1,14 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-#
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-# Developers do not need to manually edit POT or PO files.
-#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-14 17:41+0200\n"
+"Report-Msgid-Bugs-To: pkg-jed-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2006-08-11 00:49+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -26,21 +18,22 @@
#. Type: boolean
#. Description
-#: ../jed-common.templates:4
-msgid "Remove old files 00site.sl and 99defaults.sl?"
+#: ../jed-common.templates:1001
+msgid "Remove old files in /etc/?"
msgstr ""
#. Type: boolean
#. Description
-#: ../jed-common.templates:4
+#: ../jed-common.templates:1001
msgid ""
-"Due to a bug in dpkg (#108587) the config files 00site.sl and 99defaults.sl "
-"in /etc/jed-init.d/ aren't removed after an upgrade to 0.99.15-1 or higher."
+"Due to a bug in dpkg (#108587) the config files 00site.sl, 00debian.sl and "
+"99defaults.sl in /etc/jed-init.d/ and /etc/jed.conf aren't removed after an "
+"upgrade to 0.99.15-1 or higher."
msgstr ""
#. Type: boolean
#. Description
-#: ../jed-common.templates:4
+#: ../jed-common.templates:1001
msgid ""
"It seems you have modified one of this files, because their md5 sums differ "
"from the originals."
More information about the Pkg-jed-commit
mailing list