[DebianGIS-dev] r2954 - in packages/mapserver/trunk/debian: . patches po

aboudreault-guest at alioth.debian.org aboudreault-guest at alioth.debian.org
Thu Jan 6 18:43:42 UTC 2011


Author: aboudreault-guest
Date: 2011-01-06 18:43:41 +0000 (Thu, 06 Jan 2011)
New Revision: 2954

Added:
   packages/mapserver/trunk/debian/patches/symbol_index_overflow.dpatch
   packages/mapserver/trunk/debian/po/da.po
   packages/mapserver/trunk/debian/po/it.po
Modified:
   packages/mapserver/trunk/debian/changelog
   packages/mapserver/trunk/debian/control
   packages/mapserver/trunk/debian/patches/00list
   packages/mapserver/trunk/debian/po/cs.po
   packages/mapserver/trunk/debian/po/de.po
   packages/mapserver/trunk/debian/po/es.po
   packages/mapserver/trunk/debian/po/fi.po
   packages/mapserver/trunk/debian/po/fr.po
   packages/mapserver/trunk/debian/po/gl.po
   packages/mapserver/trunk/debian/po/ja.po
   packages/mapserver/trunk/debian/po/nb.po
   packages/mapserver/trunk/debian/po/nl.po
   packages/mapserver/trunk/debian/po/pt.po
   packages/mapserver/trunk/debian/po/ru.po
   packages/mapserver/trunk/debian/po/sv.po
   packages/mapserver/trunk/debian/po/ta.po
   packages/mapserver/trunk/debian/po/vi.po
Log:
Merged translation team changes and added a patch about symbol index overflow

Modified: packages/mapserver/trunk/debian/changelog
===================================================================
--- packages/mapserver/trunk/debian/changelog	2010-12-27 22:25:43 UTC (rev 2953)
+++ packages/mapserver/trunk/debian/changelog	2011-01-06 18:43:41 UTC (rev 2954)
@@ -1,3 +1,23 @@
+mapserver (5.6.5-2) unstable; urgency=low
+
+  * Fix Validation of symbol index values (CVE-2010-1678)
+    [http://trac.osgeo.org/mapserver/ticket/3641]
+	
+ -- Alan Boudreault <aboudreault at mapgears.com>  Thu, 06 Jan 2011 11:18:29 -0500
+
+mapserver (5.6.5-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Build-Depends on libedit-dev as the package FTBFS without it
+    Closes: #606247
+  * Fix pending l10n issues. Debconf translations:
+    - Czech (Miroslav Kure).  Closes: #599847
+    - Vietnamese (Clytie Siddall).  Closes: #601922
+    - Danish (Joe Hansen).  Closes: #605618
+    - Italian (Vincenzo Campanella).  Closes: #605858
+
+ -- Christian Perrier <bubulle at debian.org>  Mon, 06 Dec 2010 07:09:55 +0100
+
 mapserver (5.6.5-1) unstable; urgency=low
 
   * New upstream release with an important bug fix about scale calculation.

Modified: packages/mapserver/trunk/debian/control
===================================================================
--- packages/mapserver/trunk/debian/control	2010-12-27 22:25:43 UTC (rev 2953)
+++ packages/mapserver/trunk/debian/control	2011-01-06 18:43:41 UTC (rev 2954)
@@ -10,7 +10,7 @@
  ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev,
  sharutils, libsdl1.2-dev, libfreetype6-dev, libx11-dev,
  libfcgi-dev, libxml2-dev, libogdi3.2-dev, libxslt1-dev, libpam0g-dev, libreadline-dev, 
- libfribidi-dev, libming-dev
+ libfribidi-dev, libming-dev, libedit-dev
 Build-Depends-Indep: python-docutils
 Build-Conflicts: libcurl3-openssl-dev
 XS-Python-Version: all

Modified: packages/mapserver/trunk/debian/patches/00list
===================================================================
--- packages/mapserver/trunk/debian/patches/00list	2010-12-27 22:25:43 UTC (rev 2953)
+++ packages/mapserver/trunk/debian/patches/00list	2011-01-06 18:43:41 UTC (rev 2954)
@@ -1 +1 @@
-# no patch currently
+symbol_index_overflow

Added: packages/mapserver/trunk/debian/patches/symbol_index_overflow.dpatch
===================================================================
--- packages/mapserver/trunk/debian/patches/symbol_index_overflow.dpatch	                        (rev 0)
+++ packages/mapserver/trunk/debian/patches/symbol_index_overflow.dpatch	2011-01-06 18:43:41 UTC (rev 2954)
@@ -0,0 +1,66 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## symbol_index_overflow.dpatch by Alan Boudreault <aboudreault at mapgears.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mapserver-5.6.5~/mapdraw.c mapserver-5.6.5/mapdraw.c
+--- mapserver-5.6.5~/mapdraw.c	2010-07-14 05:36:48.000000000 -0400
++++ mapserver-5.6.5/mapdraw.c	2011-01-06 11:54:27.000000000 -0500
+@@ -1408,6 +1408,10 @@
+ 			nStatus = MS_FAILURE;
+ 		}
+ */
++      if (style->symbol >= map->symbolset.numsymbols) {
++          msSetError(MS_SYMERR, "Invalid symbol index: %d", "msDrawShape()", style->symbol);
++          return MS_FAILURE;
++      }
+ #endif
+         else
+         {
+diff -urNad mapserver-5.6.5~/mapfile.c mapserver-5.6.5/mapfile.c
+--- mapserver-5.6.5~/mapfile.c	2010-06-23 13:41:14.000000000 -0400
++++ mapserver-5.6.5/mapfile.c	2011-01-06 11:55:26.000000000 -0500
+@@ -4911,6 +4911,10 @@
+                 return MS_FAILURE;
+               }
+             }
++	    if(!MS_IS_VALID_ARRAY_INDEX(GET_LAYER(map, i)->class[j]->styles[k]->symbol, map->symbolset.numsymbols)) {
++	      msSetError(MS_MISCERR, "Invalid symbol index in class %d, style %d of layer %s.", "msUpdateMapFromURL()", j, k, GET_LAYER(map, i)->name);
++	      return MS_FAILURE;
++	    }
+           }
+         }
+       }
+@@ -5381,13 +5385,17 @@
+ 
+       /* make sure any symbol names for this layer have been resolved (bug #2700) */
+       for(j=0; j<GET_LAYER(map, i)->numclasses; j++) {
+-	for(k=0; k<GET_LAYER(map, i)->class[j]->numstyles; k++) {
++        for(k=0; k<GET_LAYER(map, i)->class[j]->numstyles; k++) {
+           if(GET_LAYER(map, i)->class[j]->styles[k]->symbolname && GET_LAYER(map, i)->class[j]->styles[k]->symbol == 0) {
+             if((GET_LAYER(map, i)->class[j]->styles[k]->symbol =  msGetSymbolIndex(&(map->symbolset), GET_LAYER(map, i)->class[j]->styles[k]->symbolname, MS_TRUE)) == -1) {
+               msSetError(MS_MISCERR, "Undefined symbol \"%s\" in class %d, style %d of layer %s.", "msUpdateMapFromURL()", GET_LAYER(map, i)->class[j]->styles[k]->symbolname, j, k, GET_LAYER(map, i)->name);
+               return MS_FAILURE;
+             }
+           }
++          if(!MS_IS_VALID_ARRAY_INDEX(GET_LAYER(map, i)->class[j]->styles[k]->symbol, map->symbolset.numsymbols)) {
++            msSetError(MS_MISCERR, "Invalid symbol index in class %d, style %d of layer %s.", "msUpdateMapFromURL()", j, k, GET_LAYER(map, i)->name);
++            return MS_FAILURE;
++          }
+         }
+       }
+ 
+diff -urNad mapserver-5.6.5~/mapserver.h mapserver-5.6.5/mapserver.h
+--- mapserver-5.6.5~/mapserver.h	2010-07-14 05:45:57.000000000 -0400
++++ mapserver-5.6.5/mapserver.h	2011-01-06 11:54:27.000000000 -0500
+@@ -373,6 +373,8 @@
+ #define MS_REFCNT_DECR_IS_NOT_ZERO(obj) (MS_REFCNT_DECR(obj))>0
+ #define MS_REFCNT_DECR_IS_ZERO(obj) (MS_REFCNT_DECR(obj))<=0
+ 
++#define MS_IS_VALID_ARRAY_INDEX(index, size) ((index<0 || index>=size)?MS_FALSE:MS_TRUE)
++
+ #endif
+ 
+ /* General enumerated types - needed by scripts */


Property changes on: packages/mapserver/trunk/debian/patches/symbol_index_overflow.dpatch
___________________________________________________________________
Added: svn:executable
   + *

Modified: packages/mapserver/trunk/debian/po/cs.po
===================================================================
--- packages/mapserver/trunk/debian/po/cs.po	2010-12-27 22:25:43 UTC (rev 2953)
+++ packages/mapserver/trunk/debian/po/cs.po	2011-01-06 18:43:41 UTC (rev 2954)
@@ -15,45 +15,47 @@
 msgstr ""
 "Project-Id-Version: mapserver\n"
 "Report-Msgid-Bugs-To: pkg-grass-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-07-23 07:41+0200\n"
-"PO-Revision-Date: 2007-08-06 08:41+0200\n"
+"POT-Creation-Date: 2007-06-15 15:55+0200\n"
+"PO-Revision-Date: 2010-10-11 17:58+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:2001
-msgid "Should ${extname} support be added for ${sapiconfig}?"
-msgstr "Má se do ${sapiconfig} přidat podpora ${extname}?"
+#: ../php5-mapscript.templates:1001
+msgid "Should ${extname} be added to /etc/php5/${sapiconfig}/php.ini?"
+msgstr "Má se do /etc/php5/${sapiconfig}/php.ini přidat podpora ${extname}?"
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:2001
+#: ../php5-mapscript.templates:1001
 msgid ""
-"You are installing ${extname} support for PHP5, but it is not yet enabled "
-"in /etc/php5/${sapiconfig}/php.ini. Enabling this extension will allow PHP5 "
-"scripts to use it."
+"You are installing ${extname} support for php5 and it is not yet enabled in "
+"the configuration for the ${sapiconfig} SAPI. Enabling this extension will "
+"allow php5 scripts to use it."
 msgstr ""
-"Instalujete podporu ${extname} pro PHP5, která ještě není povolena v /etc/"
-"php5/${sapiconfig}/php.ini. Pokud toto rozšíření povolíte, budete je moci "
-"využívat v PHP5 skriptech."
+"Instalujete podporu ${extname} pro php5, která ještě není povolena v "
+"konfiguraci ${sapiconfig} SAPI. Pokud toto rozšíření povolíte, budete je "
+"moci využívat v php5 skriptech."
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:3001
-msgid "Should ${extname} support be removed for ${sapiconfig}?"
-msgstr "Má se z ${sapiconfig} odstranit podpora ${extname}?"
+#: ../php5-mapscript.templates:2001
+msgid "Should ${extname} be removed from /etc/php5/${sapiconfig}/php.ini?"
+msgstr "Má se z /etc/php5/${sapiconfig}/php.ini odstranit podpora ${extname}?"
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:3001
+#: ../php5-mapscript.templates:2001
 msgid ""
-"You are removing ${extname} support for PHP5, but it is still enabled in /"
-"etc/php5/${sapiconfig}/php.ini. Leaving this in place will probably cause "
-"problems when trying to use PHP."
+"You are removing ${extname} support for php5, but it is still enabled in the "
+"configuration for the ${sapiconfig} SAPI.  Leaving this in place will "
+"probably cause problems when trying to use PHP."
 msgstr ""
-"Odstraňujete podporu ${extname} pro PHP5, která je v /etc/php5/${sapiconfig}/"
-"php.ini stále povolena. To může způsobit problémy při používání PHP."
+"Odstraňujete podporu ${extname} pro php5, která je v konfiguraci "
+"${sapiconfig} SAPI stále povolena. To může způsobit problémy při používání "
+"PHP."

Added: packages/mapserver/trunk/debian/po/da.po
===================================================================
--- packages/mapserver/trunk/debian/po/da.po	                        (rev 0)
+++ packages/mapserver/trunk/debian/po/da.po	2011-01-06 18:43:41 UTC (rev 2954)
@@ -0,0 +1,53 @@
+# Danish translation mapserver.
+# Copyright (C) 2010 mapserver og nedenstående oversættere.
+# This file is distributed under the same license as mapserver package.
+# Joe Hansen <joedalton2 at yahoo.dk>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mapserver\n"
+"Report-Msgid-Bugs-To: pkg-grass-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2007-06-15 15:55+0200\n"
+"PO-Revision-Date: 2010-12-01 17:30+01:00\n"
+"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
+"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
+"Language: da\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../php5-mapscript.templates:1001
+msgid "Should ${extname} be added to /etc/php5/${sapiconfig}/php.ini?"
+msgstr "Skal ${extname} tilføjes til /etc/php5/${sapiconfig}/php.ini?"
+
+#. Type: boolean
+#. Description
+#: ../php5-mapscript.templates:1001
+msgid ""
+"You are installing ${extname} support for php5 and it is not yet enabled in "
+"the configuration for the ${sapiconfig} SAPI. Enabling this extension will "
+"allow php5 scripts to use it."
+msgstr ""
+"Du installerer ${extname}-understøttelse for php5 og denne er endnu ikke "
+"aktiveret i konfigurationen for SAPI'en ${sapiconfig}. Aktivering af denne "
+"udvidelse vil tillade, at php5-skripter kan bruge den."
+
+#. Type: boolean
+#. Description
+#: ../php5-mapscript.templates:2001
+msgid "Should ${extname} be removed from /etc/php5/${sapiconfig}/php.ini?"
+msgstr "Skal ${extname} fjernes fra /etc/php5/${sapiconfig}/php.ini?"
+
+#. Type: boolean
+#. Description
+#: ../php5-mapscript.templates:2001
+msgid ""
+"You are removing ${extname} support for php5, but it is still enabled in the "
+"configuration for the ${sapiconfig} SAPI.  Leaving this in place will "
+"probably cause problems when trying to use PHP."
+msgstr ""
+"Du fjerner ${extname}-understøttelse for php5, men denne er stadig aktiveret "
+"i konfigurationen for SAPI'en ${sapiconfig}. Bevarelse af denne vil højst "
+"sandsynlig medføre problemer, når der forsøges at bruge PHP."

Modified: packages/mapserver/trunk/debian/po/de.po
===================================================================
--- packages/mapserver/trunk/debian/po/de.po	2010-12-27 22:25:43 UTC (rev 2953)
+++ packages/mapserver/trunk/debian/po/de.po	2011-01-06 18:43:41 UTC (rev 2954)
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2008-01-23 18:05+0100\n"
 "Last-Translator: Alwin Meschede <ameschede at gmx.de>\n"
 "Language-Team: Deutsch <debian-l10n-de at lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,7 +22,8 @@
 #. Description
 #: ../php5-mapscript.templates:1001
 msgid "Should ${extname} be added to /etc/php5/${sapiconfig}/php.ini?"
-msgstr "Soll ${extname} der /etc/php5/${sapiconfig}/php.ini hinzugefügt werden?"
+msgstr ""
+"Soll ${extname} der /etc/php5/${sapiconfig}/php.ini hinzugefügt werden?"
 
 #. Type: boolean
 #. Description
@@ -31,15 +33,16 @@
 "the configuration for the ${sapiconfig} SAPI. Enabling this extension will "
 "allow php5 scripts to use it."
 msgstr ""
-"Sie installieren die ${extname}-Unterstützung für php5, die noch nicht in der "
-"Konfiguration der ${sapiconfig} SAPI aktiviert ist. Die Aktivierung dieser "
-"Erweiterung macht es php5-Skripten möglich, sie zu benutzen."
+"Sie installieren die ${extname}-Unterstützung für php5, die noch nicht in "
+"der Konfiguration der ${sapiconfig} SAPI aktiviert ist. Die Aktivierung "
+"dieser Erweiterung macht es php5-Skripten möglich, sie zu benutzen."
 
 #. Type: boolean
 #. Description
 #: ../php5-mapscript.templates:2001
 msgid "Should ${extname} be removed from /etc/php5/${sapiconfig}/php.ini?"
-msgstr "Soll ${extname} aus der /etc/php5/${sapiconfig}/php.ini entfernt werden?"
+msgstr ""
+"Soll ${extname} aus der /etc/php5/${sapiconfig}/php.ini entfernt werden?"
 
 #. Type: boolean
 #. Description
@@ -50,6 +53,5 @@
 "probably cause problems when trying to use PHP."
 msgstr ""
 "Sie entfernen die ${extname}-Unterstützung für php5, die aber noch in der "
-"Konfiguration der ${sapiconfig} SAPI aktiviert ist. Dies so zu belassen "
-"wird wahrscheinlich Probleme verursachen, wenn PHP benutzt werden soll."
-
+"Konfiguration der ${sapiconfig} SAPI aktiviert ist. Dies so zu belassen wird "
+"wahrscheinlich Probleme verursachen, wenn PHP benutzt werden soll."

Modified: packages/mapserver/trunk/debian/po/es.po
===================================================================
--- packages/mapserver/trunk/debian/po/es.po	2010-12-27 22:25:43 UTC (rev 2953)
+++ packages/mapserver/trunk/debian/po/es.po	2011-01-06 18:43:41 UTC (rev 2954)
@@ -18,8 +18,8 @@
 # - La guía de traducción de po's de debconf:
 # /usr/share/doc/po-debconf/README-trans
 # o http://www.debian.org/intl/l10n/po-debconf/README-trans
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: 5.0.3-3\n"
@@ -28,9 +28,10 @@
 "PO-Revision-Date: 2008-11-03 18:42-0200\n"
 "Last-Translator: Ignacio Mondino <ignacio.mondino at gmail.com>>\n"
 "Language-Team: Debian Spanish team <debian-l10n-spanish at lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. Type: boolean
 #. Description
@@ -46,9 +47,9 @@
 "the configuration for the ${sapiconfig} SAPI. Enabling this extension will "
 "allow php5 scripts to use it."
 msgstr ""
-"Está instalando el soporte de ${extname} para php5 y este aún no está activado "
-"en la configuración de la SAPI de ${sapiconfig}. Activando esta extensión "
-"permitirá que los scripts de php5 la utilicen."
+"Está instalando el soporte de ${extname} para php5 y este aún no está "
+"activado en la configuración de la SAPI de ${sapiconfig}. Activando esta "
+"extensión permitirá que los scripts de php5 la utilicen."
 
 #. Type: boolean
 #. Description
@@ -67,4 +68,3 @@
 "Está eliminando el soporte ${extname} de php5, pero todavía está activado en "
 "la configuración de la SAPI de ${sapiconfig}. Esta situación podría causar "
 "problemas al intentar utilizar PHP."
-

Modified: packages/mapserver/trunk/debian/po/fi.po
===================================================================
--- packages/mapserver/trunk/debian/po/fi.po	2010-12-27 22:25:43 UTC (rev 2953)
+++ packages/mapserver/trunk/debian/po/fi.po	2011-01-06 18:43:41 UTC (rev 2954)
@@ -6,6 +6,7 @@
 "PO-Revision-Date: 2007-12-20 21:58+0200\n"
 "Last-Translator: Esko Arajärvi <edu at iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,18 +22,30 @@
 #. Type: boolean
 #. Description
 #: ../php5-mapscript.templates:1001
-msgid "You are installing ${extname} support for php5 and it is not yet enabled in the configuration for the ${sapiconfig} SAPI. Enabling this extension will allow php5 scripts to use it."
-msgstr "Olet asentamassa php5:lle ”${extname}”-tukea, eikä sitä ole vielä aktivoitu ${sapiconfig} SAPIn asetuksissa. Tämän laajennoksen aktivoiminen sallii php5:n komentosarjojen käyttää sitä."
+msgid ""
+"You are installing ${extname} support for php5 and it is not yet enabled in "
+"the configuration for the ${sapiconfig} SAPI. Enabling this extension will "
+"allow php5 scripts to use it."
+msgstr ""
+"Olet asentamassa php5:lle ”${extname}”-tukea, eikä sitä ole vielä aktivoitu "
+"${sapiconfig} SAPIn asetuksissa. Tämän laajennoksen aktivoiminen sallii php5:"
+"n komentosarjojen käyttää sitä."
 
 #. Type: boolean
 #. Description
 #: ../php5-mapscript.templates:2001
 msgid "Should ${extname} be removed from /etc/php5/${sapiconfig}/php.ini?"
-msgstr "Tulisiko ${extname} poistaa tiedostosta /etc/php5/${sapiconfig}/php.ini?"
+msgstr ""
+"Tulisiko ${extname} poistaa tiedostosta /etc/php5/${sapiconfig}/php.ini?"
 
 #. Type: boolean
 #. Description
 #: ../php5-mapscript.templates:2001
-msgid "You are removing ${extname} support for php5, but it is still enabled in the configuration for the ${sapiconfig} SAPI.  Leaving this in place will probably cause problems when trying to use PHP."
-msgstr "Olet poistamassa php5:n ”${extname}”-tukea, mutta se on edelleen aktivoituna ${sapiconfig} SAPIn asetuksissa. Tilanteen jättäminen nykyiselleen luultavasti aiheuttaa ongelmia yritettäessä käyttää PHP:ta."
-
+msgid ""
+"You are removing ${extname} support for php5, but it is still enabled in the "
+"configuration for the ${sapiconfig} SAPI.  Leaving this in place will "
+"probably cause problems when trying to use PHP."
+msgstr ""
+"Olet poistamassa php5:n ”${extname}”-tukea, mutta se on edelleen aktivoituna "
+"${sapiconfig} SAPIn asetuksissa. Tilanteen jättäminen nykyiselleen "
+"luultavasti aiheuttaa ongelmia yritettäessä käyttää PHP:ta."

Modified: packages/mapserver/trunk/debian/po/fr.po
===================================================================
--- packages/mapserver/trunk/debian/po/fr.po	2010-12-27 22:25:43 UTC (rev 2953)
+++ packages/mapserver/trunk/debian/po/fr.po	2011-01-06 18:43:41 UTC (rev 2954)
@@ -9,6 +9,7 @@
 "PO-Revision-Date: 2007-10-19 09:42+0100\n"
 "Last-Translator: Steve Petruzzello <dlist at bluewin.ch>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: packages/mapserver/trunk/debian/po/gl.po
===================================================================
--- packages/mapserver/trunk/debian/po/gl.po	2010-12-27 22:25:43 UTC (rev 2953)
+++ packages/mapserver/trunk/debian/po/gl.po	2011-01-06 18:43:41 UTC (rev 2954)
@@ -10,6 +10,7 @@
 "PO-Revision-Date: 2007-10-24 22:23+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Added: packages/mapserver/trunk/debian/po/it.po
===================================================================
--- packages/mapserver/trunk/debian/po/it.po	                        (rev 0)
+++ packages/mapserver/trunk/debian/po/it.po	2011-01-06 18:43:41 UTC (rev 2954)
@@ -0,0 +1,54 @@
+# ITALIAN TRANSLATION OF MAPSERVER'S PO-DEBCONF FILE.
+# COPYRIGHT (C) 2010 THE MAPSERVER'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the mapserver package.
+# Vincenzo Campanella <vinz65 at gmail.com>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mapserver\n"
+"Report-Msgid-Bugs-To: pkg-grass-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2007-06-15 15:55+0200\n"
+"PO-Revision-Date: 2010-12-02 08:00+0100\n"
+"Last-Translator: Vincenzo Campanella <vinz65 at gmail.com>\n"
+"Language-Team: Italian <tp at lists.linux.it>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../php5-mapscript.templates:1001
+msgid "Should ${extname} be added to /etc/php5/${sapiconfig}/php.ini?"
+msgstr "Aggiungere ${extname} a «/etc/php5/${sapiconfig}/php.ini»?"
+
+#. Type: boolean
+#. Description
+#: ../php5-mapscript.templates:1001
+msgid ""
+"You are installing ${extname} support for php5 and it is not yet enabled in "
+"the configuration for the ${sapiconfig} SAPI. Enabling this extension will "
+"allow php5 scripts to use it."
+msgstr ""
+"Si sta per installare il supporto ${extname} per php5, che non è ancora "
+"abilitato nella configurazione per il SAPI ${sapiconfig}. L'abilitazione di "
+"questa estensione consentirà agli script php5 di utilizzarlo."
+
+#. Type: boolean
+#. Description
+#: ../php5-mapscript.templates:2001
+msgid "Should ${extname} be removed from /etc/php5/${sapiconfig}/php.ini?"
+msgstr "Rimuovere ${extname} da «/etc/php5/${sapiconfig}/php.ini?»?"
+
+#. Type: boolean
+#. Description
+#: ../php5-mapscript.templates:2001
+msgid ""
+"You are removing ${extname} support for php5, but it is still enabled in the "
+"configuration for the ${sapiconfig} SAPI.  Leaving this in place will "
+"probably cause problems when trying to use PHP."
+msgstr ""
+"Si sta per rimuovere il supporto ${extname} per php5, ma questi è ancora "
+"abilitato nella configurazione per il SAPI ${sapiconfig}. Se si lascia la "
+"situazione immutata, probabilmente si avranno dei problemi quando si cerca "
+"di utilizzare PHP."

Modified: packages/mapserver/trunk/debian/po/ja.po
===================================================================
--- packages/mapserver/trunk/debian/po/ja.po	2010-12-27 22:25:43 UTC (rev 2953)
+++ packages/mapserver/trunk/debian/po/ja.po	2011-01-06 18:43:41 UTC (rev 2954)
@@ -3,52 +3,51 @@
 # This file is distributed under the same license as the mapserver package.
 # Noritada Kobayashi <noritadak at gmail.com>, 2007.
 # Hideki Yamane (Debian-JP) <henrich at debian.or.jp>, 2009.
-
-msgid ""
-msgstr ""
-"Project-Id-Version: mapserver 5.0.3-3\n"
-"Report-Msgid-Bugs-To: pkg-grass-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-06-15 15:55+0200\n"
-"PO-Revision-Date: 2009-01-05 22:44+0900\n"
-"Last-Translator: Hideki Yamane (Debian-JP) <henrich at debian.or.jp>\n"
-"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: boolean
-#. Description
-#: ../php5-mapscript.templates:1001
-msgid "Should ${extname} be added to /etc/php5/${sapiconfig}/php.ini?"
-msgstr "${extname} を /etc/php5/${sapiconfig}/php.ini に追加しますか?"
-
-#. Type: boolean
-#. Description
-#: ../php5-mapscript.templates:1001
-msgid ""
-"You are installing ${extname} support for php5 and it is not yet enabled in "
-"the configuration for the ${sapiconfig} SAPI. Enabling this extension will "
-"allow php5 scripts to use it."
-msgstr ""
-"$php5 に {extname} サポートをインストールしてありますが、この拡張機能は "
-"${sapiconfig} SAPI の設定ではまだ有効になっていません。有効にすると php5 スク"
-"リプトが拡張機能を使用できるようになります。"
-
-#. Type: boolean
-#. Description
-#: ../php5-mapscript.templates:2001
-msgid "Should ${extname} be removed from /etc/php5/${sapiconfig}/php.ini?"
-msgstr "${extname} を /etc/php5/${sapiconfig}/php.ini から削除しますか?"
-
-#. Type: boolean
-#. Description
-#: ../php5-mapscript.templates:2001
-msgid ""
-"You are removing ${extname} support for php5, but it is still enabled in the "
-"configuration for the ${sapiconfig} SAPI.  Leaving this in place will "
-"probably cause problems when trying to use PHP."
-msgstr ""
-"php5 から ${extname} のサポートを削除していますが、この拡張機能は "
-"${sapiconfig} SAPI の設定でまだ有効になっています。このまま有効のままにして"
-"おくと、おそらく PHP を使用しようとする際に問題が生じるでしょう。"
-
+msgid ""
+msgstr ""
+"Project-Id-Version: mapserver 5.0.3-3\n"
+"Report-Msgid-Bugs-To: pkg-grass-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2007-06-15 15:55+0200\n"
+"PO-Revision-Date: 2009-01-05 22:44+0900\n"
+"Last-Translator: Hideki Yamane (Debian-JP) <henrich at debian.or.jp>\n"
+"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../php5-mapscript.templates:1001
+msgid "Should ${extname} be added to /etc/php5/${sapiconfig}/php.ini?"
+msgstr "${extname} を /etc/php5/${sapiconfig}/php.ini に追加しますか?"
+
+#. Type: boolean
+#. Description
+#: ../php5-mapscript.templates:1001
+msgid ""
+"You are installing ${extname} support for php5 and it is not yet enabled in "
+"the configuration for the ${sapiconfig} SAPI. Enabling this extension will "
+"allow php5 scripts to use it."
+msgstr ""
+"$php5 に {extname} サポートをインストールしてありますが、この拡張機能は "
+"${sapiconfig} SAPI の設定ではまだ有効になっていません。有効にすると php5 スク"
+"リプトが拡張機能を使用できるようになります。"
+
+#. Type: boolean
+#. Description
+#: ../php5-mapscript.templates:2001
+msgid "Should ${extname} be removed from /etc/php5/${sapiconfig}/php.ini?"
+msgstr "${extname} を /etc/php5/${sapiconfig}/php.ini から削除しますか?"
+
+#. Type: boolean
+#. Description
+#: ../php5-mapscript.templates:2001
+msgid ""
+"You are removing ${extname} support for php5, but it is still enabled in the "
+"configuration for the ${sapiconfig} SAPI.  Leaving this in place will "
+"probably cause problems when trying to use PHP."
+msgstr ""
+"php5 から ${extname} のサポートを削除していますが、この拡張機能は "
+"${sapiconfig} SAPI の設定でまだ有効になっています。このまま有効のままにしてお"
+"くと、おそらく PHP を使用しようとする際に問題が生じるでしょう。"

Modified: packages/mapserver/trunk/debian/po/nb.po
===================================================================
--- packages/mapserver/trunk/debian/po/nb.po	2010-12-27 22:25:43 UTC (rev 2953)
+++ packages/mapserver/trunk/debian/po/nb.po	2011-01-06 18:43:41 UTC (rev 2954)
@@ -15,10 +15,11 @@
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: pkg-grass-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-07-23 07:41+0200\n"
+"POT-Creation-Date: 2007-06-15 15:55+0200\n"
 "PO-Revision-Date: 2005-08-20 21:03MET\n"
 "Last-Translator: Petter Reinholdtsen <pere at hungry.com>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,32 +27,32 @@
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:2001
+#: ../php5-mapscript.templates:1001
 #, fuzzy
-msgid "Should ${extname} support be added for ${sapiconfig}?"
+msgid "Should ${extname} be added to /etc/php5/${sapiconfig}/php.ini?"
 msgstr "Vil du ha ${extname} lagt til i /etc/php4/${sapiconfig}/php.ini?"
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:2001
+#: ../php5-mapscript.templates:1001
 msgid ""
-"You are installing ${extname} support for PHP5, but it is not yet enabled "
-"in /etc/php5/${sapiconfig}/php.ini. Enabling this extension will allow PHP5 "
-"scripts to use it."
+"You are installing ${extname} support for php5 and it is not yet enabled in "
+"the configuration for the ${sapiconfig} SAPI. Enabling this extension will "
+"allow php5 scripts to use it."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:3001
+#: ../php5-mapscript.templates:2001
 #, fuzzy
-msgid "Should ${extname} support be removed for ${sapiconfig}?"
+msgid "Should ${extname} be removed from /etc/php5/${sapiconfig}/php.ini?"
 msgstr "Ønskes ${extname} fjernet fra /etc/php4/${sapiconfig}/php.ini?"
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:3001
+#: ../php5-mapscript.templates:2001
 msgid ""
-"You are removing ${extname} support for PHP5, but it is still enabled in /"
-"etc/php5/${sapiconfig}/php.ini. Leaving this in place will probably cause "
-"problems when trying to use PHP."
+"You are removing ${extname} support for php5, but it is still enabled in the "
+"configuration for the ${sapiconfig} SAPI.  Leaving this in place will "
+"probably cause problems when trying to use PHP."
 msgstr ""

Modified: packages/mapserver/trunk/debian/po/nl.po
===================================================================
--- packages/mapserver/trunk/debian/po/nl.po	2010-12-27 22:25:43 UTC (rev 2953)
+++ packages/mapserver/trunk/debian/po/nl.po	2011-01-06 18:43:41 UTC (rev 2954)
@@ -7,10 +7,11 @@
 msgstr ""
 "Project-Id-Version: mapserver\n"
 "Report-Msgid-Bugs-To: pkg-grass-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-07-23 07:41+0200\n"
+"POT-Creation-Date: 2007-06-15 15:55+0200\n"
 "PO-Revision-Date: 2007-07-31 09:33+0100\n"
 "Last-Translator: Bart Cornelis <cobaco at skolelinux.no>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch at lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,18 +19,25 @@
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:2001
-msgid "Should ${extname} support be added for ${sapiconfig}?"
+#: ../php5-mapscript.templates:1001
+#, fuzzy
+#| msgid "Should ${extname} support be added for ${sapiconfig}?"
+msgid "Should ${extname} be added to /etc/php5/${sapiconfig}/php.ini?"
 msgstr ""
 "Wilt u dat ${extname}-ondersteuning toegevoegd wordt voor ${sapiconfig}?"
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:2001
+#: ../php5-mapscript.templates:1001
+#, fuzzy
+#| msgid ""
+#| "You are installing ${extname} support for PHP5, but it is not yet enabled "
+#| "in /etc/php5/${sapiconfig}/php.ini. Enabling this extension will allow "
+#| "PHP5 scripts to use it."
 msgid ""
-"You are installing ${extname} support for PHP5, but it is not yet enabled "
-"in /etc/php5/${sapiconfig}/php.ini. Enabling this extension will allow PHP5 "
-"scripts to use it."
+"You are installing ${extname} support for php5 and it is not yet enabled in "
+"the configuration for the ${sapiconfig} SAPI. Enabling this extension will "
+"allow php5 scripts to use it."
 msgstr ""
 "U bent bezig ${extname}-ondersteuning te installeren voor PHP5. Dit is "
 "echter nog niet geactiveerd in het configuratiebestand /etc/php5/"
@@ -38,18 +46,25 @@
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:3001
-msgid "Should ${extname} support be removed for ${sapiconfig}?"
+#: ../php5-mapscript.templates:2001
+#, fuzzy
+#| msgid "Should ${extname} support be removed for ${sapiconfig}?"
+msgid "Should ${extname} be removed from /etc/php5/${sapiconfig}/php.ini?"
 msgstr ""
 "Wilt u dat ${extname}-ondersteuning verwijderd wordt voor ${sapiconfig}?"
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:3001
+#: ../php5-mapscript.templates:2001
+#, fuzzy
+#| msgid ""
+#| "You are removing ${extname} support for PHP5, but it is still enabled in /"
+#| "etc/php5/${sapiconfig}/php.ini. Leaving this in place will probably cause "
+#| "problems when trying to use PHP."
 msgid ""
-"You are removing ${extname} support for PHP5, but it is still enabled in /"
-"etc/php5/${sapiconfig}/php.ini. Leaving this in place will probably cause "
-"problems when trying to use PHP."
+"You are removing ${extname} support for php5, but it is still enabled in the "
+"configuration for the ${sapiconfig} SAPI.  Leaving this in place will "
+"probably cause problems when trying to use PHP."
 msgstr ""
 "U bent bezig om ${extname}-ondersteuning voor php5 te verwijderen. Dit is "
 "echter nog steeds geactiveerd in het configuratiebestand /etc/php5/"

Modified: packages/mapserver/trunk/debian/po/pt.po
===================================================================
--- packages/mapserver/trunk/debian/po/pt.po	2010-12-27 22:25:43 UTC (rev 2953)
+++ packages/mapserver/trunk/debian/po/pt.po	2011-01-06 18:43:41 UTC (rev 2954)
@@ -2,8 +2,8 @@
 # Rui Branco <ruipb at debianpt.org>, 2006.
 # 2006-12-03 - Rui Branco - Initial translation
 # 2006-08-26 - 4f
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: mapserver 4.10.2-1\n"
@@ -12,9 +12,10 @@
 "PO-Revision-Date: 2007-08-26 17:42+0100\n"
 "Last-Translator: Rui Branco <ruipb at debianpt.org>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. Type: boolean
 #. Description
@@ -51,4 +52,3 @@
 "Está a remover o suporte ${extname} para o php5, no entanto está ainda "
 "activo na configuração para o ${sapiconfig}·SAPI.  Ao deixar isto no local "
 "irá provavelmente causar problemas quando tentar utilizar PHP."
-

Modified: packages/mapserver/trunk/debian/po/ru.po
===================================================================
--- packages/mapserver/trunk/debian/po/ru.po	2010-12-27 22:25:43 UTC (rev 2953)
+++ packages/mapserver/trunk/debian/po/ru.po	2011-01-06 18:43:41 UTC (rev 2954)
@@ -11,11 +11,13 @@
 "PO-Revision-Date: 2008-11-06 19:33+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\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.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
@@ -32,8 +34,8 @@
 "allow php5 scripts to use it."
 msgstr ""
 "Вы устанавливаете поддержку ${extname} в php5, но пока она не включена в "
-"настройках ${sapiconfig} SAPI. Включение этого расширения позволит "
-"сценариям php5 его использовать."
+"настройках ${sapiconfig} SAPI. Включение этого расширения позволит сценариям "
+"php5 его использовать."
 
 #. Type: boolean
 #. Description
@@ -52,4 +54,3 @@
 "Вы удаляете поддержку ${extname} из php5, но она всё ещё включена в "
 "настройках ${sapiconfig} SAPI. Оставление файла в таком состоянии, вероятно, "
 "приведёт к проблемам при использовании PHP."
-

Modified: packages/mapserver/trunk/debian/po/sv.po
===================================================================
--- packages/mapserver/trunk/debian/po/sv.po	2010-12-27 22:25:43 UTC (rev 2953)
+++ packages/mapserver/trunk/debian/po/sv.po	2011-01-06 18:43:41 UTC (rev 2954)
@@ -18,6 +18,7 @@
 "PO-Revision-Date: 2008-06-30 21:13+0200\n"
 "Last-Translator: Martin Bagge <martin.bagge at bthstudent.se>\n"
 "Language-Team: swedish <debian-l10n-swedish at lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -37,8 +38,9 @@
 "the configuration for the ${sapiconfig} SAPI. Enabling this extension will "
 "allow php5 scripts to use it."
 msgstr ""
-"Du installerar ${extname}-stöd för PHP5 och den är ännu inte aktiverad för ${sapiconfig}.  Aktivering av denna utökning gör att PHP5-"
-"skript kan använda den. "
+"Du installerar ${extname}-stöd för PHP5 och den är ännu inte aktiverad för "
+"${sapiconfig}.  Aktivering av denna utökning gör att PHP5-skript kan använda "
+"den. "
 
 #. Type: boolean
 #. Description
@@ -53,5 +55,7 @@
 "You are removing ${extname} support for php5, but it is still enabled in the "
 "configuration for the ${sapiconfig} SAPI.  Leaving this in place will "
 "probably cause problems when trying to use PHP."
-msgstr "Du tar bort ${extname}-stödet för PHP5 men den är fortfarande aktiverad i /etc/php5/${sapiconfig}/php.ini. Att lämna den aktiverad kan orsaka problem när du försöker använda PHP."
-
+msgstr ""
+"Du tar bort ${extname}-stödet för PHP5 men den är fortfarande aktiverad i /"
+"etc/php5/${sapiconfig}/php.ini. Att lämna den aktiverad kan orsaka problem "
+"när du försöker använda PHP."

Modified: packages/mapserver/trunk/debian/po/ta.po
===================================================================
--- packages/mapserver/trunk/debian/po/ta.po	2010-12-27 22:25:43 UTC (rev 2953)
+++ packages/mapserver/trunk/debian/po/ta.po	2011-01-06 18:43:41 UTC (rev 2954)
@@ -7,10 +7,11 @@
 msgstr ""
 "Project-Id-Version: mapserver\n"
 "Report-Msgid-Bugs-To: pkg-grass-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-07-23 07:41+0200\n"
+"POT-Creation-Date: 2007-06-15 15:55+0200\n"
 "PO-Revision-Date: 2007-07-23 21:49+0530\n"
 "Last-Translator: Dr.T.Vasudevan <agnihot3 at gmail.com>\n"
 "Language-Team: TAMIL <ubuntu-l10n-tam at lists.ubuntu.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,17 +19,24 @@
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:2001
-msgid "Should ${extname} support be added for ${sapiconfig}?"
+#: ../php5-mapscript.templates:1001
+#, fuzzy
+#| msgid "Should ${extname} support be added for ${sapiconfig}?"
+msgid "Should ${extname} be added to /etc/php5/${sapiconfig}/php.ini?"
 msgstr "${extname} ஆதரவு ${sapiconfig} க்கு சேர்க்கப்பட வேண்டுமா?"
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:2001
+#: ../php5-mapscript.templates:1001
+#, fuzzy
+#| msgid ""
+#| "You are installing ${extname} support for PHP5, but it is not yet enabled "
+#| "in /etc/php5/${sapiconfig}/php.ini. Enabling this extension will allow "
+#| "PHP5 scripts to use it."
 msgid ""
-"You are installing ${extname} support for PHP5, but it is not yet enabled "
-"in /etc/php5/${sapiconfig}/php.ini. Enabling this extension will allow PHP5 "
-"scripts to use it."
+"You are installing ${extname} support for php5 and it is not yet enabled in "
+"the configuration for the ${sapiconfig} SAPI. Enabling this extension will "
+"allow php5 scripts to use it."
 msgstr ""
 "நீங்கள் ${extname} ஐ PHP5 ஆதரவுக்காக நிறுவுகிறீர்கள், அது /etc/php5/${sapiconfig}/"
 "php.ini இல் இன்னும் இயலுமைப்படுத்தப்படவில்லை. இந்த நீட்சியை செயல்படுத்துவது  PHP5 "
@@ -36,17 +44,24 @@
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:3001
-msgid "Should ${extname} support be removed for ${sapiconfig}?"
+#: ../php5-mapscript.templates:2001
+#, fuzzy
+#| msgid "Should ${extname} support be removed for ${sapiconfig}?"
+msgid "Should ${extname} be removed from /etc/php5/${sapiconfig}/php.ini?"
 msgstr "${extname} ஆதரவு ${sapiconfig} க்கு நீக்கப்பட வேண்டுமா?"
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:3001
+#: ../php5-mapscript.templates:2001
+#, fuzzy
+#| msgid ""
+#| "You are removing ${extname} support for PHP5, but it is still enabled in /"
+#| "etc/php5/${sapiconfig}/php.ini. Leaving this in place will probably cause "
+#| "problems when trying to use PHP."
 msgid ""
-"You are removing ${extname} support for PHP5, but it is still enabled in /"
-"etc/php5/${sapiconfig}/php.ini. Leaving this in place will probably cause "
-"problems when trying to use PHP."
+"You are removing ${extname} support for php5, but it is still enabled in the "
+"configuration for the ${sapiconfig} SAPI.  Leaving this in place will "
+"probably cause problems when trying to use PHP."
 msgstr ""
 "நீங்கள் ${extname} ஆதரவை PHP5 க்கு நீக்குகிறீர்கள், ஆனால் அது /etc/php5/${sapiconfig}/"
 "php.ini இல் இன்னமும் உள்ளது. இதை அப்படியே விடுவது  PHP ஐ பயன்படுத்தும்போது "

Modified: packages/mapserver/trunk/debian/po/vi.po
===================================================================
--- packages/mapserver/trunk/debian/po/vi.po	2010-12-27 22:25:43 UTC (rev 2953)
+++ packages/mapserver/trunk/debian/po/vi.po	2011-01-06 18:43:41 UTC (rev 2954)
@@ -1,53 +1,55 @@
-# Vietnamese Translation for mapserver.
-# Copyright © 2007 Free Software Foundation, Inc.
-# Clytie Siddall <clytie at riverland.net.au>, 2005-2007.
-# 
+# Vietnamese Translation for Mapserver.
+# Copyright © 2010 Free Software Foundation, Inc.
+# Clytie Siddall <clytie at riverland.net.au>, 2005-2010.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: mapserver 4.10.2-2\n"
+"Project-Id-Version: mapserver 5.6.5-1\n"
 "Report-Msgid-Bugs-To: pkg-grass-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-07-23 07:41+0200\n"
-"PO-Revision-Date: 2007-07-26 23:24+0930\n"
+"POT-Creation-Date: 2007-06-15 15:55+0200\n"
+"PO-Revision-Date: 2010-10-31 14:06+1030\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LocFactoryEditor 1.7b1\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:2001
-msgid "Should ${extname} support be added for ${sapiconfig}?"
-msgstr "Có nên thêm khả năng hỗ trợ ${extname} vào ${sapiconfig} không?"
+#: ../php5-mapscript.templates:1001
+msgid "Should ${extname} be added to /etc/php5/${sapiconfig}/php.ini?"
+msgstr "Có nên thêm ${extname} vào « /etc/php5/${sapiconfig}/php.ini » không?"
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:2001
+#: ../php5-mapscript.templates:1001
 msgid ""
-"You are installing ${extname} support for PHP5, but it is not yet enabled "
-"in /etc/php5/${sapiconfig}/php.ini. Enabling this extension will allow PHP5 "
-"scripts to use it."
+"You are installing ${extname} support for php5 and it is not yet enabled in "
+"the configuration for the ${sapiconfig} SAPI. Enabling this extension will "
+"allow php5 scripts to use it."
 msgstr ""
-"Bạn đang cài đặt khả năng hỗ trợ ${extname} cho PHP5, nhưng nó chưa được "
-"hiệu lực trong tập tin « /etc/php5/${sapiconfig}/php.ini ». Bật phần mở rộng "
-"này để cho phép các văn lệnh PHP5 sử dụng nó."
+"Bạn đang cài đặt sự hỗ trợ ${extname} cho php5 mà chưa được hiệu lực trong "
+"cấu hình cho SAPI ${sapiconfig}. Bật phần mở rộng này để cho phép văn lệnh "
+"php5 sử dụng."
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:3001
-msgid "Should ${extname} support be removed for ${sapiconfig}?"
-msgstr "Có nên gỡ bỏ khả năng hỗ trợ ${extname} khỏi ${sapiconfig} không?"
+#: ../php5-mapscript.templates:2001
+msgid "Should ${extname} be removed from /etc/php5/${sapiconfig}/php.ini?"
+msgstr ""
+"Có nên gỡ bỏ ${extname} khỏi « /etc/php5/${sapiconfig}/php.ini » không?"
 
 #. Type: boolean
 #. Description
-#: ../php5-mapscript.templates:3001
+#: ../php5-mapscript.templates:2001
 msgid ""
-"You are removing ${extname} support for PHP5, but it is still enabled in /"
-"etc/php5/${sapiconfig}/php.ini. Leaving this in place will probably cause "
-"problems when trying to use PHP."
+"You are removing ${extname} support for php5, but it is still enabled in the "
+"configuration for the ${sapiconfig} SAPI.  Leaving this in place will "
+"probably cause problems when trying to use PHP."
 msgstr ""
-"Bạn đang gỡ bỏ khả năng hỗ trợ ${extname} cho PHP5, nhưng nó vẫn còn được "
-"hiệu lực trong tập tin « /etc/php5/${sapiconfig}/php.ini ». Để lại thì có "
-"thể gây ra vấn đề khi thử sử dụng PHP5."
+"Bạn đang gỡ bỏ sự hỗ trợ ${extname} cho php5 mà vẫn còn được hiệu lực trong "
+"cấu hình cho SAPI ${sapiconfig}. Để lại thì rất có thể gây ra vấn đề khi thử "
+"sử dụng PHP."




More information about the Pkg-grass-devel mailing list