Merge ~canonical-foundations/ubuntu/+source/popularity-contest:ubuntu-disable-popcon into ~canonical-foundations/ubuntu/+source/popularity-contest:ubuntu/devel

[Tiago Stürmer Daitx]

Revert most Ubuntu changes on popcon, add changes to disable reporting back to our popcon server as it is no longer maintained.

Keeping translations from 1.70ubuntu1.

[Tiago Stürmer Daitx (tdaitx)]

Please note that this branch is on top of debian/sid - it is added as an prerequisite for this merge, so changes from 1.71 are not being shown. Before doing an upload it might be interesting to see if we want to keep debian's 1.71 as it is.

[Steve Langasek (vorlon)]

looks good, with a few minor review comments.

review: Needs Information

d35c769... by Tiago Stürmer Daitx on 2021-03-08

remove translation delta

Revert back to debian's po files. Steve Langasek double-checked to
make sure we weren't regressing translation support by restoring
the original strings. Thanks!

0c4361c... by Tiago Stürmer Daitx on 2021-03-08

remove pending delta

2f76ed7... by Tiago Stürmer Daitx on 2021-03-08

comment out original submission email/url

We were asked explicitly by the debian's maintainer to submit ubuntu's
results to debian only for users that go out of their way to update
their config, so we must keep the default empty, preventing any new
install from automatically submmiting to debian.

6574ba2... by Tiago Stürmer Daitx on 2021-03-08

remove spurious new line

[Tiago Stürmer Daitx (tdaitx)]

> looks good, with a few minor review comments.

Updated it with all the suggested changes. Leaving old debian settings in defaults.conf commented out, as maintainer asked us to not submit to debian by default - its only ok when users go out of their way to configure submissions to debian.

[Brian Murray (brian-murray)]

I've gone ahead and uploaded this for hirsute.

diff --git a/README b/README
index 2ae8309..554eedf 100644
--- a/README
+++ b/README
@@ -102,7 +102,6 @@ estimate the amount of Linux users worldwide.
 
 There are some popcon installations for other distributions:
 
-Ubuntu: https://popcon.ubuntu.com/
 DebianEdu: http://popcon.skolelinux.org/
 NeuroDebian: http://neuro.debian.net/popcon/
 
diff --git a/debian/changelog b/debian/changelog
index 35a92ae..d101bc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+popularity-contest (1.70ubuntu2) UNRELEASED; urgency=medium
+
+  * Drop all previous Ubuntu changes.
+    - debian/po: Steve Langasek double-checked to make sure
+      we weren't regressing translation support by restoring
+      the original strings. Thanks!
+  * README: remove Ubuntu URL as its popcon server is
+    no longer maintained.
+  * defaults.conf: leave SUBMITURLS and MAILTO empty so
+    no references to Ubuntu's popcon server shows up in the
+    default conf and comment out MAILTO to leave it unset.
+  * debian/control: package description to disclose that
+    Ubuntu is no longer collecting statistics.
+  * debian/postinst:
+    - remove popcon.ubuntu.com URL from SUBMITURLS.
+    - remove [e-mail] from MAILTO.
+    - remove popcon.ubuntu.com URL if set in debconf.
+  * debian/cron.daily: log when URL contains popcon.ubuntu.com
+    or if MAILTO contains [e-mail] and also filter
+    them out from processing.
+
+ -- Tiago St�rmer Daitx <[e-mail]>  Wed, 07 Oct 2020 20:58:34 +0000
+
 popularity-contest (1.70ubuntu1) groovy; urgency=low
 
   * Merge from Debian unstable.  Remaining changes:
@@ -1499,4 +1522,3 @@ popularity-contest (0.00) unstable; urgency=low
   * Initial test release.
 
  -- Avery Pennarun <[e-mail]>  Sat, 24 Oct 1998 22:33:58 -0400
-
diff --git a/debian/config b/debian/config
index 3a44268..cae659e 100644
--- a/debian/config
+++ b/debian/config
@@ -26,5 +26,5 @@ if [ -f $conffile ] ; then
        db_set popularity-contest/participate "$PARTICIPATE"
 fi
 
-db_input medium popularity-contest/participate || [ $? -eq 30 ]
+db_input high popularity-contest/participate || [ $? -eq 30 ]
 db_go || true
diff --git a/debian/control b/debian/control
index 57ee095..0e328e9 100644
--- a/debian/control
+++ b/debian/control
@@ -14,16 +14,19 @@ Package: popularity-contest
 Architecture: all
 Pre-Depends: debconf (>= 1.5.34) | cdebconf (>= 0.106)
 Depends: ${misc:Depends}, ${perl:Depends}, dpkg (>= 1.10)
-Recommends: cron | cron-daemon
-Suggests: gnupg, anacron, tor, torsocks
+Recommends: gnupg, cron | cron-daemon, default-mta | mail-transport-agent
+Suggests: anacron, tor, torsocks
 Provides: popcon
 Description: Vote for your favourite packages automatically
+ Ubuntu no longer collects popularity-contest statistics. This
+ package is being kept for compatibility reasons.
+ .
  The popularity-contest package sets up a cron job that will
- periodically anonymously submit to the Ubuntu developers
- statistics about the most used Ubuntu packages on this system.
+ periodically anonymously submit to the Debian developers
+ statistics about the most used Debian packages on this system.
  .
- This information helps Ubuntu make decisions such as which packages
- should go on the first CD. It also lets Ubuntu improve future versions
+ This information helps Debian make decisions such as which packages
+ should go on the first CD. It also lets Debian improve future versions
  of the distribution so that the most popular packages are the ones which
  are installed automatically for new users.
 
diff --git a/debian/cron.daily b/debian/cron.daily
index 4770058..7a840b9 100644
--- a/debian/cron.daily
+++ b/debian/cron.daily
@@ -58,6 +58,12 @@ if test -d /etc/popularity-contest.d/; then
   done
 fi
 
+# filter out Ubuntu's popcon email address
+if echo $MAILTO | grep -q '[e-mail]'; then
+    logger -t popularity-contest "Ubuntu is no longer collecting package statistics. You can safely remove its email address. Please consider disabling or uninstalling it by running 'sudo dpkg-reconfigure popularity-contest' or 'sudo apt remove --purge popularity-contest'."
+    MAILTO="$(echo $MAILTO | sed 's:[e-mail]::g')"
+fi
+
 # don't run if MAILTO address is blank, and not configured to use HTTP POST!
 if [ -z "$MAILTO" ] && [ "yes" != "$USEHTTP" ]; then exit 0; fi
 
@@ -156,8 +162,10 @@ SUBMITTED=no
 # try to post the report through http POST
 if [ "$SUBMITURLS" ] && [ "yes" = "$USEHTTP" ]; then
     for URL in $SUBMITURLS ; do
-	if setsid $TORIFY /usr/share/popularity-contest/popcon-upload \
-	    -u $URL -f $POPCON -C 2>/dev/null ; then
+	if echo $URL | grep -q 'popcon.ubuntu.com'; then
+		logger -t popularity-contest "Ubuntu is no longer collecting package statistics. You can safely remove $URL. Please consider disabling or uninstalling it by running 'sudo dpkg-reconfigure popularity-contest' or 'sudo apt remove --purge popularity-contest'."
+	elif setsid $TORIFY /usr/share/popularity-contest/popcon-upload \
+	    -u $URL -f $POPCON 2>/dev/null ; then
 		SUBMITTED=yes
 	        set_sub
 	else
diff --git a/debian/po/ar.po b/debian/po/ar.po
index 2290d12..16f31df 100644
--- a/debian/po/ar.po
+++ b/debian/po/ar.po
@@ -20,7 +20,6 @@ msgstr ""
 "PO-Revision-Date: 2006-08-04 01:01+0300\n"
 "Last-Translator: Ossama M. Khayat <[e-mail]>\n"
 "Language-Team: Arabic <[e-mail]>\n"
-"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,15 +65,3 @@ msgid ""
 msgstr ""
 "يمكنك دائماً تغيير رأيك بعد اتّخاذ هذا بتنفذ الأمر \"dpkg-reconfigure "
 "popularity-contest\""
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"إذا اخترت المشاركة فنصّ التّسليم البرمجي الآلي سيعمل أسبوعيّاً مرسلاً الإحصائيّات "
-"إلى مطوّري ديبيان. يمكن الاطلاع على الاحصائيات عبر الموقع: http://popcon."
-"debian.org/."
diff --git a/debian/po/ast.po b/debian/po/ast.po
index 5b79cbb..67b5056 100644
--- a/debian/po/ast.po
+++ b/debian/po/ast.po
@@ -19,7 +19,6 @@ msgstr ""
 "PO-Revision-Date: 2009-01-06 21:16+0100\n"
 "Last-Translator: astur <[e-mail]>\n"
 "Language-Team: Asturian <[e-mail]>\n"
-"Language: ast\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -69,16 +68,3 @@ msgid ""
 msgstr ""
 "Esta elleición pue camudase más sero executando \"dpkg-reconfigure "
 "popularity-contest\"."
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Si decides participar, la presentación automática de secuencia de comandos "
-"executaráse una vegada a la selmana,  unviando les estadístiques a los "
-"desendolcadores de la distribución. Les estadístiques recoyíes puen vese en "
-"http://popcon.debian.org/."
diff --git a/debian/po/be.po b/debian/po/be.po
index fe8fdb6..7676acc 100644
--- a/debian/po/be.po
+++ b/debian/po/be.po
@@ -20,7 +20,6 @@ msgstr ""
 "PO-Revision-Date: 2007-10-24 03:00+0300\n"
 "Last-Translator: Hleb Rubanau <[e-mail]>\n"
 "Language-Team: Belarusian <[e-mail]>\n"
-"Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -67,15 +66,3 @@ msgid ""
 msgstr ""
 "Зроблены зараз выбар пазней можна змяніць запускам \"dpkg-reconfigure "
 "popularity-contest\"."
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Калі Вы вырашыце ўдзельнічаць, адпаведны скрыпт будзе штотыдзень дасылаць "
-"статыстыку распрацоўшчыкам дыстрыбутыву. Супольныя вынікі можна паглядзець "
-"па адрасе http://popcon.debian.org/."
diff --git a/debian/po/bg.po b/debian/po/bg.po
index c5493b6..2bf2086 100644
--- a/debian/po/bg.po
+++ b/debian/po/bg.po
@@ -19,7 +19,6 @@ msgstr ""
 "PO-Revision-Date: 2006-11-01 13:04+0200\n"
 "Last-Translator: Damyan Ivanov <[e-mail]>\n"
 "Language-Team: Bulgarian <[e-mail]>\n"
-"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -40,10 +39,10 @@ msgid ""
 "influences decisions such as which packages should go on the first "
 "distribution CD."
 msgstr ""
-"Системата Ви може да изпраща анонимно ел.поща до разработчиците на "
-"дистрибуцията с информация кои са най-често използваните пакети. Тази "
-"информация влияе на решения като например кои пакети да се включат в първия "
-"компактдиск на дистрибуцията."
+"Системата Ви може да изпраща анонимно ел.поща до "
+"разработчиците на дистрибуцията с информация кои са най-често използваните "
+"пакети. Тази информация влияе на решения като например кои пакети да се "
+"включат в първия компактдиск на дистрибуцията."
 
 #. Type: boolean
 #. Description
@@ -53,9 +52,9 @@ msgid ""
 "every week, sending statistics to the distribution developers. The collected "
 "statistics can be viewed on https://popcon.debian.org/."
 msgstr ""
-"Ако изберете да участвате, специална програма ще изпраща статистиката до "
-"разработчиците на дистрибуцията веднъж седмично. Събраните данни са на "
-"разположение на адрес https://popcon.debian.org/."
+"Ако изберете да участвате, специална програма ще изпраща статистиката "
+"до разработчиците на дистрибуцията веднъж седмично. "
+"Събраните данни са на разположение на адрес https://popcon.debian.org/."
 
 #. Type: boolean
 #. Description
@@ -64,17 +63,6 @@ msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
 msgstr ""
-"Винаги можете да промените решението си по-късно, като изпълните „dpkg-"
-"reconfigure popularity-contest“."
+"Винаги можете да промените решението си по-късно, като изпълните "
+"„dpkg-reconfigure popularity-contest“."
 
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Ако изберете да участвате, специална програма ще изпраща статистиката до "
-"разработчиците на дистрибуцията веднъж седмично. Събраните данни са на "
-"разположение на адрес http://popcon.debian.org/."
diff --git a/debian/po/bn.po b/debian/po/bn.po
index ec1d4a6..73e4d8a 100644
--- a/debian/po/bn.po
+++ b/debian/po/bn.po
@@ -23,7 +23,6 @@ msgstr ""
 "PO-Revision-Date: 2006-09-13 19:11+0600\n"
 "Last-Translator: Mahay Alam Khan (মাহে আলম) <[e-mail]>\n"
 "Language-Team: Bengali <[e-mail]>\n"
-"Language: bn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -37,46 +36,18 @@ msgstr "প্যাকেজ ব্যবহারের সার্ভেত�
 #. Type: boolean
 #. Description
 #: ../templates:4
-msgid ""
-"The system may anonymously supply the distribution developers with "
-"statistics about the most used packages on this system.  This information "
-"influences decisions such as which packages should go on the first "
-"distribution CD."
-msgstr ""
-"ডিস্ট্রিবিউশন ডেভেলপারদের হয়তো অজ্ঞাত পরিচয়ে, এই সিস্টেমে ব্যবহৃত অধিকাংশ প্যাকেজ "
-"সম্পর্কে জানানো হতে পারে। ডিস্ট্রিবিউশন সিডির প্রথম সিডিটিতে কি কি প্যাকেজ থাকা "
-"উচিত, সেটার সিদ্ধান্ত নিতে এটি করা হয়।"
+msgid "The system may anonymously supply the distribution developers with statistics about the most used packages on this system.  This information influences decisions such as which packages should go on the first distribution CD."
+msgstr "ডিস্ট্রিবিউশন ডেভেলপারদের হয়তো অজ্ঞাত পরিচয়ে, এই সিস্টেমে ব্যবহৃত অধিকাংশ প্যাকেজ সম্পর্কে জানানো হতে পারে। ডিস্ট্রিবিউশন সিডির প্রথম সিডিটিতে কি কি প্যাকেজ থাকা উচিত, সেটার সিদ্ধান্ত নিতে এটি করা হয়।"
 
 #. Type: boolean
 #. Description
 #: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on https://popcon.debian.org/."
-msgstr ""
-"আপনি যদি অংশগ্রহন করতে চান, তাহলে পরিসংখ্যান ডেভেলপারের কাছে পাঠানোর নিমিত্তে "
-"সয়ংক্রিয় স্ক্রিপ্ট প্রতি সপ্তাহে একবার আপনাআপনি চলবে। সংগৃহিত পরিসংখ্যান https://"
-"popcon.debian.org/ সাইটে দেখতে পাওয়া যাবে।"
+msgid "If you choose to participate, the automatic submission script will run once every week, sending statistics to the distribution developers. The collected statistics can be viewed on https://popcon.debian.org/."
+msgstr "আপনি যদি অংশগ্রহন করতে চান, তাহলে পরিসংখ্যান ডেভেলপারের কাছে পাঠানোর নিমিত্তে সয়ংক্রিয় স্ক্রিপ্ট প্রতি সপ্তাহে একবার আপনাআপনি চলবে। সংগৃহিত পরিসংখ্যান https://popcon.debian.org/ সাইটে দেখতে পাওয়া যাবে।"
 
 #. Type: boolean
 #. Description
 #: ../templates:4
-msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
-msgstr ""
-"\"dpkg-reconfigure popularity-contest\" কমান্ডটি চালিয়ে এই পছন্দটি পরবর্তীতে "
-"পরিবর্তন করা যবে।"
+msgid "This choice can be later modified by running \"dpkg-reconfigure popularity-contest\"."
+msgstr "\"dpkg-reconfigure popularity-contest\" কমান্ডটি চালিয়ে এই পছন্দটি পরবর্তীতে পরিবর্তন করা যবে।"
 
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"আপনি যদি অংশগ্রহন করতে চান, তাহলে পরিসংখ্যান ডেভেলপারের কাছে পাঠানোর নিমিত্তে "
-"সয়ংক্রিয় স্ক্রিপ্ট প্রতি সপ্তাহে একবার আপনাআপনি চলবে। সংগৃহিত পরিসংখ্যান http://"
-"popcon.debian.org/ সাইটে দেখতে পাওয়া যাবে।"
diff --git a/debian/po/bs.po b/debian/po/bs.po
index 6ec06b1..6b00f73 100644
--- a/debian/po/bs.po
+++ b/debian/po/bs.po
@@ -66,15 +66,3 @@ msgid ""
 msgstr ""
 "Ovu odluku možete kasnije promijeniti pokretanjem \"dpkg-reconfigure "
 "popularity-contest\"."
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Ako odlučite sudjelovati, skripta za automatsko podnošenje podataka će se "
-"pokretati jednom sedmično i slati statistike razvijateljima distribucije. "
-"Prikupljene statistike se mogu vidjeti na http://popcon.debian.org/."
diff --git a/debian/po/ca.po b/debian/po/ca.po
index 3789c64..13f42a7 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -11,7 +11,6 @@ msgstr ""
 "PO-Revision-Date: 2006-10-22 16:40+0200\n"
 "Last-Translator: Jordi Mallach <[e-mail]>\n"
 "Language-Team: Catalan <[e-mail]>\n"
-"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,11 +29,7 @@ msgid ""
 "statistics about the most used packages on this system.  This information "
 "influences decisions such as which packages should go on the first "
 "distribution CD."
-msgstr ""
-"El vostre sistema pot enviar anònimament estadístiques dels paquets més "
-"utilitzats en aquest sistema als desenvolupadors de la distribució. Aquesta "
-"informació influencia decisions com ara quins paquets hauria d'incloure el "
-"primer CD de la distribució."
+msgstr "El vostre sistema pot enviar anònimament estadístiques dels paquets més utilitzats en aquest sistema als desenvolupadors de la distribució. Aquesta informació influencia decisions com ara quins paquets hauria d'incloure el primer CD de la distribució."
 
 #. Type: boolean
 #. Description
@@ -44,10 +39,10 @@ msgid ""
 "every week, sending statistics to the distribution developers. The collected "
 "statistics can be viewed on https://popcon.debian.org/."
 msgstr ""
-"Si decidiu participar-hi, la seqüència d'enviament automàtic s'executarà un "
-"cop a la setmana i enviarà les estadístiques als desenvolupadors de la "
-"distribució. Les estadístiques recollides es poden consultar a https://"
-"popcon.debian.org/."
+"Si decidiu participar-hi, la seqüència d'enviament automàtic s'executarà "
+"un cop a la setmana i enviarà les estadístiques als "
+"desenvolupadors de la distribució. Les estadístiques recollides es poden "
+"consultar a https://popcon.debian.org/."
 
 #. Type: boolean
 #. Description
@@ -59,19 +54,6 @@ msgstr ""
 "Sempre podeu canviar d'opinió posteriorment: \"dpkg-reconfigure popularity-"
 "contest\"."
 
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Si decidiu participar-hi, la seqüència d'enviament automàtic s'executarà un "
-"cop a la setmana i enviarà les estadístiques als desenvolupadors de la "
-"distribució. Les estadístiques recollides es poden consultar a http://popcon."
-"debian.org/."
-
 #~ msgid "Generating unique host identifier failed"
 #~ msgstr ""
 #~ "S'ha produït un error en la generació de l'identificador d'ordinador únic"
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 4d9bbb5..3d1c184 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -19,7 +19,6 @@ msgstr ""
 "PO-Revision-Date: 2006-07-30 10:01+0200\n"
 "Last-Translator: Miroslav Kure <[e-mail]>\n"
 "Language-Team: Czech <[e-mail]>\n"
-"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -65,18 +64,6 @@ msgstr ""
 "Své rozhodnutí můžete kdykoliv změnit, stačí spustit: \"dpkg-reconfigure "
 "popularity-contest\"."
 
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Pokud se rozhodnete připojit, automatický skript bude jednou týdně odesílat "
-"statistiku zpět vývojářům distribuce. Zpracované statistiky si můžete "
-"prohlédnout na http://popcon.debian.org/."
-
 #~ msgid "Generating unique host identifier failed"
 #~ msgstr "Vytváření jednoznačné identifikace počítače selhalo"
 
diff --git a/debian/po/cy.po b/debian/po/cy.po
index 6565608..ef1d45f 100644
--- a/debian/po/cy.po
+++ b/debian/po/cy.po
@@ -28,47 +28,18 @@ msgstr "Cymeryd rhan yn yr arolwg defnydd pecynnau?"
 #. Type: boolean
 #. Description
 #: ../templates:4
-msgid ""
-"The system may anonymously supply the distribution developers with "
-"statistics about the most used packages on this system.  This information "
-"influences decisions such as which packages should go on the first "
-"distribution CD."
-msgstr ""
-"Fe all y system gyflenwi ystadegau anhysbys i ddatblygwyr y dosbarthiad sy'n "
-"dangos y pecynnau ddefnyddir amlaf y system hwn. Mae'r wybodaeth hwn yn "
-"dylanwadu ar benderfyniadau ynglyn a pa becynnau ddylai fynd ar CD cynta y "
-"dosbarthiad."
+msgid "The system may anonymously supply the distribution developers with statistics about the most used packages on this system.  This information influences decisions such as which packages should go on the first distribution CD."
+msgstr "Fe all y system gyflenwi ystadegau anhysbys i ddatblygwyr y dosbarthiad sy'n dangos y pecynnau ddefnyddir amlaf y system hwn. Mae'r wybodaeth hwn yn dylanwadu ar benderfyniadau ynglyn a pa becynnau ddylai fynd ar CD cynta y dosbarthiad."
 
 #. Type: boolean
 #. Description
 #: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on https://popcon.debian.org/."
-msgstr ""
-"Os ydych yn dewis cymeryd rhan, fe fydd sgript awtomatig yn rhedeg unwaith "
-"yr wythnos, gan ddanfon ystadegau i ddatblygwyr y dosbarthiad. Fe ellir "
-"gweld yr ystadegau a gasglwyd ar https://popcon.debian.org/."
+msgid "If you choose to participate, the automatic submission script will run once every week, sending statistics to the distribution developers. The collected statistics can be viewed on https://popcon.debian.org/."
+msgstr "Os ydych yn dewis cymeryd rhan, fe fydd sgript awtomatig yn rhedeg unwaith yr wythnos, gan ddanfon ystadegau i ddatblygwyr y dosbarthiad. Fe ellir gweld yr ystadegau a gasglwyd ar https://popcon.debian.org/."
 
 #. Type: boolean
 #. Description
 #: ../templates:4
-msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
-msgstr ""
-"Mae'n bosib newid y dewis hwn nes ymlaen drwy redeg \"dpkg-reconfigure "
-"popularity-contest\"."
+msgid "This choice can be later modified by running \"dpkg-reconfigure popularity-contest\"."
+msgstr "Mae'n bosib newid y dewis hwn nes ymlaen drwy redeg \"dpkg-reconfigure popularity-contest\"."
 
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Os ydych yn dewis cymeryd rhan, fe fydd sgript awtomatig yn rhedeg unwaith "
-"yr wythnos, gan ddanfon ystadegau i ddatblygwyr y dosbarthiad. Fe ellir "
-"gweld yr ystadegau a gasglwyd ar http://popcon.debian.org/."
diff --git a/debian/po/da.po b/debian/po/da.po
index 46139b8..ab9c3c3 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -16,11 +16,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popularity-contest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-29 12:23+0200\n"
+"POT-Creation-Date: 2006-09-09 13:31-0600\n"
 "PO-Revision-Date: 2006-10-02 08:41+0200\n"
 "Last-Translator: Claus Hindsgaul <[e-mail]>\n"
 "Language-Team: Danish\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,27 +27,27 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates:4
+#: ../templates:1001
 msgid "Participate in the package usage survey?"
 msgstr "Vil du deltage i unders�gelsen om brug af pakkernes?"
 
 #. Type: boolean
 #. Description
-#: ../templates:4
+#: ../templates:1001
 msgid ""
 "The system may anonymously supply the distribution developers with "
 "statistics about the most used packages on this system.  This information "
 "influences decisions such as which packages should go on the first "
 "distribution CD."
 msgstr ""
-"System kan anonymt forsyne distributionsudviklerne med statistikker om de "
-"mest benyttede pakker p� dette system. Disse oplysninger har indflydelse p� "
-"beslutninger som f.eks. hvilke pakker der skal v�re p� den f�rste cd i "
-"distributionen."
+"System kan anonymt forsyne distributionsudviklerne med statistikker om "
+"de mest benyttede pakker p� dette system. Disse oplysninger har "
+"indflydelse p� beslutninger som f.eks. hvilke pakker der skal v�re p� den "
+"f�rste cd i distributionen."
 
 #. Type: boolean
 #. Description
-#: ../templates:4
+#: ../templates:1001
 msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
@@ -60,25 +59,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates:4
+#: ../templates:1001
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
 msgstr ""
-"Du kan �ndre denne indstilling senere ved at k�re: \"dpkg-reconfigure "
-"popularity-contest\""
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Hvis du v�lger at deltage, vil et automatisk script k�re hver uge, som "
-"sender statistikkerne til distributionsdviklerne. De indsamlede statistikker "
-"kan ses p� ttp://popcon.debian.org/."
+"Du kan �ndre denne indstilling senere ved at k�re: \"dpkg-reconfigure popularity-"
+"contest\""
 
 #~ msgid "Generating unique host identifier failed"
 #~ msgstr "Oprettelse af unik v�rts-identificering fejlede"
@@ -104,3 +91,4 @@ msgstr ""
 
 #~ msgid "If you do not want to use HTTP, email is used instead."
 #~ msgstr "Hvis du ikke vil bruge HTTP, vil email bruges i stedet."
+
diff --git a/debian/po/de.po b/debian/po/de.po
index 0eda726..ce8bfca 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -22,7 +22,6 @@ msgstr ""
 "PO-Revision-Date: 2006-08-03 18:50+0200\n"
 "Last-Translator: Jens Seidel <[e-mail]>\n"
 "Language-Team: Debian German <[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -69,16 +68,3 @@ msgid ""
 msgstr ""
 "Die Wahl kann später durch Ausführen von »dpkg-reconfigure popularity-"
 "contest« geändert werden."
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Wenn Sie sich entscheiden teilzunehmen, wird das automatische "
-"Übertragungsprogramm wöchentlich ausgeführt und Statistiken an die "
-"Distributions-Entwickler senden. Die vollständigen Statistiken können unter "
-"http://popcon.debian.org/ eingesehen werden."
diff --git a/debian/po/dz.po b/debian/po/dz.po
index 705890b..9052690 100644
--- a/debian/po/dz.po
+++ b/debian/po/dz.po
@@ -19,7 +19,6 @@ msgstr ""
 "PO-Revision-Date: 2006-08-07 16:20+0530\n"
 "Last-Translator: dorji tashi <[e-mail]>\n"
 "Language-Team: Dzongkha <[e-mail]>\n"
-"Language: dz\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -69,18 +68,6 @@ msgstr ""
 "གདམ་ཁ་འདི་ཤུལ་ལས་ :\"dpkg-reconfigure popularity-contest\" དེ་གཡོག་བཀོལ་བའི་ཐོག་ལས་"
 "ལེགས་བཅོས་གཏང་ཚུགས།"
 
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"ཁྱོད་ཀྱིས་གདམ་བཅའ་མར་གཏོགས་ནི་ནང་ལུ་གདམ་ཁ་རྐྱབ་པ་ཅིན་ རང་བཞིན་གྱིས་ཞུ་འབུལ་ཡིག་ཚུགས་དེ་གིས་ བགོ་"
-"བཀྲམ་བཟོ་མི་ནང་ལུ་ཚད་རྩིས་གཏང་པའི་ཐོག་ལས་ བདུན་ཕྲག་རེ་ནང་ཚར་རེ་ གཡོག་བཀོལ་འོང་། ཚད་རྩིས་བསྡུ་ལེན་"
-"འབད་ཡོད་མི་ཚུ་http://popcon.debian.org/.དེ་གི་ཐོག་ལས་སྟོན་ཚུགས།"
-
 #~ msgid "Generating unique host identifier failed"
 #~ msgstr "མཐུན་མོངས་མ་ཡིན་པའི་ཧོསཊི་ངོས་འཛིན་པ་བཟོ་སྟོན་འབད་ནི་དེ་ འཐུས་ཤོར་འབྱུང་ཡོདཔ།"
 
diff --git a/debian/po/el.po b/debian/po/el.po
index 0981e2e..45108ac 100644
--- a/debian/po/el.po
+++ b/debian/po/el.po
@@ -20,7 +20,6 @@ msgstr ""
 "PO-Revision-Date: 2006-09-04 17:05+0300\n"
 "Last-Translator: quad-nrg.net <[e-mail]>\n"
 "Language-Team: el <[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -69,16 +68,3 @@ msgid ""
 msgstr ""
 "Η επιλογή αυτή μπορεί να τροποποιηθεί αργότερα εκτελώντας την εντολή \"dpkg-"
 "reconfigure popularity-contest\"."
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Αν επιλέξετε να συμμετάσχετε, το σενάριο αυτόματης υποβολής θα εκτελείται "
-"μια φορά την εβδομάδα, στέλνοντας στατιστικά στους προγραμματιστές της "
-"διανομής τουDebian. Τα στατιστικά στοιχεία που συλλέγονται μπορούν να "
-"βρεθούν στον δικτυακό τόπο http://popcon.debian.org/."
diff --git a/debian/po/eo.po b/debian/po/eo.po
index a27bc5a..b1a0cfb 100644
--- a/debian/po/eo.po
+++ b/debian/po/eo.po
@@ -20,7 +20,6 @@ msgstr ""
 "PO-Revision-Date: 2007-02-03 00:18+0100\n"
 "Last-Translator: Serge Leblanc <[e-mail]>\n"
 "Language-Team: Esperanto <[e-mail]>\n"
-"Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -65,15 +64,3 @@ msgid ""
 msgstr ""
 "Vi ĉiam povas ŝanĝi vian decidon per la ordono \"dpkg-reconfigure popularity-"
 "contest\"."
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Se vi partoprenas, la aŭtomata submetita skripto estos ĉiusemajne plenumita "
-"por sendi statistikojn al la Debianaj administristoj. Statistikoj estas "
-"videblaj tie: 'http://popcon.debian.org/'."
diff --git a/debian/po/es.po b/debian/po/es.po
index 36f9946..d0ee328 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -19,7 +19,6 @@ msgstr ""
 "PO-Revision-Date: 2006-07-31 15:28+0200\n"
 "Last-Translator: Ruben Porras <[e-mail]>\n"
 "Language-Team: ES <[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,18 +65,6 @@ msgstr ""
 "La elecci�n siempre puede cambiar con la orden �dpkg-reconfigure popularity-"
 "contest�"
 
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Si elige participar, el script de env�o se ejecutar� autom�ticamente una vez "
-"a la semana, mandando estad�sticas a los desarrolladores. Las estad�sticas "
-"se pueden consultar en http://popcon.debian.org/."
-
 #~ msgid "Generating unique host identifier failed"
 #~ msgstr "Fall� la generaci�n del identificador de sistema"
 
diff --git a/debian/po/et.po b/debian/po/et.po
index 15d3a0e..31bd1bb 100644
--- a/debian/po/et.po
+++ b/debian/po/et.po
@@ -19,7 +19,6 @@ msgstr ""
 "PO-Revision-Date: 2006-10-04 07:05+0300\n"
 "Last-Translator: Siim Põder <[e-mail]>\n"
 "Language-Team: \n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,46 +34,18 @@ msgstr "Võtta osa pakkide kasutatavuse uurimusest?"
 #. Type: boolean
 #. Description
 #: ../templates:4
-msgid ""
-"The system may anonymously supply the distribution developers with "
-"statistics about the most used packages on this system.  This information "
-"influences decisions such as which packages should go on the first "
-"distribution CD."
-msgstr ""
-"See süsteem varustab arendajad anonüümselt pakkide kasutamise statistikaga "
-"selles masinas. Selle info põhjal võetakse vastu otsuseid, nagu näiteks "
-"jaotuse esimesele laserkettale tarkvara valimine."
+msgid "The system may anonymously supply the distribution developers with statistics about the most used packages on this system.  This information influences decisions such as which packages should go on the first distribution CD."
+msgstr "See süsteem varustab arendajad anonüümselt pakkide kasutamise statistikaga selles masinas. Selle info põhjal võetakse vastu otsuseid, nagu näiteks jaotuse esimesele laserkettale tarkvara valimine."
 
 #. Type: boolean
 #. Description
 #: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on https://popcon.debian.org/."
-msgstr ""
-"Kui oled nõus osa võtma, saadab automaatne skript kord nädalas su süsteemi "
-"pakikasutuse-statistika jaotuse arendajatele. Kogutud statistika on nähtaval "
-"aadressilt https://popcon.debian.org/."
+msgid "If you choose to participate, the automatic submission script will run once every week, sending statistics to the distribution developers. The collected statistics can be viewed on https://popcon.debian.org/."
+msgstr "Kui oled nõus osa võtma, saadab automaatne skript kord nädalas su süsteemi pakikasutuse-statistika jaotuse arendajatele. Kogutud statistika on nähtaval aadressilt https://popcon.debian.org/."
 
 #. Type: boolean
 #. Description
 #: ../templates:4
-msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
-msgstr ""
-"Seda valikut saab hiljem muuta, käivitades \"dpkg-reconfigure popularity-"
-"contest\"."
+msgid "This choice can be later modified by running \"dpkg-reconfigure popularity-contest\"."
+msgstr "Seda valikut saab hiljem muuta, käivitades \"dpkg-reconfigure popularity-contest\"."
 
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Kui oled nõus osa võtma, saadab automaatne skript kord nädalas su süsteemi "
-"pakikasutuse-statistika jaotuse arendajatele. Kogutud statistika on nähtaval "
-"aadressilt http://popcon.debian.org/."
diff --git a/debian/po/eu.po b/debian/po/eu.po
index 5d36551..0bceb50 100644
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -9,7 +9,6 @@ msgstr ""
 "PO-Revision-Date: 2006-11-29 15:45+0100\n"
 "Last-Translator: Piarres Beobide <[e-mail]>\n"
 "Language-Team: librezale <[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,9 +31,9 @@ msgid ""
 "distribution CD."
 msgstr ""
 "Sistema honek anonimoki garatzaileei posta elektronikoz sistema honetan "
-"gehien erabiltzen diren paketeen estatistikak bidaliko dizkie.  Informazio "
-"honek erabakiak hartzen lagunduko du, aurreneko CDak edukiko dituen paketeen "
-"zerrenda osatzen adibidez."
+"gehien erabiltzen diren paketeen estatistikak bidaliko dizkie.  Informazio honek erabakiak hartzen "
+"lagunduko du, aurreneko CDak edukiko dituen paketeen zerrenda osatzen "
+"adibidez."
 
 #. Type: boolean
 #. Description
@@ -58,14 +57,3 @@ msgstr ""
 "Nahi duzunean erabakiz alda dezakezu, honakoa exekutatuz: \"dpkg-reconfigure "
 "popularity-contest\""
 
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Parte hartzea hautatu baduzu, astean behin bidalketa automatiko script-a "
-"exekutatuko da,  garatzaileei estatistikak bidaliaz. Jasotako "
-"estatististikak hemen ikus daitezke:http://popcon.debian.org/."
diff --git a/debian/po/fa.po b/debian/po/fa.po
index 524445c..b940aec 100644
--- a/debian/po/fa.po
+++ b/debian/po/fa.po
@@ -67,15 +67,3 @@ msgid ""
 msgstr ""
 "اين انتخاب در اينده ميتواند با اين دستور اصلاح گردد:dpkg-reconfigure "
 "popularity-contest"
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"اگر شما اشتراك گزاري را انتخاب كنيد هر هفته اسكريپتي آمار را به توسعه "
-"دهندگان ارسال ميكند.امار جمع آوري شده را ميتوانيد در اين آدرس ببينيد http://"
-"popcon.debian.org"
diff --git a/debian/po/fi.po b/debian/po/fi.po
index 6108e1e..cc43c94 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -18,7 +18,6 @@ msgstr ""
 "PO-Revision-Date: 2006-07-30 12:57+0300\n"
 "Last-Translator: Tapio Lehtonen <[e-mail]>\n"
 "Language-Team: Finnish <[e-mail]>\n"
-"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -64,18 +63,6 @@ msgid ""
 msgstr ""
 "Voit muuttaa mielesi milloin tahansa: \"dpkg-reconfigure popularity-contest\""
 
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Jos päätät osallistua, kerran viikossa suoritettava komentotiedosto lähettää "
-"tilastoja jakelun kehittäjille. Kootut tilastot ovat luettavissa osoitteessa "
-"http://popcon.debian.org/."
-
 #~ msgid "Generating unique host identifier failed"
 #~ msgstr "Yksikäsitteisen konetunnisteen luominen epäonnistui"
 
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 268bb82..0da95a2 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -21,7 +21,6 @@ msgstr ""
 "PO-Revision-Date: 2008-07-15 08:10+0200\n"
 "Last-Translator: Christian Perrier <[e-mail]>\n"
 "Language-Team: French <[e-mail]>\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -71,15 +70,3 @@ msgid ""
 msgstr ""
 "Vous pourrez à tout moment modifier votre choix en exécutant « dpkg-"
 "reconfigure popularity-contest »."
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Si vous choisissez de participer, un script enverra automatiquement chaque "
-"semaine les statistiques aux responsables. Elles peuvent être consultées sur "
-"http://popcon.debian.org/."
diff --git a/debian/po/ga.po b/debian/po/ga.po
index bf842a5..2e8b21f 100644
--- a/debian/po/ga.po
+++ b/debian/po/ga.po
@@ -6,7 +6,6 @@ msgstr ""
 "PO-Revision-Date: 2008-05-11 12:23+0200\n"
 "Last-Translator: Kevin Scannell <[e-mail]>\n"
 "Language-Team: Irish <[e-mail]>\n"
-"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -51,15 +50,3 @@ msgid ""
 msgstr ""
 "Is féidir an rogha seo a athrú amach anseo trí \"dpkg-reconfigure popularity-"
 "contest\" a rith."
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Má roghnaíonn tú an suirbhé a dhéanamh, rithfidh script go huathoibríoch "
-"uair amháin sa tseachtain agus seolfaidh sí staitisticí chuig na forbróirí.  "
-"Is féidir na staitisticí go léir a fheiceáil ag http://popcon.debian.org/."
diff --git a/debian/po/gl.po b/debian/po/gl.po
index 7abc59a..c94d9c0 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -59,18 +59,6 @@ msgstr ""
 "Esta elección pódese cambiar máis tarde executando \"dpkg-reconfigure "
 "popularity-contest\"."
 
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Se quere participar, o programa de envío automático executarase unha vez por "
-"semana, enviándolle estatísticas aos desenvolvedores da distribución. As "
-"estatísticas colleitadas pódense ver en http://popcon.debian.org/."
-
 #~ msgid "Generating unique host identifier failed"
 #~ msgstr "A xeración do identificador único da máquina fallou"
 
diff --git a/debian/po/gu.po b/debian/po/gu.po
index bcedfe7..a8caff5 100644
--- a/debian/po/gu.po
+++ b/debian/po/gu.po
@@ -19,7 +19,6 @@ msgstr ""
 "PO-Revision-Date: 2006-10-16 08:44+0530\n"
 "Last-Translator: Kartik Mistry <[e-mail]>\n"
 "Language-Team: Gujarati <[e-mail]>\n"
-"Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -51,9 +50,9 @@ msgid ""
 "every week, sending statistics to the distribution developers. The collected "
 "statistics can be viewed on https://popcon.debian.org/."
 msgstr ""
-"જો તમે ભાગ લેવાનું પસંદ કરશો તો, આપમેળે મોકલી આપતી સ્ક્રિપ્ટ દર અઠવાડિયે એક વખત, "
-"ડિસ્ટ્રિબ્યુશનનાં ડેવલોપર્સને માહિતીઓ મોકલી આપશે. ભેગી કરેલ માહિતીઓ તમે https://popcon."
-"debian.org/ પર જોઇ શકશો."
+"જો તમે ભાગ લેવાનું પસંદ કરશો તો, આપમેળે મોકલી આપતી સ્ક્રિપ્ટ દર અઠવાડિયે એક વખત, ડિસ્ટ્રિબ્યુશનનાં "
+"ડેવલોપર્સને માહિતીઓ મોકલી આપશે. ભેગી કરેલ માહિતીઓ તમે https://popcon.debian.org/ "
+"પર જોઇ શકશો."
 
 #. Type: boolean
 #. Description
@@ -63,15 +62,3 @@ msgid ""
 "contest\"."
 msgstr ""
 "આ વિકલ્પ પાછળથી \"dpkg-reconfigure popularity-contest\" ચલાવીને બદલી શકાય છે."
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"જો તમે ભાગ લેવાનું પસંદ કરશો તો, આપમેળે મોકલી આપતી સ્ક્રિપ્ટ દર અઠવાડિયે એક વખત, "
-"ડિસ્ટ્રિબ્યુશનનાં ડેવલોપર્સને માહિતીઓ મોકલી આપશે. ભેગી કરેલ માહિતીઓ તમે http://popcon."
-"debian.org/ પર જોઇ શકશો."
diff --git a/debian/po/he.po b/debian/po/he.po
index e425aaa..8d88e35 100644
--- a/debian/po/he.po
+++ b/debian/po/he.po
@@ -19,7 +19,6 @@ msgstr ""
 "PO-Revision-Date: 2007-10-06 17:38+0200\n"
 "Last-Translator: Lior Kaplan <[e-mail]>\n"
 "Language-Team: Hebrew <[e-mail]>\n"
-"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -64,14 +63,3 @@ msgid ""
 msgstr ""
 "בחירה זאת ניתנת לשינוי בעתיד על ידי הרצת הפקודה \"dpkg-reconfigure "
 "popularity-contest\""
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"אם בחרת להשתתף, סקריפט השליחה האוטומטי ירוץ פעם בשבוע וישלח את המידע למפתחי "
-"ההפצה. הסטטיסטיקה הנאספת ניתנת לצפייה בכתובת: http://popcon.debian.org/."
diff --git a/debian/po/hi.po b/debian/po/hi.po
index 66b7308..258c752 100644
--- a/debian/po/hi.po
+++ b/debian/po/hi.po
@@ -19,7 +19,6 @@ msgstr ""
 "PO-Revision-Date: 2006-10-22 16:40+0530\n"
 "Last-Translator: Ravishankar Shrivastava <[e-mail]>\n"
 "Language-Team: HindiTrans <[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,46 +34,18 @@ msgstr "पैकेज इस्तेमाल सर्वे में आ�
 #. Type: boolean
 #. Description
 #: ../templates:4
-msgid ""
-"The system may anonymously supply the distribution developers with "
-"statistics about the most used packages on this system.  This information "
-"influences decisions such as which packages should go on the first "
-"distribution CD."
-msgstr ""
-"इस तंत्र पर सबसे ज्यादा इस्तेमाल किए गए पैकेजों के बारे में सांख्यिकी को वितरण डेवलपरों को "
-"तंत्र अनाम रूप से भेज सकता है. यह जानकारी उन निर्णयों को लेने में काम आती है जैसे कि - किन "
-"पैकेजों को वितरण के प्रथम सीडी में डाला जाए."
+msgid "The system may anonymously supply the distribution developers with statistics about the most used packages on this system.  This information influences decisions such as which packages should go on the first distribution CD."
+msgstr "इस तंत्र पर सबसे ज्यादा इस्तेमाल किए गए पैकेजों के बारे में सांख्यिकी को वितरण डेवलपरों को तंत्र अनाम रूप से भेज सकता है. यह जानकारी उन निर्णयों को लेने में काम आती है जैसे कि - किन पैकेजों को वितरण के प्रथम सीडी में डाला जाए."
 
 #. Type: boolean
 #. Description
 #: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on https://popcon.debian.org/."
-msgstr ""
-"यदि आप भाग लेने के लिए चुनते हैं, सर्वे जमा करने का स्वचालित स्क्रिप्ट प्रत्येक सप्ताह एक बार "
-"चलेगा, जो कि वितरण डेवलपरों को सांख्यिकी भेजेगा. संग्रहित सांख्यिकी को https://popcon."
-"debian.org/ पर देखा जा सकता है."
+msgid "If you choose to participate, the automatic submission script will run once every week, sending statistics to the distribution developers. The collected statistics can be viewed on https://popcon.debian.org/."
+msgstr "यदि आप भाग लेने के लिए चुनते हैं, सर्वे जमा करने का स्वचालित स्क्रिप्ट प्रत्येक सप्ताह एक बार चलेगा, जो कि वितरण डेवलपरों को सांख्यिकी भेजेगा. संग्रहित सांख्यिकी को https://popcon.debian.org/ पर देखा जा सकता है."
 
 #. Type: boolean
 #. Description
 #: ../templates:4
-msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
-msgstr ""
-"इस विकल्प को आप बाद में \"dpkg-reconfigure popularity-contest\" चलाकर बदल भी "
-"सकते हैं."
+msgid "This choice can be later modified by running \"dpkg-reconfigure popularity-contest\"."
+msgstr "इस विकल्प को आप बाद में \"dpkg-reconfigure popularity-contest\" चलाकर बदल भी सकते हैं."
 
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"यदि आप भाग लेने के लिए चुनते हैं, सर्वे जमा करने का स्वचालित स्क्रिप्ट प्रत्येक सप्ताह एक बार "
-"चलेगा, जो कि वितरण डेवलपरों को सांख्यिकी भेजेगा. संग्रहित सांख्यिकी को http://popcon."
-"debian.org/ पर देखा जा सकता है."
diff --git a/debian/po/hr.po b/debian/po/hr.po
index d209652..566d675 100644
--- a/debian/po/hr.po
+++ b/debian/po/hr.po
@@ -7,7 +7,6 @@ msgstr ""
 "PO-Revision-Date: 2006-09-27 12:50+0200\n"
 "Last-Translator: Josip Rodin <[e-mail]>\n"
 "Language-Team: Croatian <[e-mail]>\n"
-"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -39,8 +38,8 @@ msgid ""
 "every week, sending statistics to the distribution developers. The collected "
 "statistics can be viewed on https://popcon.debian.org/."
 msgstr ""
-"Ako odlu�ite sudjelovati, automatska skripta �e se pokretati svaki tjedan i "
-"slati statistike razvijateljima distribucije. Sabrane statistike se mogu "
+"Ako odlu�ite sudjelovati, automatska skripta �e se pokretati svaki tjedan "
+"i slati statistike razvijateljima distribucije. Sabrane statistike se mogu "
 "vidjeti na https://popcon.debian.org/."
 
 #. Type: boolean
@@ -50,17 +49,5 @@ msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
 msgstr ""
-"Uvijek se mo�ete predomisliti i promijeniti svoj izbor pokretanjem: \"dpkg-"
-"reconfigure popularity-contest\"."
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Ako odlu�ite sudjelovati, automatska skripta �e se pokretati svaki tjedan i "
-"slati statistike razvijateljima distribucije. Sabrane statistike se mogu "
-"vidjeti na http://popcon.debian.org/."
+"Uvijek se mo�ete predomisliti i promijeniti svoj izbor pokretanjem: "
+"\"dpkg-reconfigure popularity-contest\"."
diff --git a/debian/po/hu.po b/debian/po/hu.po
index 9904b43..7de18ec 100644
--- a/debian/po/hu.po
+++ b/debian/po/hu.po
@@ -18,9 +18,7 @@ msgstr ""
 "POT-Creation-Date: 2006-07-29 12:23+0200\n"
 "PO-Revision-Date: 2006-10-02 22:15+0100\n"
 "Last-Translator: SZERVÁC Attila <[e-mail]>\n"
-"Language-Team: Debian L10n Hungarian <[e-mail]."
-"org>\n"
-"Language: \n"
+"Language-Team: Debian L10n Hungarian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,53 +34,23 @@ msgstr "Részt veszel a csomaghasználat felmérésben?"
 #. Type: boolean
 #. Description
 #: ../templates:4
-msgid ""
-"The system may anonymously supply the distribution developers with "
-"statistics about the most used packages on this system.  This information "
-"influences decisions such as which packages should go on the first "
-"distribution CD."
-msgstr ""
-"Névtelenül statisztikákat közölhetsz a Debian fejlesztőivel a leggyakrabban "
-"használt Debian csomagokról. E statisztikák alapján szoktak dönteni (többek "
-"közt) az első Debian-CD-n szereplő programok listájáról."
+msgid "The system may anonymously supply the distribution developers with statistics about the most used packages on this system.  This information influences decisions such as which packages should go on the first distribution CD."
+msgstr "Névtelenül statisztikákat közölhetsz a Debian fejlesztőivel a leggyakrabban használt Debian csomagokról. E statisztikák alapján szoktak dönteni (többek közt) az első Debian-CD-n szereplő programok listájáról."
 
 #. Type: boolean
 #. Description
 #: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on https://popcon.debian.org/."
-msgstr ""
-"Ha a részvétel mellett döntesz, az adatok beküldését végző program hetente "
-"lefut és statisztikákat juttat el a Debian fejlesztőkhöz. Az összegyűjtött "
-"statisztikák címe: https://popcon.debian.org/."
+msgid "If you choose to participate, the automatic submission script will run once every week, sending statistics to the distribution developers. The collected statistics can be viewed on https://popcon.debian.org/."
+msgstr "Ha a részvétel mellett döntesz, az adatok beküldését végző program hetente lefut és statisztikákat juttat el a Debian fejlesztőkhöz. Az összegyűjtött statisztikák címe: https://popcon.debian.org/."
 
 #. Type: boolean
 #. Description
 #: ../templates:4
-msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
-msgstr ""
-"A választás később a \"dpkg-reconfigure popularity-contest\" paranccsal "
-"módosítható."
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Ha a részvétel mellett döntesz, az adatok beküldését végző program hetente "
-"lefut és statisztikákat juttat el a Debian fejlesztőkhöz. Az összegyűjtött "
-"statisztikák címe: http://popcon.debian.org/."
+msgid "This choice can be later modified by running \"dpkg-reconfigure popularity-contest\"."
+msgstr "A választás később a \"dpkg-reconfigure popularity-contest\" paranccsal módosítható."
 
 #~ msgid "Generating unique host identifier failed"
 #~ msgstr "Egyedi gazdagép-azonosító előállítása nem sikerült"
-
 #~ msgid ""
 #~ "The install script could not generate a unique host identifier. This is a "
 #~ "fatal error, as all hosts submitting information need to have an unique "
@@ -91,18 +59,16 @@ msgstr ""
 #~ "A telepítő nem tudott egy egyedi gazdagép-azonosítót előállítani. Ez "
 #~ "megkerülhetetlen hiba, hiszen az adatszolgáltatásban résztvevő minden "
 #~ "gépet külön azonosítónak kell jelölnie."
-
 #~ msgid ""
 #~ "Please report this problem as a bug against the popularity-contest "
 #~ "package, and include information about your configuration."
 #~ msgstr ""
 #~ "Kérlek, jelentsd be a popularity-contest csomag e hibáját, és a "
 #~ "hibajelentésben írd le az érintett gép jellemzőit is."
-
 #~ msgid "Use HTTP to submit reports?"
 #~ msgstr "HTTP-t használjak a jelentések küldéséhez?"
-
 #~ msgid "If you do not want to use HTTP, email is used instead."
 #~ msgstr ""
 #~ "Ha nem kívánsz HTTP-t használni, a jelentések e-mailben kerülnek "
 #~ "elküldésre."
+
diff --git a/debian/po/id.po b/debian/po/id.po
index 3d69462..4a7ac7a 100644
--- a/debian/po/id.po
+++ b/debian/po/id.po
@@ -9,7 +9,6 @@ msgstr ""
 "PO-Revision-Date: 2006-10-21 17:39+0700\n"
 "Last-Translator: Arief S Fitrianto <[e-mail]>\n"
 "Language-Team: Debian Indonesia <[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,56 +22,23 @@ msgstr "Berpartisipasi dalam Survey Penggunaan Paket Debian?"
 #. Type: boolean
 #. Description
 #: ../templates:4
-msgid ""
-"The system may anonymously supply the distribution developers with "
-"statistics about the most used packages on this system.  This information "
-"influences decisions such as which packages should go on the first "
-"distribution CD."
-msgstr ""
-"Anda bisa mendapatkan sistem anda mengirim surat-e anonim ke pengembang "
-"Debian yang berisi statistik paket Debian yang paling sering anda gunakan. "
-"Informasi ini mempengaruhi keputusan paket-paket mana saja yang sebaiknya "
-"dimasukkan dalam CD Debian pertama."
+msgid "The system may anonymously supply the distribution developers with statistics about the most used packages on this system.  This information influences decisions such as which packages should go on the first distribution CD."
+msgstr "Anda bisa mendapatkan sistem anda mengirim surat-e anonim ke pengembang Debian yang berisi statistik paket Debian yang paling sering anda gunakan. Informasi ini mempengaruhi keputusan paket-paket mana saja yang sebaiknya dimasukkan dalam CD Debian pertama."
 
 #. Type: boolean
 #. Description
 #: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on https://popcon.debian.org/."
-msgstr ""
-"Jika anda memilih untuk berpartisipasi, script akan dijalankan secara "
-"otomatis setiap minggu untuk mengirimkan statistik kepada para pengembang "
-"Debian. Statistik yang dikumpulkan dapat dilihat di https://popcon.debian."
-"org/."
+msgid "If you choose to participate, the automatic submission script will run once every week, sending statistics to the distribution developers. The collected statistics can be viewed on https://popcon.debian.org/."
+msgstr "Jika anda memilih untuk berpartisipasi, script akan dijalankan secara otomatis setiap minggu untuk mengirimkan statistik kepada para pengembang Debian. Statistik yang dikumpulkan dapat dilihat di https://popcon.debian.org/."
 
 #. Type: boolean
 #. Description
 #: ../templates:4
-msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
-msgstr ""
-"Anda selalu dapat mengubah pilihan anda setelah ini dengan: \"dpkg-"
-"reconfigure popularity-contest\""
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Jika anda memilih untuk berpartisipasi, script akan dijalankan secara "
-"otomatis setiap minggu untuk mengirimkan statistik kepada para pengembang "
-"Debian. Statistik yang dikumpulkan dapat dilihat di http://popcon.debian."
-"org/."
+msgid "This choice can be later modified by running \"dpkg-reconfigure popularity-contest\"."
+msgstr "Anda selalu dapat mengubah pilihan anda setelah ini dengan: \"dpkg-reconfigure popularity-contest\""
 
 #~ msgid "Generating unique host identifier failed"
 #~ msgstr "Gagal membuat identitas host unik"
-
 #~ msgid ""
 #~ "The install script could not generate a unique host identifier. This is a "
 #~ "fatal error, as all hosts submitting information need to have an unique "
@@ -81,16 +47,14 @@ msgstr ""
 #~ "Script instal tidak dapat membuat sebuah identitas host yang unik. Ini "
 #~ "merupakan kesalahan fatal, karena semua host yang mengumpulkan informasi "
 #~ "perlu memiliki identitas unik."
-
 #~ msgid ""
 #~ "Please report this problem as a bug against the popularity-contest "
 #~ "package, and include information about your configuration."
 #~ msgstr ""
 #~ "Silakan laporkan masalah ini sebagai bug atas paket popularity-contest, "
 #~ "dan berikan juga informasi tentang konfigurasi anda."
-
 #~ msgid "Use HTTP to submit reports?"
 #~ msgstr "Gunakan HTTP untuk mengirim laporan?"
-
 #~ msgid "If you do not want to use HTTP, email is used instead."
 #~ msgstr "Jika anda tak ingin menggunakan HTTP, surat-e yang akan dipakai."
+
diff --git a/debian/po/is.po b/debian/po/is.po
index 0cd8b87..4b1bfe5 100644
--- a/debian/po/is.po
+++ b/debian/po/is.po
@@ -66,15 +66,3 @@ msgid ""
 msgstr ""
 "Það er hægt að breyta þessu vali síðar með því að keyra \"dpkg-reconfigure "
 "popularity-contest\"."
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Ef þú ákveður að taka þátt, mun sjálfvirk skrifta keyrast einu sinni í viku "
-"og senda tölfræði til þróunarteymisins. Hægt er að skoða "
-"heildarniðurstöðurnar á http://popcon.debian.org/."
diff --git a/debian/po/it.po b/debian/po/it.po
index 3a4c402..739e604 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -11,7 +11,6 @@ msgstr ""
 "PO-Revision-Date: 2009-12-04 22:52+0100\n"
 "Last-Translator: Milo Casagrande <[e-mail]>\n"
 "Language-Team: Italian <[e-mail]>\n"
-"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,15 +56,3 @@ msgid ""
 msgstr ""
 "La scelta fatta qui può essere successivamente modificata eseguendo il "
 "comando «dpkg-reconfigure popularity-contest»."
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Se si sceglie di partecipare, l'invio automatico avverrà una volta alla "
-"settimana, inviando le statistiche agli sviluppatori del sistema operativo. "
-"Le statistiche possono essere visualizzate su: http://popcon.debian.org/."
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 021fb8c..e96d228 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -19,7 +19,6 @@ msgstr ""
 "PO-Revision-Date: 2006-07-30 22:18+0900\n"
 "Last-Translator: Kenshi Muto <[e-mail]>\n"
 "Language-Team: Japanese <[e-mail]>\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -65,15 +64,3 @@ msgid ""
 msgstr ""
 "この決定は、あとでいつでも \"dpkg-reconfigure popularity-contest\" を実行して"
 "変更できます。"
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"参加することを選ぶと、自動提出スクリプトが毎週 1 回自動的に実行され、ディスト"
-"リビューション開発者に統計が送られます。収集された統計は、http://popcon."
-"debian.org/ で見ることができます。"
diff --git a/debian/po/ka.po b/debian/po/ka.po
index a021dc8..6f2647f 100644
--- a/debian/po/ka.po
+++ b/debian/po/ka.po
@@ -19,7 +19,6 @@ msgstr ""
 "PO-Revision-Date: 2008-09-09 21:44+0400\n"
 "Last-Translator: Aiet Kolkhi <[e-mail]>\n"
 "Language-Team: Georgian <[e-mail]>\n"
-"Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -67,15 +66,3 @@ msgid ""
 msgstr ""
 "არჩევანის შეცვლა შესაძლებელია ბრძანებით: „dpkg-reconfigure popularity-"
 "contest“."
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"თუ მიიღებთ მონაწილეობას, ავტომატურად გადაგზავნის სკრიფტი კვირაში ერთხელ "
-"გაეშვება და სტატისტიკას დისტრიბუციის დეველოპერებს გადაუგზავნის. სტატისტიკები "
-"ქვეყნდება მისამართზე: http://popcon.debian.org/."
diff --git a/debian/po/kk.po b/debian/po/kk.po
index 6eeb80c..5e91448 100644
--- a/debian/po/kk.po
+++ b/debian/po/kk.po
@@ -70,15 +70,3 @@ msgid ""
 msgstr ""
 "Таңдауыңызды кейін \"dpkg-reconfigure popularity-contest\" командасын "
 "орындау арқылы өзгерте аласыз."
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Егер Сіз қатысуды таңдасаңыз, статистикалық деректер автоматты түрде әр апта "
-"сайын дистрибутив шығарушыларға жіберіліп тұрады. Жиналған статистиканы мына "
-"жерден көруге болады: http://popcon.debian.org/."
diff --git a/debian/po/km.po b/debian/po/km.po
index d764d9d..51107c6 100644
--- a/debian/po/km.po
+++ b/debian/po/km.po
@@ -12,7 +12,6 @@ msgstr ""
 "PO-Revision-Date: 2006-07-31 08:21+0700\n"
 "Last-Translator: Khoem Sokhem <[e-mail]>\n"
 "Language-Team: Khmer <[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -56,14 +55,3 @@ msgid ""
 msgstr ""
 "ជម្រើសនេះអាចត្រូវបានកែប្រែនៅពេលក្រោយដោយរត់ \"dpkg-reconfigure popularity-contest"
 "\" ។"
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"ប្រសិន​បើ​អ្នក​ជ្រើស​ដើម្បី​ចូល​រួម ស្គ្រីប​ចែកចាយ​ដោយ​ស្វ័យប្រវត្តិ​នឹង​រត់​ម្ដង​ក្នុង​មួយ សប្ដាហ៍ ការ​ផ្ញើ​ស្ថិតិ​ទៅ​"
-"អភិវឌ្ឍន៍​ចែកចាយ ។ ស្ថិតិ​ដែល​បាន​ប្រមូលផ្ដុំ​អាច​ត្រូវ​បាន​មើល​នៅ​លើ http://popcon.debian.org/ ។"
diff --git a/debian/po/kn.po b/debian/po/kn.po
index 35b3c7c..9d9f10c 100644
--- a/debian/po/kn.po
+++ b/debian/po/kn.po
@@ -56,14 +56,3 @@ msgid ""
 msgstr ""
 "ಈ ಆಯ್ಕೆಯನ್ನು ನಂತರ ಬದಲಿಸಬಹುದು.ಆಯ್ಕೆ ಬದಲಿಸಲು ಕೆಳಗಿನ ಕಮಾಂಡ್ ಟೈಪ್ ಮಾಡಿ.\"dpkg-"
 "reconfigure popularity-contest\""
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"ಭಾಗವಹಿಸಲು ನೀವು ಒಪ್ಪಿದಲ್ಲಿ, ವಾರಕ್ಕೊಮ್ಮೆ ಬಳಕೆಯ ಮಾಹಿತಿಯನ್ನು ತಯಾರಕರಿಗೆ ಕಳಿಸಲಾಗುತ್ತದೆ.ಆ "
-"ಮಾಹಿತಿಯನ್ನು http://popcon.debian.orgಯಲ್ಲಿ ನೋಡಬಹುದು."
diff --git a/debian/po/ko.po b/debian/po/ko.po
index 86e3e12..0a5f9cf 100644
--- a/debian/po/ko.po
+++ b/debian/po/ko.po
@@ -10,7 +10,6 @@ msgstr ""
 "PO-Revision-Date: 2008-07-19 17:14+0900\n"
 "Last-Translator: Changwoo Ryu <[e-mail]>\n"
 "Language-Team: Korean <[e-mail]>\n"
-"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -55,15 +54,3 @@ msgid ""
 msgstr ""
 "이 결정은 다음 명령을 실행하면 언제든지 변경할 수 있습니다: \"dpkg-"
 "reconfigure popularity-contest\""
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"참가하시면 매 주 자동으로 스크립트를 실행해서 배포판 개발자들에게 통계 자료"
-"를 제출합니다. 수집한 통계자료는 http://popcon.debian.org/에서 볼 수 있습니"
-"다."
diff --git a/debian/po/lt.po b/debian/po/lt.po
index 725b3d6..05fdb77 100644
--- a/debian/po/lt.po
+++ b/debian/po/lt.po
@@ -67,15 +67,3 @@ msgid ""
 msgstr ""
 "Savo sprendimą dėl dalyvavimo vėliau galėsite pakeisti, įvykdydami komandą "
 "„dpkg-reconfigure popularity-contest“."
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Jei nuspręsite dalyvauti, kartą per savaitę bus automatiškai paleidžiamas "
-"scenarijus, siųsiantis statistinius duomenis distribucijos kūrėjams. "
-"Surinktą statistiką galima rasti adresu http://popcon.debian.org/."
diff --git a/debian/po/lv.po b/debian/po/lv.po
index 28c2259..a1b46d2 100644
--- a/debian/po/lv.po
+++ b/debian/po/lv.po
@@ -68,15 +68,3 @@ msgid ""
 msgstr ""
 "Šo izvēli var vēlāk mainīt ar komandu \"dpkg-reconfigure popularity-contest"
 "\"."
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Ja izvēlēsities piedalīties, automātiskais sūtīšanas skripts tiks palaists "
-"katru nedēļu, sūtot statistiku distribūcijas izstrādātājiem. Ievākto "
-"statistiku var redzēt vietnē http://popcon.debian.org/."
diff --git a/debian/po/mk.po b/debian/po/mk.po
index 2c7852e..49496c5 100644
--- a/debian/po/mk.po
+++ b/debian/po/mk.po
@@ -21,7 +21,6 @@ msgstr ""
 "PO-Revision-Date: 2008-09-26 12:42+0200\n"
 "Last-Translator: Arangel Angov <[e-mail]>\n"
 "Language-Team: Macedonian <[e-mail]>\n"
-"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,16 +67,3 @@ msgid ""
 msgstr ""
 "Изборот може да биде променет подоцна со „dpkg-reconfigure popularity-"
 "contest“."
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Ако одлучите да учествувате, скриптата за автоматско поставување ќе се "
-"извршува еднаш неделно и ќе праќа статистики од развојниот тим на "
-"дистрибуцијата. Собраните податоци можат да се гледаат на http://popcon."
-"debian.org/."
diff --git a/debian/po/ml.po b/debian/po/ml.po
index 47cb17d..175a5af 100644
--- a/debian/po/ml.po
+++ b/debian/po/ml.po
@@ -18,9 +18,7 @@ msgstr ""
 "POT-Creation-Date: 2006-07-29 12:23+0200\n"
 "PO-Revision-Date: 2006-12-03 18:00+0100\n"
 "Last-Translator: Praveen A <[e-mail]>\n"
-"Language-Team: Swatanthra Malayalam Computing <smc-discuss@googlegroups."
-"com>\n"
-"Language: \n"
+"Language-Team: Swatanthra Malayalam Computing <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -39,11 +37,7 @@ msgid ""
 "statistics about the most used packages on this system.  This information "
 "influences decisions such as which packages should go on the first "
 "distribution CD."
-msgstr ""
-"ഈ സിസ്റ്റത്തിലെ ഏറ്റവും കൂടുതല്‍ ഉപയോഗിക്കുന്ന പാക്കേജുകളുടെ കണക്കുകള്‍ ഇതു വഴി ഡിസ്ട്രിബ്യൂഷന്‍ "
-"ഡെവലപ്പേര്സിന് നിങ്ങളേക്കുറിച്ചുള്ള വിവരങ്ങള്‍ വെളിപ്പെടുത്താതെ തന്നെ ലഭ്യമാക്കിയെക്കാം. ഈ "
-"വിവരം ഏത് പാക്കേജുകളാണ് ആദ്യത്തെ സിഡിയില്‍ പോകേണ്ടത് എന്നത് പോലെയുള്ള തീരുമാനങ്ങളെ "
-"സ്വാധീനിക്കും."
+msgstr "ഈ സിസ്റ്റത്തിലെ ഏറ്റവും കൂടുതല്‍ ഉപയോഗിക്കുന്ന പാക്കേജുകളുടെ കണക്കുകള്‍ ഇതു വഴി ഡിസ്ട്രിബ്യൂഷന്‍ ഡെവലപ്പേര്സിന് നിങ്ങളേക്കുറിച്ചുള്ള വിവരങ്ങള്‍ വെളിപ്പെടുത്താതെ തന്നെ ലഭ്യമാക്കിയെക്കാം. ഈ വിവരം ഏത് പാക്കേജുകളാണ് ആദ്യത്തെ സിഡിയില്‍ പോകേണ്ടത് എന്നത് പോലെയുള്ള തീരുമാനങ്ങളെ സ്വാധീനിക്കും."
 
 #. Type: boolean
 #. Description
@@ -52,10 +46,7 @@ msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
 "statistics can be viewed on https://popcon.debian.org/."
-msgstr ""
-"നിങ്ങള്‍ പങ്കെടുക്കാന്‍ തിരഞ്ഞെടുക്കുകയാണെങ്കില്‍ സ്വയമേ സമര്പിക്കുന്ന സ്ക്രിപ്റ്റ് ആഴ്ചയിലൊരു തവണ ഓടി "
-"ഡിസ്ട്രിബ്യൂഷന്‍ ഡെവലപ്പേര്സിന് കണക്കുകള്‍ അയക്കും. ശേഖരിച്ച കണക്കുകള്‍ https://popcon.debian."
-"org/ ല്‍ കാണാം."
+msgstr "നിങ്ങള്‍ പങ്കെടുക്കാന്‍ തിരഞ്ഞെടുക്കുകയാണെങ്കില്‍ സ്വയമേ സമര്പിക്കുന്ന സ്ക്രിപ്റ്റ് ആഴ്ചയിലൊരു തവണ ഓടി ഡിസ്ട്രിബ്യൂഷന്‍ ഡെവലപ്പേര്സിന് കണക്കുകള്‍ അയക്കും. ശേഖരിച്ച കണക്കുകള്‍ https://popcon.debian.org/ ല്‍ കാണാം."
 
 #. Type: boolean
 #. Description
@@ -63,17 +54,4 @@ msgstr ""
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
-msgstr ""
-"\"dpkg-reconfigure popularity-contest\" എന്നോടിച്ച് ഈ ചോയിസ് പിന്നീട് മാറ്റാവുന്നതാണ്."
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"നിങ്ങള്‍ പങ്കെടുക്കാന്‍ തിരഞ്ഞെടുക്കുകയാണെങ്കില്‍ സ്വയമേ സമര്പിക്കുന്ന സ്ക്രിപ്റ്റ് ആഴ്ചയിലൊരു തവണ ഓടി "
-"ഡിസ്ട്രിബ്യൂഷന്‍ ഡെവലപ്പേര്സിന് കണക്കുകള്‍ അയക്കും. ശേഖരിച്ച കണക്കുകള്‍ http://popcon.debian."
-"org/ ല്‍ കാണാം."
+msgstr "\"dpkg-reconfigure popularity-contest\" എന്നോടിച്ച് ഈ ചോയിസ് പിന്നീട് മാറ്റാവുന്നതാണ്."
diff --git a/debian/po/mr.po b/debian/po/mr.po
index f1ad943..0848a2a 100644
--- a/debian/po/mr.po
+++ b/debian/po/mr.po
@@ -20,7 +20,6 @@ msgstr ""
 "Last-Translator: Priti Patil <[e-mail]>\n"
 "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai "
 "<[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -64,15 +63,3 @@ msgid ""
 "contest\"."
 msgstr ""
 "हा पर्याय \"dpkg-reconfigure लोकप्रियता स्पर्धा\" या आज्ञेद्वारा बदलता येऊ शकतो."
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"जर तुम्ही सहभागी होणार असाल तर, स्वयंचलीत स्क्रिप्ट/परिभाषा आठवडयातुन एकदा क्रियाशील "
-"होईल आणि ते वितरण डेव्हलपरकडे पाठविले जाईल. जमा झालेली आकडेवारी http://popcon."
-"debian.org/ वर पाहता येईल."
diff --git a/debian/po/nb.po b/debian/po/nb.po
index 3dc7ea4..b559cae 100644
--- a/debian/po/nb.po
+++ b/debian/po/nb.po
@@ -20,7 +20,6 @@ msgstr ""
 "PO-Revision-Date: 2006-09-04 18:55MET\n"
 "Last-Translator: Petter Reinholdtsen <[e-mail]>\n"
 "Language-Team: Norwegian Bokmål <[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -41,10 +40,10 @@ msgid ""
 "influences decisions such as which packages should go on the first "
 "distribution CD."
 msgstr ""
-"Systemet kan anonymt forsyne distribusjonsutviklerne med statistikk om de "
-"mest brukte pakkene på dette systemet.  Denne informasjonen påvirker "
-"avgjørelser som for eksempel hvilke pakker som bør bli med på den første "
-"distribusjons-CDen."
+"Systemet kan anonymt forsyne distribusjonsutviklerne med statistikk "
+"om de mest brukte pakkene på dette systemet.  Denne informasjonen "
+"påvirker avgjørelser som for eksempel hvilke pakker som bør bli med "
+"på den første distribusjons-CDen."
 
 #. Type: boolean
 #. Description
@@ -54,9 +53,8 @@ msgid ""
 "every week, sending statistics to the distribution developers. The collected "
 "statistics can be viewed on https://popcon.debian.org/."
 msgstr ""
-"Hvis du velger å delta, så vil et automatisk innsendingsskript kjøre en gang "
-"i uka for å sende statistikk til distribusjonsutviklerne.  Den innsamlede "
-"statistikken kan ses på https://popcon.debian.org/."
+"Hvis du velger å delta, så vil et automatisk innsendingsskript kjøre en "
+"gang i uka for å sende statistikk til distribusjonsutviklerne.  Den innsamlede statistikken kan ses på https://popcon.debian.org/."
 
 #. Type: boolean
 #. Description
@@ -64,18 +62,5 @@ msgstr ""
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
-msgstr ""
-"Dette valget kan senere endres ved å kjøre «dpkg reconfigure popularity-"
-"contest»."
+msgstr "Dette valget kan senere endres ved å kjøre «dpkg reconfigure popularity-contest»."
 
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Hvis du velger å delta, så vil et automatisk innsendingsskript kjøre en gang "
-"i uka for å sende statistikk til distribusjonsutviklerne.  Den innsamlede "
-"statistikken kan ses på http://popcon.debian.org/."
diff --git a/debian/po/ne.po b/debian/po/ne.po
index 8200b87..5172c7c 100644
--- a/debian/po/ne.po
+++ b/debian/po/ne.po
@@ -54,15 +54,3 @@ msgid ""
 msgstr ""
 " यो रोजाइ \"dpkg-reconfigure popularity-contest\" चलाएर पछि परिमार्जन गर्न "
 "सकिन्छ ।"
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"यदि तपाईँले भाग लिनका लागि रोज्नुभयो भने, वितरण विकासकर्ताहरूलाई तथ्याङ्क पठाउँदै "
-"स्वाचालित दाखिला स्क्रिप्ट हरेक हप्तामा एक पटक चल्छ।तथ्याङ्क http://popcon.debian."
-"org/ मा हेर्न सकिन्छ ।"
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 308a702..d692fa0 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -19,7 +19,6 @@ msgstr ""
 "PO-Revision-Date: 2006-08-07 13:19+0200\n"
 "Last-Translator: Thijs Kinkhorst <[e-mail]>\n"
 "Language-Team: debian-l10n-dutch <[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -69,16 +68,3 @@ msgid ""
 msgstr ""
 "U kunt uw keuze altijd nog herzien via het commando 'dpkg-reconfigure "
 "popularity-contest'"
-
-#  Description
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Indien u wilt deelnemen zal eenmaal per week een script uitgevoerd worden "
-"dat de statistieken naar de ontwikkelaars stuurt. De verzamelde statistieken "
-"kunnen bekeken worden op http://popcon.debian.org/."
diff --git a/debian/po/nn.po b/debian/po/nn.po
index 35f6d20..a10bd93 100644
--- a/debian/po/nn.po
+++ b/debian/po/nn.po
@@ -20,7 +20,6 @@ msgstr ""
 "PO-Revision-Date: 2006-12-12 18:34+0100\n"
 "Last-Translator: Håvard Korsvoll <[e-mail]>\n"
 "Language-Team: Norwegian nynorsk <[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -41,11 +40,7 @@ msgid ""
 "statistics about the most used packages on this system.  This information "
 "influences decisions such as which packages should go on the first "
 "distribution CD."
-msgstr ""
-"Systemet kan anonymt forsyne utviklarane av distribusjonen med statistikk "
-"over dei mest brukte pakkane på dette systemet. Denne informasjonen påverkar "
-"avgjerdsler om slike ting som kva for pakkar som bør bli med på den første "
-"CDen i distribusjonen."
+msgstr "Systemet kan anonymt forsyne utviklarane av distribusjonen med statistikk over dei mest brukte pakkane på dette systemet. Denne informasjonen påverkar avgjerdsler om slike ting som kva for pakkar som bør bli med på den første CDen i distribusjonen."
 
 #. Type: boolean
 #. Description
@@ -55,9 +50,8 @@ msgid ""
 "every week, sending statistics to the distribution developers. The collected "
 "statistics can be viewed on https://popcon.debian.org/."
 msgstr ""
-"Viss du vel å delta vil det ein gong i veka automatisk bli køyrt eit skript "
-"som sender inn rapport til distribusjonsutviklarane. Den innsamla "
-"statistikken kan lesast på https://popcon.debian.org/."
+"Viss du vel å delta vil det ein gong i veka automatisk bli køyrt eit skript som "
+"sender inn rapport til distribusjonsutviklarane. Den innsamla statistikken kan lesast på https://popcon.debian.org/."
 
 #. Type: boolean
 #. Description
@@ -66,17 +60,6 @@ msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
 msgstr ""
-"Du kan seinare endre det du vel her ved å køyra kommandoen «dpkg-reconfigure "
-"popularity-contest»."
+"Du kan seinare endre det du vel her ved å køyra kommandoen «dpkg-"
+"reconfigure popularity-contest»."
 
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Viss du vel å delta vil det ein gong i veka automatisk bli køyrt eit skript "
-"som sender inn rapport til distribusjonsutviklarane. Den innsamla "
-"statistikken kan lesast på http://popcon.debian.org/."
diff --git a/debian/po/pa.po b/debian/po/pa.po
index 3a49988..4924410 100644
--- a/debian/po/pa.po
+++ b/debian/po/pa.po
@@ -20,7 +20,6 @@ msgstr ""
 "PO-Revision-Date: 2006-11-06 09:44+0530\n"
 "Last-Translator: A S Alam <[e-mail]>\n"
 "Language-Team: Punjabi <[e-mail]>\n"
-"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -67,13 +66,3 @@ msgstr ""
 "ਤੁਸੀਂ ਇਹ ਫੈਸਲਾ ਕਰਨ ਉਪਰੰਤ ਕਦੇ ਵੀ ਆਪਣਾ ਮਨ ਬਦਲ ਸਕਦੇ ਹੋ \"dpkg-reconfigure popularity-"
 "contest\""
 
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"ਜੇਕਰ ਤੁਸੀਂ ਭਾਗ ਲੈਣ ਦੀ ਚੋਣ ਕੀਤੀ ਤਾਂ ਹਰੇਕ ਹਫ਼ਤੇ ਇਹ ਸਵੈ-ਚਾਲਤ ਭੇਜਣ ਸਕਰਿਪਟ ਚੱਲੇਗੀ ਅਤੇ ਡੇਬੀਅਨ "
-"ਖੋਜੀਆਂ ਨੂੰ ਅੰਕੜੇ ਭੇਜੇਗੀ। ਇੱਕਠੇ ਕੀਤੇ ਅੰਕੜੇ ਤੁਸੀਂ http://popcon.debian.org/ ਉੱਤੇ ਵੇਖ ਸਕਦੇ ਹੋ।"
diff --git a/debian/po/pl.po b/debian/po/pl.po
index b7ff721..544d459 100644
--- a/debian/po/pl.po
+++ b/debian/po/pl.po
@@ -19,7 +19,6 @@ msgstr ""
 "PO-Revision-Date: 2006-11-02 14:29+0100\n"
 "Last-Translator: Bartosz Fenski <[e-mail]>\n"
 "Language-Team: Polish <[e-mail]>\n"
-"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -40,9 +39,9 @@ msgid ""
 "distribution CD."
 msgstr ""
 "Mo�esz sprawi�, �e Tw�j system b�dzie anonimowo przesy�a� deweloperom "
-"informacje o najcz�ciej u�ywanych przez Ciebie pakietach. Te informacje "
-"maj� wp�yw na decyzj� o tym jakie pakiety zostan� umieszczona na pierwszej "
-"p�ycie instalacyjnej."
+"informacje o najcz�ciej u�ywanych przez Ciebie pakietach. Te "
+"informacje maj� wp�yw na decyzj� o tym jakie pakiety zostan� umieszczona na "
+"pierwszej p�ycie instalacyjnej."
 
 #. Type: boolean
 #. Description
@@ -54,8 +53,8 @@ msgid ""
 msgstr ""
 "Je�li zgodzisz si� na udzia� w tym konkursie, skrypt uruchamiany "
 "automatycznie raz w tygodniu b�dzie przesy�a� statystyki do deweloper�w "
-"dystybucji. Zebrane statystyki ogl�da� mo�na pod adresem https://popcon."
-"debian.org/."
+"dystybucji. Zebrane statystyki ogl�da� mo�na pod adresem "
+"https://popcon.debian.org/."
 
 #. Type: boolean
 #. Description
@@ -64,21 +63,8 @@ msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
 msgstr ""
-"Mo�esz w ka�dej chwili zmieni� swoje zdanie uruchamiaj�c p�niej: \"dpkg-"
-"reconfigure popularity-contest\""
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Je�li zgodzisz si� na udzia� w tym konkursie, skrypt uruchamiany "
-"automatycznie raz w tygodniu b�dzie przesy�a� statystyki do deweloper�w "
-"dystybucji. Zebrane statystyki ogl�da� mo�na pod adresem http://popcon."
-"debian.org/."
+"Mo�esz w ka�dej chwili zmieni� swoje zdanie uruchamiaj�c p�niej: \"dpkg-reconfigure "
+"popularity-contest\""
 
 #~ msgid "Generating unique host identifier failed"
 #~ msgstr "Generowanie unikalnego identyfikatora komputera nie powiod�o si�"
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 8c843ec..6369519 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -11,7 +11,6 @@ msgstr ""
 "PO-Revision-Date: 2005-07-07 20:56+0000\n"
 "Last-Translator: Miguel Figueiredo <[e-mail]>\n"
 "Language-Team: \n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -58,18 +57,6 @@ msgstr ""
 "Esta escolha pode ser posteriormente alterada correndo \"dpkg-reconfigure "
 "popularity-contest\""
 
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Se escolher participar, o script de submissão automática irá correr uma vez "
-"por semana, enviando estatísticas aos criadores da distribuição. As "
-"estatísticas adquiridas podem ser vistas em http://popcon.debian.org/."
-
 #~ msgid "Generating unique host identifier failed"
 #~ msgstr "Falhou ao gerar um identificador único para o host"
 
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index f17852f..0ac3b88 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -19,7 +19,6 @@ msgstr ""
 "PO-Revision-Date: 2006-09-18 03:28-0300\n"
 "Last-Translator: André Luís Lopes <[e-mail]>\n"
 "Language-Team: Debian-BR Project <[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -39,10 +38,10 @@ msgid ""
 "influences decisions such as which packages should go on the first "
 "distribution CD."
 msgstr ""
-"O sistema pode fornecer anonimamente aos desenvolvedores da distribuição "
-"estatísticas sobre os pacotes mais utilizados em seu sistema. Esta "
-"informação influencia decisões como quais pacotes deverão ser colocados no "
-"primeiro CD da distribuição."
+"O sistema pode fornecer anonimamente aos desenvolvedores da "
+"distribuição estatísticas sobre os pacotes mais utilizados em "
+"seu sistema. Esta informação influencia decisões como quais "
+"pacotes deverão ser colocados no primeiro CD da distribuição."
 
 #. Type: boolean
 #. Description
@@ -54,8 +53,8 @@ msgid ""
 msgstr ""
 "Caso você opte por participar, o script de envio automático será executado "
 "uma vez por semana, enviando as estatísticas para os desenvolvedores da "
-"distribuição. As estatísticas coletadas podem ser visualizadas em https://"
-"popcon.debian.org/."
+"distribuição. As estatísticas coletadas podem ser visualizadas em "
+"https://popcon.debian.org/."
 
 #. Type: boolean
 #. Description
@@ -67,19 +66,6 @@ msgstr ""
 "Sua escolha pode ser modificada posteriormente através da execução do "
 "comando \"dpkg-reconfigure popularity-contest\"."
 
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Caso você opte por participar, o script de envio automático será executado "
-"uma vez por semana, enviando as estatísticas para os desenvolvedores da "
-"distribuição. As estatísticas coletadas podem ser visualizadas em http://"
-"popcon.debian.org/."
-
 #~ msgid "Generating unique host identifier failed"
 #~ msgstr "A geração do identificador único de host falhou"
 
diff --git a/debian/po/ro.po b/debian/po/ro.po
index 4541a87..22f04e2 100644
--- a/debian/po/ro.po
+++ b/debian/po/ro.po
@@ -20,7 +20,6 @@ msgstr ""
 "PO-Revision-Date: 2006-07-30 19:34+0300\n"
 "Last-Translator: Eddy Petrisor <[e-mail]>\n"
 "Language-Team: Romanian <[e-mail]>\n"
-"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -70,18 +69,6 @@ msgstr ""
 "Această decizie poate fi schimbată oricând rulând „dpkg-reconfigure "
 "popularity-contest”."
 
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Dacă doriţi să participaţi, scriptul de trimitere automată va rula "
-"săptămânal, trimiţând prin statistici dezvoltatorilor distribuţiei. "
-"Statisticile colectate pot fi vizualizate la http://popcon.debian.org/."
-
 #~ msgid "Generating unique host identifier failed"
 #~ msgstr "Generarea identificatorului unic de calculator a eşuat"
 
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 8f85f4e..5b7848d 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -24,13 +24,12 @@ msgstr ""
 "PO-Revision-Date: 2006-07-30 10:20+0300\n"
 "Last-Translator: Yuri Kozlov <[e-mail]>\n"
 "Language-Team: Russian <[e-mail]>\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\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: boolean
 #. Description
@@ -73,15 +72,3 @@ msgid ""
 msgstr ""
 "Вы всегда можете изменить своё решение, выполнив команду: \"dpkg-reconfigure "
 "popularity-contest\"."
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Если вы примете участие, автоматический сценарий будет еженедельно "
-"отправлять статистику разработчикам дистрибутива. Собранную статистику можно "
-"посмотреть на http://popcon.debian.org/."
diff --git a/debian/po/si.po b/debian/po/si.po
index 858d0c8..b1cfbd9 100644
--- a/debian/po/si.po
+++ b/debian/po/si.po
@@ -65,14 +65,3 @@ msgid ""
 msgstr ""
 "මෙම තෝරාගැනීම පසුව \"dpkg-reconfigure popularity-contest\" වෙනස් කිරීම මගින් සැකසිය "
 "හැක."
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"ඔබ සහභාගී වීමට තෝරාගත්තේ නම්. සංවර්ධකයන්ට තොරතුරු ලබාදෙන ස්වයංක්‍රීය ඇතුළත් කිරීම් විධානාවලියක් "
-"සැම සතියකම ධාවනය වනු ඇත. එක් කරගත් තොරතුරු http://popcon.debian.org/ හීදී දැකිය හැක."
diff --git a/debian/po/sk.po b/debian/po/sk.po
index 3a6ec94..6f2e0d8 100644
--- a/debian/po/sk.po
+++ b/debian/po/sk.po
@@ -9,7 +9,6 @@ msgstr ""
 "PO-Revision-Date: 2009-02-25 17:11+0100\n"
 "Last-Translator: Ivan Masár <[e-mail]>\n"
 "Language-Team: Slovak <[e-mail]>\n"
-"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -54,15 +53,3 @@ msgid ""
 msgstr ""
 "Svoje rozhodnutie môžete kedykoľvek zmeniť spustením príkazu „dpkg-"
 "reconfigure popularity-contest“."
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Ak sa zúčastníte tohto prehľadu, raz týždenne sa spustí automatický skript, "
-"ktorý odošle štatistiku vývojárom distribúcie. Prehľad štatistických údajov "
-"si môžete pozrieť na http://popcon.debian.org/."
diff --git a/debian/po/sl.po b/debian/po/sl.po
index 35aaf3c..30f1695 100644
--- a/debian/po/sl.po
+++ b/debian/po/sl.po
@@ -19,7 +19,6 @@ msgstr ""
 "PO-Revision-Date: 2010-02-16 14:58+0100\n"
 "Last-Translator: Vanja Cvelbar <[e-mail]>\n"
 "Language-Team: Slovenian <[e-mail]>\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -69,18 +68,6 @@ msgstr ""
 "Vašo odločitev lahko vedno spremenite z: \"dpkg-reconfigure popularity-"
 "contest\"."
 
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"V primeru, da se odločite sodelovati, bo skripta vsak teden samodejno "
-"poslala statistike razvijalcem distribucije. Zbrana statistika je na ogled "
-"na http://popcon.debian.org/."
-
 #~ msgid "Generating unique host identifier failed"
 #~ msgstr "Ustvarjanje enoznačnega identifikatorja računalnika ni uspelo"
 
diff --git a/debian/po/sq.po b/debian/po/sq.po
index 47fb66c..e8628ec 100644
--- a/debian/po/sq.po
+++ b/debian/po/sq.po
@@ -18,7 +18,6 @@ msgstr ""
 "PO-Revision-Date: 2006-10-22 18:36+0200\n"
 "Last-Translator: Elian Myftiu <[e-mail]>\n"
 "Language-Team: Debian L10n Albanian <[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -65,18 +64,6 @@ msgstr ""
 "Kjo zgjedhje mund të ndryshohet më vonë duke shtypur \"dpkg-reconfigure "
 "popularity-contest\""
 
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Nëse vendos të marrësh pjesë, një script automatik do xhirojë një herë në "
-"javë, duke i dërguar statistikat zhvilluesve të shpërndarjes. Statistikat e "
-"mbledhura mund të shihen në http://popcon.debian.org/."
-
 #~ msgid "Generating unique host identifier failed"
 #~ msgstr "Gjenerimi i identifikuesit të veçantë për kompjuterin dështoi"
 
diff --git a/debian/po/sr.po b/debian/po/sr.po
index 31a330e..813c0da 100644
--- a/debian/po/sr.po
+++ b/debian/po/sr.po
@@ -56,15 +56,3 @@ msgid ""
 "contest\"."
 msgstr ""
 "Овај избор се можете променити помоћу „dpkg-reconfigure popularity-contest“."
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Ако изаберете да учествујете, аутоматска скрипта ће слати статистику једном "
-"недељно програмерима дистрибуције. Сакупљена статистика може да се види на "
-"http://popcon.debian.org/."
diff --git a/debian/po/[e-mail] b/debian/po/[e-mail]
index 58110d2..d3c3a32 100644
--- a/debian/po/[e-mail]
+++ b/debian/po/[e-mail]
@@ -56,15 +56,3 @@ msgid ""
 "contest\"."
 msgstr ""
 "Ovaj izbor se možete promeniti pomoću „dpkg-reconfigure popularity-contest“."
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Ako izaberete da učestvujete, automatska skripta će slati statistiku jednom "
-"nedeljno programerima distribucije. Sakupljena statistika može da se vidi na "
-"http://popcon.debian.org/."
diff --git a/debian/po/sv.po b/debian/po/sv.po
index fe992eb..2c36c37 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -19,7 +19,6 @@ msgstr ""
 "PO-Revision-Date: 2006-08-01 19:45+0100\n"
 "Last-Translator: Daniel Nylander <[e-mail]>\n"
 "Language-Team: Swedish <[e-mail]>\n"
-"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,18 +65,6 @@ msgstr ""
 "Du kan alltid �ndra detta val senare genom att k�ra \"dpkg-reconfigure "
 "popularity-contest\"."
 
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Om du v�ljer att delta kommer det automatiska inl�mningsskriptet att k�ras "
-"automatiskt veckovis och skicka statistik till Debianutvecklarna. Den "
-"insamlade statistiken kan ses p� http://popcon.debian.org/."
-
 #~ msgid "Generating unique host identifier failed"
 #~ msgstr "Generering av unik v�rdidentifierare misslyckades"
 
diff --git a/debian/po/ta.po b/debian/po/ta.po
index 225cd98..9cff5e4 100644
--- a/debian/po/ta.po
+++ b/debian/po/ta.po
@@ -5,6 +5,7 @@
 #
 #
 #  Senthil Kumar <[e-mail]> ,2006
+
 msgid ""
 msgstr ""
 "Project-Id-Version: ta\n"
@@ -13,7 +14,6 @@ msgstr ""
 "PO-Revision-Date: 2006-12-13 10:15+0530\n"
 "Last-Translator: Senthil Kumar <[e-mail]>\n"
 "Language-Team: Tamil <[e-mail]>\n"
-"Language: ta\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,10 +32,7 @@ msgid ""
 "statistics about the most used packages on this system.  This information "
 "influences decisions such as which packages should go on the first "
 "distribution CD."
-msgstr ""
-"இந்த அமைப்பில் அதிகம் உபயோகிக்கபட்ட கட்டுகள் பற்றிய புள்ளி விவரங்களை இந்த அமைப்பு "
-"நீங்கள்அறியாவண்ணம் விநியோக உருவாக்குனர்களுக்கு அனுப்பக்கூடும். இந்தகவல் எந்த கட்டுகள் முதலில் "
-"விநியோககுறுந்தகட்டில் இடம் பெறுவது என முடிவு செய்ய வழிவகுக்கும்"
+msgstr "இந்த அமைப்பில் அதிகம் உபயோகிக்கபட்ட கட்டுகள் பற்றிய புள்ளி விவரங்களை இந்த அமைப்பு நீங்கள்" "அறியாவண்ணம் விநியோக உருவாக்குனர்களுக்கு அனுப்பக்கூடும். இந்தகவல் எந்த கட்டுகள் முதலில் விநியோக" "குறுந்தகட்டில் இடம் பெறுவது என முடிவு செய்ய வழிவகுக்கும்"
 
 #. Type: boolean
 #. Description
@@ -44,11 +41,9 @@ msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
 "statistics can be viewed on https://popcon.debian.org/."
-msgstr ""
-"நீங்கள் பங்கு பெறுகிறீர்களெனில், தானியங்கி சமர்பிக்கும் உரை வாரமொரு முறை  "
-"செயல்படுத்தப்பட்டு,புள்ளிவிவரம் விநியோக உருவாக்குனர்களுக்கு அனுப்பப்படும். இவ்வண்ணம் "
-"சேகரிக்கப்பட்ட புள்ளிவிவரங்களைபின்வரும் இணையத்தள முகவரியில் காணலாம் https://popcon."
-"debian.org/."
+msgstr "நீங்கள் பங்கு பெறுகிறீர்களெனில், தானியங்கி சமர்பிக்கும் உரை வாரமொரு முறை  செயல்படுத்தப்பட்டு,"
+"புள்ளிவிவரம் விநியோக உருவாக்குனர்களுக்கு அனுப்பப்படும். இவ்வண்ணம் சேகரிக்கப்பட்ட புள்ளிவிவரங்களை"
+"பின்வரும் இணையத்தள முகவரியில் காணலாம் https://popcon.debian.org/."
 
 #. Type: boolean
 #. Description
@@ -56,19 +51,5 @@ msgstr ""
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
-msgstr ""
-"பின்பு இந்த தேர்வினை மாற்ற   \"dpkg-reconfigure popularity- கட்டளையை இயக்கம்.contest"
-"\"."
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"நீங்கள் பங்கு பெறுகிறீர்களெனில், தானியங்கி சமர்பிக்கும் உரை வாரமொரு முறை  "
-"செயல்படுத்தப்பட்டு,புள்ளிவிவரம் விநியோக உருவாக்குனர்களுக்கு அனுப்பப்படும். இவ்வண்ணம் "
-"சேகரிக்கப்பட்ட புள்ளிவிவரங்களைபின்வரும் இணையத்தள முகவரியில் காணலாம் http://popcon."
-"debian.org/."
+msgstr "பின்பு இந்த தேர்வினை மாற்ற   \"dpkg-reconfigure popularity- கட்டளையை இயக்கம்."
+"contest\"."
diff --git a/debian/po/te.po b/debian/po/te.po
index ce7e8b2..b8990c5 100644
--- a/debian/po/te.po
+++ b/debian/po/te.po
@@ -6,7 +6,6 @@ msgstr ""
 "PO-Revision-Date: 2009-07-12 13:23+0530\n"
 "Last-Translator: Veeven <[e-mail]>\n"
 "Language-Team: Telugu <[e-mail]>\n"
-"Language: te\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,14 +49,3 @@ msgid ""
 "contest\"."
 msgstr ""
 "మీ ఎంపికని తర్వాత ఎప్పుడైనా \"dpkg-reconfigure popularity-contest\" ని నడిపి మార్చుకోవచ్చు."
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"మీరు పాల్గొనాలని నిశ్చయించుకుంటే, ఈ ఆటోమెటిక్ స్క్రిప్టు వారానికి ఒక సారి నడుస్తూ గణాంకాలను తయారీదార్లకు "
-"పంపిస్తుంది. ఇలా సేకరించిన గణాంకాలని  http://popcon.debian.org/ వద్ద చూడవచ్చు."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 6f1b91e..1e9bafd 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -56,12 +56,3 @@ msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
 msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
diff --git a/debian/po/th.po b/debian/po/th.po
index 97c0eed..4569991 100644
--- a/debian/po/th.po
+++ b/debian/po/th.po
@@ -23,7 +23,6 @@ msgstr ""
 "PO-Revision-Date: 2006-07-29 20:25+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <[e-mail]>\n"
 "Language-Team: Thai <[e-mail]>\n"
-"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -69,18 +68,6 @@ msgstr ""
 "การเลือกนี้ สามารถเปลี่ยนได้ในภายหลัง โดยเรียกคำสั่ง \"dpkg-reconfigure popularity-"
 "contest\""
 
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"ถ้าคุณเลือกที่จะเข้าร่วม สคริปต์ส่งข้อมูลอัตโนมัติจะทำงานสัปดาห์ละครั้ง "
-"โดยส่งข้อมูลสถิติไปยังนักพัฒนาดิสทริบิวชัน ซึ่งข้อมูลสถิติที่รวบรวมไว้ทั้งหมดสามารถดูได้ที่ http://"
-"popcon.debian.org/"
-
 #~ msgid "Generating unique host identifier failed"
 #~ msgstr "สร้างชื่อเอกลักษณ์ของเครื่องไม่สำเร็จ"
 
diff --git a/debian/po/tl.po b/debian/po/tl.po
index 91152f1..689abbf 100644
--- a/debian/po/tl.po
+++ b/debian/po/tl.po
@@ -11,7 +11,6 @@ msgstr ""
 "PO-Revision-Date: 2006-07-29 22:29+0800\n"
 "Last-Translator: Eric Pareja <[e-mail]> \n"
 "Language-Team: tagalog <[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,19 +61,6 @@ msgstr ""
 "Maaaring baguhin ang pinili ninyo sa pagpapatakbo ng:  \"dpkg-reconfigure "
 "popularity-contest\""
 
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Kung pipiliin niyong makilahok, ang awtomatikong script sa pagpasa ay "
-"tatakbo minsan sa isang linggo, at magpapadala ng estadistika sa mga "
-"debeloper ng pamudmod. Ang natipon na estadistika ay maaaring makita sa "
-"http://popcon.debian.org/."
-
 #~ msgid "Generating unique host identifier failed"
 #~ msgstr "Ang paggawang ng nag-iisang pagkakakilanlan sa host ay nabigo."
 
diff --git a/debian/po/tr.po b/debian/po/tr.po
index d4b5831..0778a4f 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -11,7 +11,6 @@ msgstr ""
 "PO-Revision-Date: 2007-01-15 16:12+0200\n"
 "Last-Translator: Recai Oktaş <[e-mail]>\n"
 "Language-Team: Debian L10n Turkish <[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -58,15 +57,3 @@ msgid ""
 msgstr ""
 "Burada yapılan seçim, \"dpkg-reconfigure popularity-contest\" komutu "
 "çalıştırılarak daha sonra değiştirilebilir."
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Katılmak isterseniz otomatik gönderim betiği haftada bir kez çalışacak ve "
-"toplanan istatistikleri dağıtım geliştiricilerine gönderecektir. Bu "
-"istatistiklere http://popcon.debian.org/ adresinden erişilebilir."
diff --git a/debian/po/ug.po b/debian/po/ug.po
index f5d864e..162fabe 100644
--- a/debian/po/ug.po
+++ b/debian/po/ug.po
@@ -66,16 +66,3 @@ msgid ""
 msgstr ""
 "سەل تۇرۇپ “dpkg-reconfigure popularity-contest” ئىجرا قىلىش ئارقىلىق بۇ "
 "تاللانمىنى ئۆزگەرتكىلى بولىدۇ."
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"ئەگەر تەكشۈرۈشكە قاتنىشىشنى تاللىسىڭىز، ئۆزلۈكىدىن تاپشۇرۇش قوليازمىسى ھەر "
-"ھەپتىدە ئۆزلۈكىدىن بىر قېتىم ئىجرا قىلىنىپ، ستاتىستىكا سانلىق مەلۇماتىنى "
-"تارقىتىش نەشرىنىڭ ئىجادكارلىرىغا يوللايدۇ. توپلىغان ستاتىستىكا سانلىق "
-"مەلۇماتلىرىنى http://popcon.debian.org/ دىن كۆرۈشكە بولىدۇ."
diff --git a/debian/po/uk.po b/debian/po/uk.po
index 0622105..5cbf699 100644
--- a/debian/po/uk.po
+++ b/debian/po/uk.po
@@ -19,13 +19,11 @@ msgstr ""
 "PO-Revision-Date: 2006-10-02 21:46+0200\n"
 "Last-Translator: Eugeniy Meshcheryakov <[e-mail]>\n"
 "Language-Team: Ukrainian\n"
-"Language: \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: boolean
 #. Description
@@ -42,9 +40,8 @@ msgid ""
 "influences decisions such as which packages should go on the first "
 "distribution CD."
 msgstr ""
-"Система може анонімно відправляти статистику про пакунки, які найчастіше "
-"використовуються, до розробників дистрибутиву. Ця інформація впливатиме на "
-"рішення на кшталт які пакунки повинні знаходитись на першому CD."
+"Система може анонімно відправляти статистику про пакунки, які найчастіше використовуються, до розробників дистрибутиву. Ця інформація впливатиме на рішення "
+"на кшталт які пакунки повинні знаходитись на першому CD."
 
 #. Type: boolean
 #. Description
@@ -55,9 +52,7 @@ msgid ""
 "statistics can be viewed on https://popcon.debian.org/."
 msgstr ""
 "Якщо ви вирішите взяти участь, то скрипт автоматичного відсилання буде "
-"запускатися один раз на тиждень, відправляючи статистику розробникам "
-"дистрибутиву. Отриману статистику можна переглянути на https://popcon.debian."
-"org/."
+"запускатися один раз на тиждень, відправляючи статистику розробникам дистрибутиву. Отриману статистику можна переглянути на https://popcon.debian.org/."
 
 #. Type: boolean
 #. Description
@@ -66,17 +61,6 @@ msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
 msgstr ""
-"Вибір можна змінити пізніше запустивши „dpkg-reconfigure popularity-contest“."
+"Вибір можна змінити пізніше запустивши „dpkg-reconfigure "
+"popularity-contest“."
 
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Якщо ви вирішите взяти участь, то скрипт автоматичного відсилання буде "
-"запускатися один раз на тиждень, відправляючи статистику розробникам "
-"дистрибутиву. Отриману статистику можна переглянути на http://popcon.debian."
-"org/."
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 28ea7d0..36fc0ce 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -10,7 +10,6 @@ msgstr ""
 "PO-Revision-Date: 2006-07-29 23:04+0930\n"
 "Last-Translator: Clytie Siddall <[e-mail]>\n"
 "Language-Team: Vietnamese <[e-mail]>\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -59,18 +58,6 @@ msgstr ""
 "Luôn luôn có thể thay đổi ý muốn sau này bằng cách chạy lệnh cấu hình lại: « "
 "dpkg-reconfigure popularity-contest »."
 
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Nếu quyết định tham gia, một tập lệnh đệ trình sẽ tự động chạy hàng tuần, để "
-"gửi thống kê tới các nhà phát triển bản phát hành. Có thể xem thống kế được "
-"tập hợp tại « http://popcon.debian.org/ »."
-
 #~ msgid "Generating unique host identifier failed"
 #~ msgstr "Tạo tên duy nhất cho máy không thành công"
 
diff --git a/debian/po/wo.po b/debian/po/wo.po
index 5c94f45..a1e6b4b 100644
--- a/debian/po/wo.po
+++ b/debian/po/wo.po
@@ -19,7 +19,6 @@ msgstr ""
 "PO-Revision-Date: 2006-09-14 09:57+0000\n"
 "Last-Translator: Mouhamadou Mamoune Mbacke <[e-mail]>\n"
 "Language-Team: Wolof <[e-mail]>\n"
-"Language: wo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -39,11 +38,7 @@ msgid ""
 "statistics about the most used packages on this system.  This information "
 "influences decisions such as which packages should go on the first "
 "distribution CD."
-msgstr ""
-"Sistem bi mannaa jox ñiy liggéey distribusioŋ bi ay estatistik yu aju ci "
-"paket yi ñuy gëna jëfandikoo ci sistem bi.  Yoo xamxam dana am jeexiit ci "
-"yenn dogal yiñuy jël yu deme neki yan paket ñooy nekk ci CD bu jëkk bu "
-"distribusioŋ bi."
+msgstr "Sistem bi mannaa jox ñiy liggéey distribusioŋ bi ay estatistik yu aju ci paket yi ñuy gëna jëfandikoo ci sistem bi.  Yoo xamxam dana am jeexiit ci yenn dogal yiñuy jël yu deme neki yan paket ñooy nekk ci CD bu jëkk bu distribusioŋ bi."
 
 #. Type: boolean
 #. Description
@@ -52,10 +47,7 @@ msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
 "statistics can be viewed on https://popcon.debian.org/."
-msgstr ""
-"Boo bëgée bokk, konn amna ab eskript boo xam ne ayakbis gune danañu yónnée "
-"ay estatistik jëmaleko ci ñiy liggéey distribusioŋ bi. Estatistik yiñu "
-"dajale maneesnaleena gis ci https://popcon.debian.org/."
+msgstr "Boo bëgée bokk, konn amna ab eskript boo xam ne ayakbis gune danañu yónnée ay estatistik jëmaleko ci ñiy liggéey distribusioŋ bi. Estatistik yiñu dajale maneesnaleena gis ci https://popcon.debian.org/."
 
 #. Type: boolean
 #. Description
@@ -63,18 +55,5 @@ msgstr ""
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
-msgstr ""
-"Bii tann dangako mana soppiwaat ginnaaw bi boo doxalee \"dpkg-reconfigure "
-"popularity-contest\"."
+msgstr "Bii tann dangako mana soppiwaat ginnaaw bi boo doxalee \"dpkg-reconfigure popularity-contest\"."
 
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"Boo bëgée bokk, konn amna ab eskript boo xam ne ayakbis gune danañu yónnée "
-"ay estatistik jëmaleko ci ñiy liggéey distribusioŋ bi. Estatistik yiñu "
-"dajale maneesnaleena gis ci http://popcon.debian.org/."
diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
index 1baa8fa..93fa540 100644
--- a/debian/po/zh_CN.po
+++ b/debian/po/zh_CN.po
@@ -19,7 +19,6 @@ msgstr ""
 "PO-Revision-Date: 2009-11-17 00:49+0800\n"
 "Last-Translator: 苏运强 <[e-mail]>\n"
 "Language-Team: Debian Chinese [GB] <[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,17 +61,6 @@ msgid ""
 msgstr ""
 "稍候您也可以通过运行“dpkg-reconfigure popularity-contest”来改变这个选择。"
 
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"如果您选择参与调查，自动提交脚本程序将会每周自动运行一次，将统计数据发送给发"
-"行版开发人员。已收集到的统计数据可以在 http://popcon.debian.org/ 上看到。"
-
 #~ msgid "Generating unique host identifier failed"
 #~ msgstr "无法生成独有的主机标识"
 
diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po
index 6e97f50..bc98366 100644
--- a/debian/po/zh_TW.po
+++ b/debian/po/zh_TW.po
@@ -19,9 +19,7 @@ msgstr ""
 "POT-Creation-Date: 2006-07-29 12:23+0200\n"
 "PO-Revision-Date: 2006-07-30 18:53+0800\n"
 "Last-Translator: Tetralet <[e-mail]>\n"
-"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
-"debian.org>\n"
-"Language: \n"
+"Language-Team: Debian-user in Chinese [Big5] <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,8 +40,8 @@ msgid ""
 "influences decisions such as which packages should go on the first "
 "distribution CD."
 msgstr ""
-"這套系統可以匿名得向負責發行版本的開發人員提交系統中所最常使用的套件的統計資"
-"訊。這些資訊將有助於決定像是要將哪些套件放到第一張 Debian 光碟中。"
+"這套系統可以匿名得向負責發行版本的開發人員提交系統中所最常使用的套件的統計資訊。"
+"這些資訊將有助於決定像是要將哪些套件放到第一張 Debian 光碟中。"
 
 #. Type: boolean
 #. Description
@@ -53,8 +51,8 @@ msgid ""
 "every week, sending statistics to the distribution developers. The collected "
 "statistics can be viewed on https://popcon.debian.org/."
 msgstr ""
-"如果您決定要參與，自動提交的 Script 將會每週一次，將統計數據傳送給負責發行版"
-"本的開發人員。而這些被收集的資料您可以到 https://popcon.debian.org/ 上查閱。"
+"如果您決定要參與，自動提交的 Script 將會每週一次，將統計數據傳送給負責發行版本的開發人員。"
+"而這些被收集的資料您可以到 https://popcon.debian.org/ 上查閱。"
 
 #. Type: boolean
 #. Description
@@ -64,14 +62,3 @@ msgid ""
 "contest\"."
 msgstr ""
 "您可以在日後執行『dpkg-reconfigure popularity-contest』來修改這些設定。"
-
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"If you choose to participate, the automatic submission script will run once "
-"every week, sending statistics to the distribution developers. The collected "
-"statistics can be viewed on http://popcon.debian.org/."
-msgstr ""
-"如果您決定要參與，自動提交的 Script 將會每週一次，將統計數據傳送給負責發行版"
-"本的開發人員。而這些被收集的資料您可以到 http://popcon.debian.org/ 上查閱。"
diff --git a/debian/postinst b/debian/postinst
index 4eb3922..ff7bbdb 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -75,6 +75,7 @@ generate_conffile() {
 	# preseeding is only allowed on first time install
 	db_get popularity-contest/submiturls || true
 	if [ -n "$RET" ] ; then
+	    RET="$(echo $RET | sed 's|https\?://popcon\.ubuntu\.com/popcon-submit\.cgi||g')"
 	    echo "SUBMITURLS=\"$RET\"" >> $conffile
 	fi
 
@@ -125,6 +126,8 @@ case "$1" in
 		s/^\(MAILTO=\"[e-mail]\"\)$/#\1/;    \
 		s/^\(MAILTO=\"[e-mail]\"\)$/#\1/; \
 		s/^\(MAILTO=\"[e-mail]\"\)$/#\1/;   \
+		/^#\?MAILTO=\"/s:[e-mail]::g;                \
+		/^SUBMITURLS=\"/s|https\?://popcon\.ubuntu\.com/popcon-submit\.cgi||g; \
                 "
             if [ "$OLDHOSTID" != "$MY_HOSTID" ]; then
                 sedopts="$sedopts \
diff --git a/debian/templates b/debian/templates
index a5fae9a..7484595 100644
--- a/debian/templates
+++ b/debian/templates
@@ -9,7 +9,7 @@ _Description: Participate in the package usage survey?
  .
  If you choose to participate, the automatic submission script will
  run once every week, sending statistics to the distribution developers.
- The collected statistics can be viewed on https://popcon.ubuntu.com/.
+ The collected statistics can be viewed on https://popcon.debian.org/.
  .
  This choice can be later modified by running "dpkg-reconfigure
  popularity-contest".
diff --git a/default.conf b/default.conf
index be47f33..81f0466 100644
--- a/default.conf
+++ b/default.conf
@@ -17,7 +17,7 @@ PARTICIPATE="no"
 # This requires the package gnupg to be installed.
 # If "maybe", reports are encrypted only if gnupg is available.
 #
-ENCRYPT="no"
+ENCRYPT="maybe"
 
 # KEYRING and POPCONKEY specify the key to use for encryption.
 # They should not be changed for proper operation with
@@ -28,7 +28,7 @@ POPCONKEY="5B1A07804DD558242CF5538215A07BA5233E3E85"
 
 # MAILTO specifies the address to e-mail statistics to each week.
 #
-#MAILTO="[e-mail]"
+#MAILTO="[e-mail]"
 
 # MAILFROM is the forged sender email address you want to use in
 # email submitted to the popularity-contest.  If this is commented
@@ -46,7 +46,8 @@ POPCONKEY="5B1A07804DD558242CF5538215A07BA5233E3E85"
 
 # SUBMITURLS is a space separated list of where to submit
 # popularity-contest reports using http.
-SUBMITURLS="https://popcon.ubuntu.com/popcon-submit.cgi"
+#SUBMITURLS="http://popcon.debian.org/cgi-bin/popcon.cgi"
+SUBMITURLS=""
 
 # USEHTTP enables http reporting.   Set this to 'yes' to enable it.
 USEHTTP="yes"
diff --git a/popcon-upload b/popcon-upload
index 9f16c0f..c3dc824 100755
--- a/popcon-upload
+++ b/popcon-upload
@@ -106,10 +106,10 @@ my($answer)="";
 while(<$remote>)
 {
   $answer.=$_;
-  m/Thanks/ and last;
+  m/DEBIAN POPCON HTTP-POST OK/ and last;
 }
 close ($remote);
 #Check answer
-my $status = ($answer =~ m/Thanks/) ? 0 : 1;
+my $status = ($answer =~ m/DEBIAN POPCON HTTP-POST OK/) ? 0 : 1;
 print "Failed to upload, answer '$answer'\n" if $status && $opts{'d'};
 exit $status;