# HG changeset patch
# User Paul Crowley <paul@lshift.net>
# Date 1267720925 0
# Node ID d015d70692956ce6cbd9dee191af7026be00b39a
# Parent  780629e5a5ae240e9a86ca51b0c3c87e1e347b5d# Parent  c845d64170a6d86fd0fc50998bad7fdb8edf89ea
Merge translation heads

diff -r c845d64170a6 -r d015d7069295 debian/changelog
--- a/debian/changelog	Mon Dec 28 16:13:03 2009 +0000
+++ b/debian/changelog	Thu Mar 04 16:42:05 2010 +0000
@@ -1,12 +1,9 @@
 mercurial-server (1.0.1-2) unstable; urgency=low
 
-  * Fix "[INTL:es] Spanish debconf template translation for mercurial-
-    server" (Closes: #561921)
-  * Fix "[INTL:pt] Updated Portuguese translation for debconf messages"
-    (Closes: #562243)
-  * Fix "[INTL:ru] Russian debconf templates translation" (Closes: #562637)
+  * Add translations for es, pt, ru, fi, fr
+    (Closes: #561921, #562243, #562637, #564505, #564594)
 
- -- Paul Crowley <paul@lshift.net>  Mon, 28 Dec 2009 16:12:29 +0000
+ -- Paul Crowley <paul@lshift.net>  Thu, 04 Mar 2010 16:13:50 +0000
 
 mercurial-server (1.0.1-1) unstable; urgency=medium
 
diff -r c845d64170a6 -r d015d7069295 debian/po/fi.po
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/po/fi.po	Thu Mar 04 16:42:05 2010 +0000
@@ -0,0 +1,27 @@
+# Copyright (C) 2009
+# This file is distributed under the same license as the mercurial-server package.
+#
+# Esko Arajärvi <edu@iki.fi>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: mercurial-server@packages.debian.org\n"
+"POT-Creation-Date: 2009-12-02 18:14+0000\n"
+"PO-Revision-Date: 2010-01-09 22:45+0200\n"
+"Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
+"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"Do you want the repositories to be removed when mercurial-server is purged?"
+msgstr ""
+"Haluatko, että tietokannat poistetaan, kun paketti mercurial-server "
+"siivotaan?"
+
diff -r c845d64170a6 -r d015d7069295 debian/po/fr.po
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/po/fr.po	Thu Mar 04 16:42:05 2010 +0000
@@ -0,0 +1,28 @@
+# Translation of mercurial-server debconf templates to French
+# Copyright (C) 2005-2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the mercurial-server package.
+#
+# Translators:
+# Christian Perrier <bubulle@debian.org>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: mercurial-server@packages.debian.org\n"
+"POT-Creation-Date: 2009-12-02 18:14+0000\n"
+"PO-Revision-Date: 2010-01-02 18:50+0100\n"
+"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"Do you want the repositories to be removed when mercurial-server is purged?"
+msgstr ""
+"Faut-il supprimer les dépôts de suivi de version lorsque mercurial-server "
+"est purgé ?"