[Pkg-mono-svn-commits] [SCM] xsp branch, master, updated. upstream/2.4.3-4-gac045be

Jo Shields directhex at apebox.org
Sun Jun 6 20:30:21 UTC 2010


The following commit has been merged in the master branch:
commit ac045be982d16f3806353831da3ff7f093864dde
Author: Jo Shields <directhex at apebox.org>
Date:   Sun Jun 6 21:28:14 2010 +0100

    commit all NMU changes from last NMU upload

diff --git a/debian/changelog b/debian/changelog
index 4647d6a..ec4688a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xsp (2.4.3-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Explicitly use 1.0 as source format
+  * Fix pending l10n issues. Debconf translations:
+    - Italian (Vincenzo Campanella).  Closes: #577042
+
+ -- Christian Perrier <bubulle at debian.org>  Fri, 16 Apr 2010 20:03:58 +0200
+
 xsp (2.4.3-3) unstable; urgency=low
 
   * debian/po/ja.po:
diff --git a/debian/mono-apache-server2.templates b/debian/mono-apache-server2.templates
index 67c151a..de8a921 100644
--- a/debian/mono-apache-server2.templates
+++ b/debian/mono-apache-server2.templates
@@ -6,4 +6,5 @@ _Description: Let mono-apache-server2 restart Apache?
  mono-server2-update script that creates a configuration file for
  apache to start the ASP.NET applications, and mono-server2-update can
  restart apache if there's a new configuration file
- (/etc/mono-server2/mono-server2-hosts.conf). If this is true, then apache will be restarted when there is a new mono-server-hosts.conf file.
+ (/etc/mono-server2/mono-server2-hosts.conf). If this is true, then
+ apache will be restarted when there is a new mono-server2-hosts.conf file.
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 613dba2..7998b51 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -61,7 +61,7 @@ msgid ""
 "script that creates a configuration file for apache to start the ASP.NET "
 "applications, and mono-server2-update can restart apache if there's a new "
 "configuration file (/etc/mono-server2/mono-server2-hosts.conf). If this is "
-"true, then apache will be restarted when there is a new mono-server-hosts."
+"true, then apache will be restarted when there is a new mono-server2-hosts."
 "conf file."
 msgstr ""
 "mono-apache-server2 v Debianu obsahuje skript mono-server2-update, který "
@@ -69,7 +69,7 @@ msgstr ""
 "spouštět aplikace v ASP.NET. Skript mono-server2-update umí rozpoznat, zda "
 "je vytvořen nový konfigurační soubor /etc/mono-server2/mono-server2-hosts."
 "conf a případně  restartovat Apache, aby se změny projevily. Chcete "
-"restartovat Apache v případě nového konfiguračního souboru mono-server-hosts."
+"restartovat Apache v případě nového konfiguračního souboru mono-server2-hosts."
 "conf?"
 
 #. Type: boolean
diff --git a/debian/po/de.po b/debian/po/de.po
index c0b9592..3bd7787 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -52,7 +52,7 @@ msgid ""
 "script that creates a configuration file for apache to start the ASP.NET "
 "applications, and mono-server2-update can restart apache if there's a new "
 "configuration file (/etc/mono-server2/mono-server2-hosts.conf). If this is "
-"true, then apache will be restarted when there is a new mono-server-hosts."
+"true, then apache will be restarted when there is a new mono-server2-hosts."
 "conf file."
 msgstr ""
 "Die Debian-Version von mono-apache-server2 enthält ein Skript mono-server2-"
@@ -60,7 +60,7 @@ msgstr ""
 "Anwendungen zu starten und mono-server2-update kann Apache neustarten, falls "
 "es eine neue Konfigurationsdatei (/etc/mono-server2/mono-server2-hosts.conf) "
 "gibt. Falls dies stimmt, dann wird Apache neu gestartet, wenn es eine neue "
-"mono-server-hosts.conf-Datei gibt."
+"mono-server2-hosts.conf-Datei gibt."
 
 #. Type: boolean
 #. Description
diff --git a/debian/po/es.po b/debian/po/es.po
index d3378b9..dd298c0 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -77,15 +77,15 @@ msgid ""
 "script that creates a configuration file for apache to start the ASP.NET "
 "applications, and mono-server2-update can restart apache if there's a new "
 "configuration file (/etc/mono-server2/mono-server2-hosts.conf). If this is "
-"true, then apache will be restarted when there is a new mono-server-hosts."
+"true, then apache will be restarted when there is a new mono-server2-hosts."
 "conf file."
 msgstr ""
 "La versión debian de mono-apache-server contiene el script «mono-server-"
 "update» que crea un archivo de configuración para apache cuando se inician "
 "aplicaciones de ASP.NET, y «mono-server-update» puede reiniciar apache si hay "
-"un nuevo archivo de configuración («/etc/mono-server/mono-server-host.conf»). "
+"un nuevo archivo de configuración («/etc/mono-server/mono-server2-host.conf»). "
 "Si esto es correcto, apache se reiniciará cuando haya un nuevo archivo de "
-"configuración «mono-server-hosts.conf»."
+"configuración «mono-server2-hosts.conf»."
 
 #. Type: boolean
 #. Description
diff --git a/debian/po/eu.po b/debian/po/eu.po
index ed0e57e..96191d1 100644
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -58,14 +58,14 @@ msgid ""
 "script that creates a configuration file for apache to start the ASP.NET "
 "applications, and mono-server2-update can restart apache if there's a new "
 "configuration file (/etc/mono-server2/mono-server2-hosts.conf). If this is "
-"true, then apache will be restarted when there is a new mono-server-hosts."
+"true, then apache will be restarted when there is a new mono-server2-hosts."
 "conf file."
 msgstr ""
 "Debianeko mono-apache-server2 bertsioak apache-rentzat konfigurazio "
 "fitxategi bat sortzen duen mono-server2-update script-a dakar, ASP.NET "
 "aplikazioak abiarazteko. Script honek apache berrabiaraz dezake konfigurazio "
 "fitxategi berria baldin badago (/etc/mono-server2/mono-server2-hosts.conf). "
-"Hau onartzen baduzu, apache berrabiaraziko da mono-server-hosts.conf "
+"Hau onartzen baduzu, apache berrabiaraziko da mono-server2-hosts.conf "
 "fitxategi berri bat dagoenean."
 
 #. Type: boolean
diff --git a/debian/po/fi.po b/debian/po/fi.po
index dce060c..1711070 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -52,7 +52,7 @@ msgid ""
 "script that creates a configuration file for apache to start the ASP.NET "
 "applications, and mono-server2-update can restart apache if there's a new "
 "configuration file (/etc/mono-server2/mono-server2-hosts.conf). If this is "
-"true, then apache will be restarted when there is a new mono-server-hosts."
+"true, then apache will be restarted when there is a new mono-server2-hosts."
 "conf file."
 msgstr ""
 "Paketin mono-apache-server2 Debian-versio sisältää komentosarjan mono-"
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 4472b80..6c38367 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -53,7 +53,7 @@ msgid ""
 "script that creates a configuration file for apache to start the ASP.NET "
 "applications, and mono-server2-update can restart apache if there's a new "
 "configuration file (/etc/mono-server2/mono-server2-hosts.conf). If this is "
-"true, then apache will be restarted when there is a new mono-server-hosts."
+"true, then apache will be restarted when there is a new mono-server2-hosts."
 "conf file."
 msgstr ""
 "La version Debian de mono-apache-server2 comporte le script mono-server2-"
diff --git a/debian/po/gl.po b/debian/po/gl.po
index 3372b87..f0cfce3 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xsp\n"
 "Report-Msgid-Bugs-To: xsp at packages.debian.org\n"
-"POT-Creation-Date: 2009-10-09 06:40+0200\n"
+"POT-Creation-Date: 2010-04-04 19:34+0200\n"
 "PO-Revision-Date: 2009-11-03 20:56+0100\n"
 "Last-Translator: Marce Villarino <mvillarino at gmail.com>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
@@ -71,7 +71,7 @@ msgid ""
 "script that creates a configuration file for apache to start the ASP.NET "
 "applications, and mono-server2-update can restart apache if there's a new "
 "configuration file (/etc/mono-server2/mono-server2-hosts.conf). If this is "
-"true, then apache will be restarted when there is a new mono-server-hosts."
+"true, then apache will be restarted when there is a new mono-server2-hosts."
 "conf file."
 msgstr ""
 "A versión de Debian de mono-apache-server2 inclúe un script mono-server2-"
diff --git a/debian/po/it.po b/debian/po/it.po
index 325bde2..6f4dfad 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the XSP package.
 #
 #
-# Vincenzo Campanella <vinz65 at gmail.com>, 2008, 2009.
+# Vincenzo Campanella <vinz65 at gmail.com>, 2008, 2009, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: XSP\n"
+"Project-Id-Version: xsp 2.4.3-3\n"
 "Report-Msgid-Bugs-To: xsp at packages.debian.org\n"
-"POT-Creation-Date: 2009-10-09 06:40+0200\n"
-"PO-Revision-Date: 2009-11-13 12:38+0100\n"
+"POT-Creation-Date: 2010-04-04 19:34+0200\n"
+"PO-Revision-Date: 2010-04-09 08:26+0200\n"
 "Last-Translator: Vincenzo Campanella <vinz65 at gmail.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
 "MIME-Version: 1.0\n"
@@ -25,14 +25,6 @@ msgstr "Lasciare che mono-apache-server riavvii Apache?"
 #. Type: boolean
 #. Description
 #: ../mono-apache-server1.templates:1001
-#, fuzzy
-#| msgid ""
-#| "The debian version of mono-apache-server includes a mono-server-update "
-#| "script that creates a configuration file for apache to start the ASP.NET "
-#| "applications, and mono-server-update can restart apache if there's a new "
-#| "configuration file (/etc/mono-server/mono-server-hosts.conf). If this is "
-#| "true, then apache will be restarted when there is a new mono-server-hosts."
-#| "conf file."
 msgid ""
 "The Debian version of mono-apache-server includes a mono-server-update "
 "script that creates a configuration file for apache to start the ASP.NET "
@@ -44,9 +36,9 @@ msgstr ""
 "La versione Debian di mono-apache-server include uno script di "
 "aggiornamento, \"mono-server-update\", che crea un file di configurazione "
 "per Apache per fargli avviare le applicazioni ASP.NET e che può riavviare "
-"Apache se c'è un nuovo file di configurazione (/etc/mono-server/mono-server-"
-"hosts.conf). Se questa opzione è confermata, Apache sarà riavviato non "
-"appena c'è un nuovo file di configurazione mono-server-hosts.conf."
+"Apache se c'è un nuovo file di configurazione («/etc/mono-server/mono-server-"
+"hosts.conf»). Se questa opzione è confermata, Apache sarà riavviato non "
+"appena c'è un nuovo file di configurazione «mono-server-hosts.conf»."
 
 #. Type: boolean
 #. Description
@@ -57,28 +49,20 @@ msgstr "Lasciare che mono-apache-server2 riavvii Apache?"
 #. Type: boolean
 #. Description
 #: ../mono-apache-server2.templates:1001
-#, fuzzy
-#| msgid ""
-#| "The debian version of mono-apache-server2 includes a mono-server2-update "
-#| "script that creates a configuration file for apache to start the ASP.NET "
-#| "applications, and mono-server2-update can restart apache if there's a new "
-#| "configuration file (/etc/mono-server2/mono-server2-hosts.conf). If this "
-#| "is true, then apache will be restarted when there is a new mono-server-"
-#| "hosts.conf file."
 msgid ""
 "The Debian version of mono-apache-server2 includes a mono-server2-update "
 "script that creates a configuration file for apache to start the ASP.NET "
 "applications, and mono-server2-update can restart apache if there's a new "
 "configuration file (/etc/mono-server2/mono-server2-hosts.conf). If this is "
-"true, then apache will be restarted when there is a new mono-server-hosts."
+"true, then apache will be restarted when there is a new mono-server2-hosts."
 "conf file."
 msgstr ""
 "La versione Debian di mono-apache-server2 include uno script di "
-"aggiornamento, \"mono-server2-update\", che crea un file di configurazione "
-"per Apache per fargli avviare le applicazioni ASP.NET e che può riavviare "
-"Apache se c'è un nuovo file di configurazione (/etc/mono-server2/mono-"
-"server2-hosts.conf). Se questa opzione è confermata, Apache sarà riavviato "
-"non appena c'è un nuovo file di configurazione mono-server-hosts.conf."
+"aggiornamento, «mono-server2-update», che crea un file di configurazione per "
+"Apache per fargli avviare le applicazioni ASP.NET e che può riavviare Apache "
+"se c'è un nuovo file di configurazione («/etc/mono-server2/mono-server2-hosts."
+"conf»). Se questa opzione è confermata, Apache sarà riavviato non appena c'è "
+"un nuovo file di configurazione «mono-server-hosts.conf»."
 
 #. Type: boolean
 #. Description
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 95a3c21..c4876f0 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -52,14 +52,14 @@ msgid ""
 "script that creates a configuration file for apache to start the ASP.NET "
 "applications, and mono-server2-update can restart apache if there's a new "
 "configuration file (/etc/mono-server2/mono-server2-hosts.conf). If this is "
-"true, then apache will be restarted when there is a new mono-server-hosts."
+"true, then apache will be restarted when there is a new mono-server2-hosts."
 "conf file."
 msgstr ""
 "Debian 版の mono-apache-server2 は、apache で ASP.NET アプリケーションを起動"
 "させるための設定ファイルを作成する mono-server2-update スクリプトを含んでお"
 "り、新しい設定ファイル (/etc/mono-server2/mono-server-hosts.conf) がある場合"
 "には mono-server2-update は apache を再起動できます。これを有効にすると、新し"
-"い mono-server-hosts.conf ファイルがある場合に apache が再起動されます。"
+"い mono-server2-hosts.conf ファイルがある場合に apache が再起動されます。"
 
 #. Type: boolean
 #. Description
diff --git a/debian/po/nl.po b/debian/po/nl.po
index adb0ae0..b398e74 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -55,14 +55,14 @@ msgid ""
 "script that creates a configuration file for apache to start the ASP.NET "
 "applications, and mono-server2-update can restart apache if there's a new "
 "configuration file (/etc/mono-server2/mono-server2-hosts.conf). If this is "
-"true, then apache will be restarted when there is a new mono-server-hosts."
+"true, then apache will be restarted when there is a new mono-server2-hosts."
 "conf file."
 msgstr ""
 "De Debian-versie van mono-apache-server2 bevat het script mono-server2-"
 "update. Dit script maakt een configuratiebestand aan voor apache dat de ASP."
 "NET-applicaties start, en kan apache herstarten als er een nieuw "
 "configuratiebestand is (/etc/mono-server2/mono-server2-hosts.conf). Als u "
-"hier aanvaard wordt apache herstart wanneer er een nieuw 'mono-server-hosts."
+"hier aanvaard wordt apache herstart wanneer er een nieuw 'mono-server2-hosts."
 "conf'-bestand aanwezig is."
 
 #. Type: boolean
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 37f54a2..a311b47 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -54,7 +54,7 @@ msgid ""
 "script that creates a configuration file for apache to start the ASP.NET "
 "applications, and mono-server2-update can restart apache if there's a new "
 "configuration file (/etc/mono-server2/mono-server2-hosts.conf). If this is "
-"true, then apache will be restarted when there is a new mono-server-hosts."
+"true, then apache will be restarted when there is a new mono-server2-hosts."
 "conf file."
 msgstr ""
 "A versão Debian do mono-apache-server2 inclui um script mono-server-update "
@@ -62,7 +62,7 @@ msgstr ""
 "NET, e o mono-server-update pode reiniciar o apache se existir um novo "
 "ficheiro de configuração (/etc/mono-server/mono-server2-hosts.conf). Se isto "
 "for verdade, então o apache irá ser reiniciado quando existir um novo "
-"ficheiro mono-server-hosts.conf."
+"ficheiro mono-server2-hosts.conf."
 
 #. Type: boolean
 #. Description
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 7c127cc..936b9e3 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -57,7 +57,7 @@ msgid ""
 "script that creates a configuration file for apache to start the ASP.NET "
 "applications, and mono-server2-update can restart apache if there's a new "
 "configuration file (/etc/mono-server2/mono-server2-hosts.conf). If this is "
-"true, then apache will be restarted when there is a new mono-server-hosts."
+"true, then apache will be restarted when there is a new mono-server2-hosts."
 "conf file."
 msgstr ""
 "Debian-версия mono-apache-server2 включает сценарий mono-server2-update, "
@@ -65,7 +65,7 @@ msgstr ""
 "server2-update позволяет перезапускать apache, если появляется новый файл "
 "настройки (/etc/mono-server2/mono-server2-hosts.conf). Если вы ответите "
 "утвердительно, то apache будет перезапущен при появлении нового файла mono-"
-"server-hosts.conf."
+"server2-hosts.conf."
 
 #. Type: boolean
 #. Description
diff --git a/debian/po/sl.po b/debian/po/sl.po
index 51df0a1..1f96a41 100644
--- a/debian/po/sl.po
+++ b/debian/po/sl.po
@@ -53,7 +53,7 @@ msgid ""
 "script that creates a configuration file for apache to start the ASP.NET "
 "applications, and mono-server2-update can restart apache if there's a new "
 "configuration file (/etc/mono-server2/mono-server2-hosts.conf). If this is "
-"true, then apache will be restarted when there is a new mono-server-hosts."
+"true, then apache will be restarted when there is a new mono-server2-hosts."
 "conf file."
 msgstr ""
 "Debian-ova verzija mono-apache-server2 vsebuje mono-server2-update skripto, "
diff --git a/debian/po/sv.po b/debian/po/sv.po
index f38e09f..28f4bb5 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -54,14 +54,14 @@ msgid ""
 "script that creates a configuration file for apache to start the ASP.NET "
 "applications, and mono-server2-update can restart apache if there's a new "
 "configuration file (/etc/mono-server2/mono-server2-hosts.conf). If this is "
-"true, then apache will be restarted when there is a new mono-server-hosts."
+"true, then apache will be restarted when there is a new mono-server2-hosts."
 "conf file."
 msgstr ""
 "Debian-versionen av mono-apache-server2 inkluderar ett skript, mono-server2-"
 "update som skapar en konfigurationsfil för apache för att starta ASP.NET-"
 "applikationer. Skriptet mono-server2-update kan starta om Apache om det "
 "finns en ny konfigurationsfil (/etc/mono-server/mono-server2-hosts.conf). "
-"Vill du starta om Apache om det finns en ny mono-server-hosts2.conf fil?"
+"Vill du starta om Apache om det finns en ny mono-server2-hosts.conf fil?"
 
 #. Type: boolean
 #. Description
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 98c105a..af5f0c6 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: xsp at packages.debian.org\n"
-"POT-Creation-Date: 2009-10-09 06:40+0200\n"
+"POT-Creation-Date: 2010-04-04 19:34+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -48,7 +48,7 @@ msgid ""
 "script that creates a configuration file for apache to start the ASP.NET "
 "applications, and mono-server2-update can restart apache if there's a new "
 "configuration file (/etc/mono-server2/mono-server2-hosts.conf). If this is "
-"true, then apache will be restarted when there is a new mono-server-hosts."
+"true, then apache will be restarted when there is a new mono-server2-hosts."
 "conf file."
 msgstr ""
 
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 44373f7..0ff78b5 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -54,7 +54,7 @@ msgid ""
 "script that creates a configuration file for apache to start the ASP.NET "
 "applications, and mono-server2-update can restart apache if there's a new "
 "configuration file (/etc/mono-server2/mono-server2-hosts.conf). If this is "
-"true, then apache will be restarted when there is a new mono-server-hosts."
+"true, then apache will be restarted when there is a new mono-server2-hosts."
 "conf file."
 msgstr ""
 "Phiên bản Debian của trình phục vụ mono-apache-server2 bao gồm một văn lệnh "
@@ -62,7 +62,7 @@ msgstr ""
 "chạy các ứng dụng ASP.NET, và mono-server2-update cũng có thể khởi chạy lại "
 "apache nếu có một tập tin cấu hình mới (/etc/mono-server2/mono-server2-hosts."
 "conf). Có thì apache được khởi chạy lại khi nào có một tập tin cấu hình mono-"
-"server-hosts má»›i."
+"server2-hosts má»›i."
 
 #. Type: boolean
 #. Description
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..d3827e7
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0

-- 
xsp



More information about the Pkg-mono-svn-commits mailing list