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

Consider jed_0.99.18-7 for etch



I just uploaded jed_0.99.18-8 to unstable.  Please consider hinting this
version into etch since it fixes three l10n bug reports (#395251, #400510,
and #405744) and also added an updated pt_BR translation.  I am following
the request sent by Javier Fernández-Sanguino Peña in d-d-a [1].

The version currently in testing is jed_0.99.18-6.  I am attaching below the
diff between -6 and -8.  Notice that two changes made in -7 were reverted in
-8, namely the introduction of the fix-pymode-tab-space dpatch and the
renaming of the info files (which was a mistake).  Consequently, the -8
version contains only changes related to the l10n of the debconf question,
as well as fixes that make the deconf script really work.

Thanks,

-- 
Rafael, in behalf of the Debian JED Group

[1] http://lists.debian.org/debian-devel-announce/2007/01/msg00002.html
Index: debian/control
===================================================================
--- debian/control	(.../0.99.18-6)	(revision 497)
+++ debian/control	(.../0.99.18-8)	(revision 497)
@@ -5,7 +5,9 @@
 Uploaders: Rafael Laboissiere <rafael@debian.org>
 Standards-Version: 3.7.2
 Build-Depends-Indep: hevea
-Build-Depends: debhelper (>= 4.1.16), dpatch, libgpmg1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libslang2-dev, libxft-dev, libxt-dev, pkg-config
+Build-Depends: debhelper (>= 4.1.16), dpatch, libslang2-dev, libxft-dev,
+ libgpmg1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libxt-dev,
+ pkg-config
 
 Package: jed
 Architecture: any
@@ -73,7 +75,7 @@
 Replaces: jed-sl
 Conflicts: jed-sl, jed (<< ${Source-Version}), xjed (<< ${Source-Version})
 Recommends: jed | xjed
-Depends: debconf | debconf-2.0, findutils (>= 4.1.20-6)
+Depends: findutils (>= 4.1.20-6), debconf | debconf-2.0
 Description: S-Lang runtime files for jed and xjed
  Jed is a small, fast and powerful text editor.
  .
Index: debian/changelog
===================================================================
--- debian/changelog	(.../0.99.18-6)	(revision 497)
+++ debian/changelog	(.../0.99.18-8)	(revision 497)
@@ -1,3 +1,53 @@
+jed (0.99.18-8) unstable; urgency=low
+
+  * debian/po/sv.po: Adjusted msgid strings to correspond to those in
+    po/templates.pot, otherwise po2debconf will not include the sv
+    translations [RL]
+
+  * debian/po/pt_BR.po: Updated file [RL]
+  * debian/po/pt.po: Added the last question which was lacking in the
+    translation (really closes: #400510) [RL]
+
+  * debian/jed-common.config: Made this debconf script works as expected
+    [RL & JS]
+  * debian/jed-common.preinst: Removed file [RL]
+  * debian/control: Since the preinst script is gone, moved debconf from
+    Pre-Depends to Depends for jed-common [RL]
+
+  * debian/rules: Reverted the change in last release regarding the
+    naming of the upstream info files.  We have been informed that
+    Lintian will not complain about this in the future and,
+    apparently, it is not really a Policy violation [RL]
+
+  * debian/patches/fix-pymode-tab-space.dpatch: Dropped this patch for now,
+    until a consensus is reached on how it should be implemented [RL]
+  * debian/patches/pymode-repeat-shift.dpatch: Dropped this patch also,
+    since it depends on fix-pymode-tab-space [RL]
+
+ -- Rafael Laboissiere <rafael@debian.org>  Sun, 14 Jan 2007 11:43:30 +0100
+
+jed (0.99.18-7) unstable; urgency=low
+
+  * po/nl.po: Added the translation into Dutch of the deconf messages.
+    Thanks to Vincent Zweije (closes: #395251) [JS]
+
+  * control: Moved debhelper dependency to the Pre-Depends field, because
+    we need debhelper in the preinst script. [JS]
+
+  * po/pt.po: Added the translation into Portuguese of the deconf messages.
+    Thanks to Miguel Figueiredo (closes: #400510) [JS]
+
+  * po/ru.po: Added the translation into Russian of the deconf messages.
+    Thanks to Yuri Kozlov (closes: #405744) [JS]
+
+  * patches/fix-pymode-tab-space.dpatch: Improved the patch to cover the
+    cases Günther Milde has reported. Thanks Günther (closes: #305668) [JS]
+
+  * rules: Rename the upstream info files from jed.*in into jed.info-*, as
+    required by section 12.2 of the Debian Policy [RL]
+
+ -- Rafael Laboissiere <rafael@debian.org>  Tue,  9 Jan 2007 17:00:10 +0100
+
 jed (0.99.18-6) unstable; urgency=low
 
   * debian/patches/pymode-repeat-shift.dpatch: Added a patch to make the
Index: debian/patches/fix-pymode-tab-space.dpatch
===================================================================
--- debian/patches/fix-pymode-tab-space.dpatch	(.../0.99.18-6)	(revision 497)
+++ debian/patches/fix-pymode-tab-space.dpatch	(.../0.99.18-8)	(revision 497)
@@ -4,12 +4,35 @@
 ## DP: In Python, it is forbidden to mix up tabs and spaces as indention
 ## DP: characters. This patch enhances the python mode to take care of the
 ## DP: prefered indention character in a file. Fixes #305668
+##
+## The idea of the patch is to assume the user wants tabs as indent characters,
+## if he set the Py_Indent_Level to the value of TAB. (used for empty files)
+##   This might be overwritten by the indention character used in the current
+## file. If the first line that starts with whitespace and is not part of """
+## ... """ or starts with # it overwrites the default selection. If this line
+## starts with a tab, tab is used as character for indention, otherwise spaces
+## are used.
 
 @DPATCH@
 diff -urNad trunk~/lib/pymode.sl trunk/lib/pymode.sl
 --- trunk~/lib/pymode.sl	(Revision 35) 
 +++ trunk/lib/pymode.sl	        (Arbeitskopie)
-@@ -139,10 +139,16 @@
+@@ -69,6 +69,14 @@
+ 
+ 
+ 
++private define py_whitespace(cnt)
++{
++   if ( get_blocal_var("py_use_tab") )
++      whitespace(cnt);
++   else
++      loop (cnt) insert_char(' ');
++}
++
+ % Set the following to your favourite indentation level
+ custom_variable("Py_Indent_Level", 4);
+ 
+@@ -139,10 +147,16 @@
      
     col = what_column() - 1;
      
@@ -28,17 +51,16 @@
  }
  
  define py_indent_line()
-@@ -151,6 +157,9 @@
+@@ -151,7 +165,7 @@
      
     col = py_indent_calculate();
     bol_trim ();
-+   if ( get_blocal_var("py_use_tab") )
-+      loop (col / TAB) insert_char('\t');
-+   else
-    whitespace( col );
+-   whitespace( col );
++   py_whitespace( col );
  }
  
-@@ -246,11 +255,19 @@
+ define py_comment_line() 
+@@ -246,11 +260,19 @@
     bskip_white(); 
     if (bolp() and (col > 1)) { 
        pop_spot();                                                     
@@ -53,22 +75,22 @@
        col--;                                                         
        if (col mod Py_Indent_Level == 0) 
          col--; 
-       whitespace ( (col / Py_Indent_Level) * Py_Indent_Level ); 
+-      whitespace ( (col / Py_Indent_Level) * Py_Indent_Level ); 
++      py_whitespace ( (col / Py_Indent_Level) * Py_Indent_Level ); 
 +      }
     } 
     else { 
        pop_spot(); 
-@@ -261,6 +278,9 @@
+@@ -261,7 +283,7 @@
  define py_shift_line_right()
  {
     bol_skip_white();
-+   if ( get_blocal_var("py_use_tab") )
-+      insert_char('\t');
-+   else
-    whitespace(Py_Indent_Level);
+-   whitespace(Py_Indent_Level);
++   py_whitespace(Py_Indent_Level);
  }
  
-@@ -293,9 +313,17 @@
+ define py_shift_region_right()
+@@ -293,9 +315,17 @@
  {
     bol_skip_white();
     if (what_column() > Py_Indent_Level) {
@@ -86,25 +108,22 @@
     }
  }
  
-@@ -440,11 +468,17 @@
+@@ -440,12 +470,12 @@
  	 % Indent is wrong.  Hopefully it's a continuation line.
  	 level = oldlevel;	% reset level
  	 bol_trim();
-+         if ( get_blocal_var("py_use_tab") )
-+            loop (level) insert_char('\t');
-+         else
- 	 whitespace(level * Py_Indent_Level + (col - current_indent));
+-	 whitespace(level * Py_Indent_Level + (col - current_indent));
++	 py_whitespace(level * Py_Indent_Level + (col - current_indent));
        } else {
  	 current_indent = col;
  	 indent_level[level] = col;
  	 bol_trim();
-+         if ( get_blocal_var("py_use_tab") )
-+            loop (level) insert_char('\t');
-+         else
- 	 whitespace(level * Py_Indent_Level);
+-	 whitespace(level * Py_Indent_Level);
++	 py_whitespace(level * Py_Indent_Level);
        }
     } while (down(1) == 1);
-@@ -578,12 +612,29 @@
+ }
+@@ -578,12 +608,28 @@
  {
     variable python = "python";
     
@@ -129,7 +148,6 @@
 +       else
 +         !if (looking_at_char('#') or eolp() or what_column() == 1)
 +         {
-+             message("foo" + string(what_line()));
 +             bol();
 +             set_blocal_var(looking_at_char('\t'), "py_use_tab");
 +             break;
Index: debian/patches/pymode-repeat-shift.dpatch
===================================================================
--- debian/patches/pymode-repeat-shift.dpatch	(.../0.99.18-6)	(revision 497)
+++ debian/patches/pymode-repeat-shift.dpatch	(.../0.99.18-8)	(revision 497)
@@ -9,18 +9,14 @@
 diff -urNad trunk~/lib/pymode.sl trunk/lib/pymode.sl
 --- trunk~/lib/pymode.sl	2006-09-19 13:38:27.201564732 +0200
 +++ trunk/lib/pymode.sl	2006-09-19 13:39:22.477564732 +0200
-@@ -274,21 +274,26 @@
+@@ -279,18 +279,21 @@
  
  define py_shift_line_right()
  {
 +   variable times = prefix_argument(1);
     bol_skip_white();
-    if ( get_blocal_var("py_use_tab") )
-+      loop (times)
-       insert_char('\t');
-    else
-+      loop (times)
-    whitespace(Py_Indent_Level);
+-   py_whitespace(Py_Indent_Level);
++   py_whitespace(times * Py_Indent_Level);
  }
  
  define py_shift_region_right()
@@ -36,7 +32,7 @@
  	py_shift_line_right();
  	go_down_1 ();
       }
-@@ -308,17 +313,18 @@
+@@ -310,17 +313,18 @@
  
  define py_shift_line_left()
  {
@@ -59,7 +55,7 @@
        del_region();
        }
     }
-@@ -326,6 +332,7 @@
+@@ -328,6 +332,7 @@
  
  define py_shift_region_left()
  {
@@ -67,7 +63,7 @@
     variable n;
     
     check_region (1);
-@@ -333,6 +340,7 @@
+@@ -335,6 +340,7 @@
     pop_mark_1 ();
     loop (n - what_line ())
       {
Index: debian/patches/00list
===================================================================
--- debian/patches/00list	(.../0.99.18-6)	(revision 497)
+++ debian/patches/00list	(.../0.99.18-8)	(revision 497)
@@ -15,5 +15,3 @@
 
 fix-pymode-block-end
 doc
-fix-pymode-tab-space
-pymode-repeat-shift  /* depends on fix-pymode-tab-space */
Index: debian/rules
===================================================================
--- debian/rules	(.../0.99.18-6)	(revision 497)
+++ debian/rules	(.../0.99.18-8)	(revision 497)
@@ -43,7 +43,7 @@
         # These settings of DL_LIB, OTHERLIBS and XRENDERFONTLIBS are to get
         # right of unnecessary dependencies on libraries.
         # http://rerun.lefant.net/checklib/
-        # 
+        #
         # DL_LIB introduces a dependency on libdl that is already solved by
         # libc. OTHERLIBS introduces a dependency on libm that is also solved
         # by libc. XRENDERFONTLIBS fixes a problem with libxft-dev that defines
@@ -161,7 +161,7 @@
 
 binary: binary-arch binary-indep
 
-get-orig-source: 
+get-orig-source:
 	wget ftp://space.mit.edu/pub/davis/jed/v0.99/jed-$(UPSTREAM_VERSION).tar.gz
 	mv jed-$(UPSTREAM_VERSION).tar.gz jed_$(UPSTREAM_VERSION).orig.tar.gz
 
Index: debian/jed-common.config
===================================================================
--- debian/jed-common.config	(.../0.99.18-6)	(revision 497)
+++ debian/jed-common.config	(.../0.99.18-8)	(revision 497)
@@ -2,24 +2,60 @@
 
 set -e
 
-. /usr/share/debconf/confmodule
+# md5sums from jed-0.99.9 (potato)
+file_1=38af7aa6498bfd7be927aa52c6c46585:/etc/jed-init.d/00site.sl
+file_2=91a5aee61e23906dcfffd24904d7ef62:/etc/jed-init.d/99default.sl
 
-if [ -e /etc/jed-init.d/00site.sl ] ||
-   [ -e /etc/jed-init.d/99defaults.sl ]; then
+# md5sums from jed-0.99.15-5 (woody)
+file_3=ce466753801194229b9b78f0b3b7e28c:/etc/jed-init.d/00site.sl
+file_4=5f0954b045b6b81f1ef0ba545d42c000:/etc/jed.conf
 
-    # the md5sums posted by Rafael on pkg-jed-devel@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
-    else
-       # they aren't modified
-       db_set jed-common/rm-site-defaults true
+# md5sums from SVN revisions 2 to 35
+file_5=5bf498a3703c5330e3acea00d0fa7a87:/etc/jed-init.d/00debian.sl
+
+# md5sums from SVN revisions 36 to 41
+file_6=28962c5ff0ff7cfcc58a22394599967e:/etc/jed-init.d/00debian.sl
+
+# md5sums from SVN revisions 42 to 55
+file_7=472a1d8dbdc16496ba51334f62366466:/etc/jed-init.d/00debian.sl
+
+# md5sums from SVN revisions 50 to 56
+file_8=da918de66b912df0205c5b38401b09b6:/etc/jed.conf
+
+# md5sums from SVN revisions 57
+file_9=fc2b1e847dd08da8b338a50ab04d1eb0:/etc/jed.conf
+
+# md5sums from SVN revisions 58
+file_10=3b919dbba6a2656a926f818344a60552:/etc/jed.conf
+
+# (starting at SVN revision 59, the /etc/jed-init.d/ was not used anymore)
+
+changed=false
+
+for n in `seq 1 10` ; do
+    eval "tmp=\$file_$n"
+    md5sum=${tmp%%:*}
+    file=${tmp##*:}
+    if [ -e $file ] ; then
+        if echo "$md5sum  $file" | md5sum -c >/dev/null 2>&1 ; then
+	    # The configuration file was not changed by the user: remove it
+	    # silently
+	    rm -f $file
+	else
+	    changed=true
+	fi
     fi
+done
+
+if $changed; then
+    . /usr/share/debconf/confmodule
+
+    db_input medium jed-common/rm-site-defaults || true
+    db_go
+    db_get jed-common/rm-site-defaults
+    if [ "$RET" = true ] ; then
+        for n in `seq 1 10` ; do
+            eval "rm -f \${file_$n##*:}"
+	done
+    fi
 fi
-
-db_go || true
Index: debian/watch
===================================================================
--- debian/watch	(.../0.99.18-6)	(revision 497)
+++ debian/watch	(.../0.99.18-8)	(revision 497)
@@ -1,3 +1,3 @@
 version=3
 opts="uversionmangle=s/-/./" \
-  ftp://space.mit.edu/pub/davis/jed/v0.99 jed-(.*)\.tar\.gz
\ No newline at end of file
+  ftp://space.mit.edu/pub/davis/jed/v0.99 jed-(.*)\.tar\.gz
Index: debian/NEWS
===================================================================
--- debian/NEWS	(.../0.99.18-6)	(revision 497)
+++ debian/NEWS	(.../0.99.18-8)	(revision 497)
@@ -1,3 +1,23 @@
+jed-common (0.99.18-8) unstable; urgency=low
+
+    Since release 0.99.17.135-1 of the package, the JED run-time
+    configuration files are put in /etc/jed.d/ instead of
+    /etc/jed-init.d/.  Due to a bug in dpkg (#108587) the config files
+    00site.sl, 00debian.sl and 99defaults.sl as well as /etc/jed.conf are
+    not removed after an upgrade to 0.99.15-1 or higher.
+
+    A debconf question has been added to the jed-common pacakge which asks
+    the user whether their modified files should be kept in
+    /etc/jed-init.d/.  However, the script that was responsible for
+    deleting the files was defective and there may be cases where the
+    files are still in the system but shouldn't be.  If it is necessary,
+    the debconf question can be revisited by running "dpkg-reconfigure
+    jed-common".
+
+ -- Rafael Laboissiere <rafael@debian.org>  Fri, 12 Jan 2007 14:11:18 +0100
+
+jed-common (0.99.18-7) unstable; urgency=low
+
 =========================================
 Recent changes to the Debian jed packages
 =========================================
Index: debian/po/pt.po
===================================================================
--- debian/po/pt.po	(.../0.99.18-6)	(revision 0)
+++ debian/po/pt.po	(.../0.99.18-8)	(revision 497)
@@ -0,0 +1,48 @@
+# Portuguese translation for jed debconf messages.
+# Copyright (C) Tiago Fernandes <tjg.fernandes@gmail.com>, 2006
+# This file is distributed under the same license as the Jed package.
+# Tiago Fernandes <tjg.fernandes@gmail.com>, 2006
+# Rafael Laboissiere <rafael@debian.org> has added the lacking last string
+# translation, waiting for the official version from Tiago Fernandes.
+# We are trying to get this version into etch.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: jed 0.99.18-6\n"
+"Report-Msgid-Bugs-To: pkg-jed-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2006-08-11 00:49+0200\n"
+"PO-Revision-Date: 2007-01-11 23:08+0100\n"
+"Last-Translator: Rafael Laboissiere <rafael@debian.org>\n"
+"Language-Team: Portuguese <traduz@debianpt.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Portuguese\n"
+"X-Poedit-Country: PORTUGAL\n"
+
+#. Type: boolean
+#. Description
+#: ../jed-common.templates:1001
+msgid "Remove old files in /etc/?"
+msgstr "Remover os ficheiros antigos de /etc/?"
+
+#. Type: boolean
+#. Description
+#: ../jed-common.templates:1001
+msgid ""
+"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 no dpkg (#108587) os ficheiros de configuração "
+"00site.sl, 00debian.sl e 99defaults.sl em /etc/jed-init.d/ e /etc/jed.conf "
+"não são removidos na actualização para a versão 0.99.15-1 ou superior."
+
+#. Type: boolean
+#. Description
+#: ../jed-common.templates:1001
+msgid ""
+"It seems you have modified one of these files, because their md5 sums differ "
+"from the originals."
+msgstr ""
+"Aparentemente, um destes ficheiros foi modificado por você, porque o "
+"valor de sua soma md5 é diferente do original."
Index: debian/po/pt_BR.po
===================================================================
--- debian/po/pt_BR.po	(.../0.99.18-6)	(revision 497)
+++ debian/po/pt_BR.po	(.../0.99.18-8)	(revision 497)
@@ -1,23 +1,14 @@
+# Brazilian Portuguese translation for jed debconf messages.
+# Copyright (C) Rafael Laboissiere <rafael@debian.org>, 2006
+# This file is distributed under the same license as the Jed package.
 #
-#    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: jed 0.99.18\n"
+"Project-Id-Version: jed 0.99.18-7\n"
 "Report-Msgid-Bugs-To: pkg-jed-devel@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"
+"PO-Revision-Date: 2007-01-12 09:22+0100\n"
 "Last-Translator: Rafael Laboissiere <rafael@debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -27,22 +18,21 @@
 #. Type: boolean
 #. Description
 #: ../jed-common.templates:1001
-#, fuzzy
 msgid "Remove old files in /etc/?"
-msgstr "Remover antigos arquivos 00site.sl e 99defaults.sl?"
+msgstr "Remover os arquivos antigos de /etc/?"
 
 #. Type: boolean
 #. Description
 #: ../jed-common.templates:1001
-#, fuzzy
 msgid ""
 "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"
-"atualização à versão 0.99.15-1 ou a uma outra mais recente."
+"Devido a um bug no dpkg (#108587) os arquivos de configuração "
+"00site.sl, 00debian.sl e 99defaults.sl em /etc/jed-init.d/ e "
+"/etc/jed.conf não são removidos na atualização para a versão 0.99.15-1 "
+"ou superior."
 
 #. Type: boolean
 #. Description
@@ -51,5 +41,5 @@
 "It seems you have modified one of these files, because their md5 sums differ "
 "from the originals."
 msgstr ""
-"Aparentemente, um destes arquivos for modificado por você, por que o\n"
-"valor de sua soma md5 é diferente do original."
+"Aparentemente, um destes arquivos foi modificado por você, porque o "
+"valor de sua soma md5 é diferente do original."
\ No newline at end of file
Index: debian/po/ru.po
===================================================================
--- debian/po/ru.po	(.../0.99.18-6)	(revision 0)
+++ debian/po/ru.po	(.../0.99.18-8)	(revision 497)
@@ -0,0 +1,47 @@
+# translation of jed_0.99.18-6_debconf_ru.po to Russian
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Yuri Kozlov <kozlov.y@gmail.com>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: 0.99.18-6\n"
+"Report-Msgid-Bugs-To: pkg-jed-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2006-08-11 00:49+0200\n"
+"PO-Revision-Date: 2007-01-05 23:46+0300\n"
+"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\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"
+
+#. Type: boolean
+#. Description
+#: ../jed-common.templates:1001
+msgid "Remove old files in /etc/?"
+msgstr "УдалиÑ?Ñ? Ñ?Ñ?аÑ?Ñ?е Ñ?айлÑ? из /etc/?"
+
+#. Type: boolean
+#. Description
+#: ../jed-common.templates:1001
+msgid ""
+"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 ""
+"Ð?з-за оÑ?ибки в dpkg (#108587) конÑ?игÑ?Ñ?аÑ?ионнÑ?е Ñ?айлÑ? 00site.sl, 00debian.sl и "
+"99defaults.sl в /etc/jed-init.d/ и /etc/jed.conf не Ñ?далилиÑ?Ñ? поÑ?ле "
+"обновлениÑ? до веÑ?Ñ?ии 0.99.15-1 или более новой."
+
+#. Type: boolean
+#. Description
+#: ../jed-common.templates:1001
+msgid ""
+"It seems you have modified one of these files, because their md5 sums differ "
+"from the originals."
+msgstr ""
+"Ð?ажеÑ?Ñ?Ñ?, Ñ?Ñ?о вÑ? изменили один из Ñ?Ñ?иÑ? Ñ?айлов, Ñ?ак как иÑ? md5 Ñ?Ñ?ммÑ? "
+"оÑ?лиÑ?аÑ?Ñ?Ñ?Ñ? оÑ? оÑ?игиналÑ?нÑ?Ñ?."
+
Index: debian/po/sv.po
===================================================================
--- debian/po/sv.po	(.../0.99.18-6)	(revision 497)
+++ debian/po/sv.po	(.../0.99.18-8)	(revision 497)
@@ -24,12 +24,17 @@
 #. Type: boolean
 #. Description
 #: ../jed-common.templates:1001
-msgid "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."
+msgid ""
+"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 "På grund av ett fel i dpkg (#108587) tas konfigurationsfilerna 00site.sl, 00debian.sl och 99defaults.sl under /etc/jed-init.d/ och /etc/jed.conf inte bort efter en uppgradering till 0.99.15-1 eller högre."
 
 #. Type: boolean
 #. Description
 #: ../jed-common.templates:1001
-msgid "It seems you have modified one of this files, because their md5 sums differ from the originals."
+msgid ""
+"It seems you have modified one of these files, because their md5 sums differ "
+"from the originals."
 msgstr "Det verkar som om du har ändrat en av dessa filer därför att deras md5-kontrollsummor skiljer sig från originalen."
 
Index: debian/po/nl.po
===================================================================
--- debian/po/nl.po	(.../0.99.18-6)	(revision 0)
+++ debian/po/nl.po	(.../0.99.18-8)	(revision 497)
@@ -0,0 +1,45 @@
+# Debian jed po-debconf translation,
+# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the jed package.
+# Vincent Zweije <zweije@xs4all.nl>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: jed 0.99.18-5\n"
+"Report-Msgid-Bugs-To: pkg-jed-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2006-08-11 00:49+0200\n"
+"PO-Revision-Date: 2006-10-10 19:56+0000\n"
+"Last-Translator: Vincent Zweije <zweije@xs4all.nl>\n"
+"Language-Team: Debian-Dutch <debian-l10n-dutch@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../jed-common.templates:1001
+msgid "Remove old files in /etc/?"
+msgstr ""
+"Oude bestanden in /etc/ verwijderen?"
+
+#. Type: boolean
+#. Description
+#: ../jed-common.templates:1001
+msgid ""
+"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 ""
+"Door een fout in dpkg (#108587) worden de configbestanden 00site.sl, "
+"00debian.sl en 99defaults.sl in /etc/jed-init.d/ en /etc/jed.conf niet "
+"verwijderd na een opwaardering naar versie 0.99.15-1 of hoger."
+
+#. Type: boolean
+#. Description
+#: ../jed-common.templates:1001
+msgid ""
+"It seems you have modified one of these files, because their md5 sums differ "
+"from the originals."
+msgstr ""
+"U heeft waarschijnlijk een van deze bestanden gewijzigd, want hun md5 "
+"controlesommen verschillen van die van de originele bestanden."
Index: debian/jed-common.preinst
===================================================================
--- debian/jed-common.preinst	(.../0.99.18-6)	(revision 497)
+++ debian/jed-common.preinst	(.../0.99.18-8)	(revision 497)
@@ -1,54 +0,0 @@
-#! /bin/sh
-
-set -e
-
-case "$1" in
-    install|upgrade)
-        . /usr/share/debconf/confmodule
-
-	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@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
-    ;;
-
-    abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 0
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0

Reply to: