Merge from Philippe Batailler French manpages tree/Vietnamese translation update

* po/vi.po: Completed to 512 strings

Patches applied:

 * philippe.batailler@free.fr--2005/apt--main--0--patch-9
   manpages

diff --git a/doc/fr/apt.ent.fr b/doc/fr/apt.ent.fr
index 94398bb44cd2f82758b5bb7030240af4f40d19c7..d705b9e3e0d0503b5ba37ba7575ccd4332d3032f 100644 (file)
--- a/doc/fr/apt.ent.fr
+++ b/doc/fr/apt.ent.fr
@@ -11,36 +11,38 @@
 <!ENTITY apt-conf "<citerefentry>
     <refentrytitle><filename>apt.conf</filename></refentrytitle>
     <manvolnum>5</manvolnum>
 <!ENTITY apt-conf "<citerefentry>
     <refentrytitle><filename>apt.conf</filename></refentrytitle>
     <manvolnum>5</manvolnum>

-  </citerefentry>
-">
+  </citerefentry>"
+>

 
 <!ENTITY apt-get "<citerefentry>
     <refentrytitle><command>apt-get</command></refentrytitle>
     <manvolnum>8</manvolnum>
 
 <!ENTITY apt-get "<citerefentry>
     <refentrytitle><command>apt-get</command></refentrytitle>
     <manvolnum>8</manvolnum>

-  </citerefentry>
-">
+  </citerefentry>"
+>

 
 <!ENTITY apt-config "<citerefentry>
     <refentrytitle><command>apt-config</command></refentrytitle>
     <manvolnum>8</manvolnum>
 
 <!ENTITY apt-config "<citerefentry>
     <refentrytitle><command>apt-config</command></refentrytitle>
     <manvolnum>8</manvolnum>

-  </citerefentry>">
+  </citerefentry>"
+>

 
 <!ENTITY apt-cdrom "<citerefentry>
     <refentrytitle><command>apt-cdrom</command></refentrytitle>
     <manvolnum>8</manvolnum>
 
 <!ENTITY apt-cdrom "<citerefentry>
     <refentrytitle><command>apt-cdrom</command></refentrytitle>
     <manvolnum>8</manvolnum>

-  </citerefentry>
-">
+  </citerefentry>"
+>

 
 <!ENTITY apt-cache "<citerefentry>
     <refentrytitle><command>apt-cache</command></refentrytitle>
     <manvolnum>8</manvolnum>
 
 <!ENTITY apt-cache "<citerefentry>
     <refentrytitle><command>apt-cache</command></refentrytitle>
     <manvolnum>8</manvolnum>

-  </citerefentry>
-">
+  </citerefentry>"
+>

 
 <!ENTITY apt-preferences "<citerefentry>
     <refentrytitle><command>apt_preferences</command></refentrytitle>
     <manvolnum>5</manvolnum>
 
 <!ENTITY apt-preferences "<citerefentry>
     <refentrytitle><command>apt_preferences</command></refentrytitle>
     <manvolnum>5</manvolnum>

-  </citerefentry>">
+  </citerefentry>"
+>

 
 <!ENTITY apt-key "<citerefentry>
     <refentrytitle><command>apt-key</command></refentrytitle>
 
 <!ENTITY apt-key "<citerefentry>
     <refentrytitle><command>apt-key</command></refentrytitle>


@@ -69,43 +71,44 @@
 <!ENTITY reportbug "<citerefentry>
     <refentrytitle><command>reportbug</command></refentrytitle>
     <manvolnum>1</manvolnum>
 <!ENTITY reportbug "<citerefentry>
     <refentrytitle><command>reportbug</command></refentrytitle>
     <manvolnum>1</manvolnum>

-  </citerefentry>
-">
+  </citerefentry>"
+>

 
 <!ENTITY dpkg "<citerefentry>
     <refentrytitle><command>dpkg</command></refentrytitle>
     <manvolnum>8</manvolnum>
 
 <!ENTITY dpkg "<citerefentry>
     <refentrytitle><command>dpkg</command></refentrytitle>
     <manvolnum>8</manvolnum>

-  </citerefentry>
-">
+  </citerefentry>"
+>

 
 <!ENTITY dpkg-buildpackage "<citerefentry>
     <refentrytitle><command>dpkg-buildpackage</command></refentrytitle>
     <manvolnum>1</manvolnum>
 
 <!ENTITY dpkg-buildpackage "<citerefentry>
     <refentrytitle><command>dpkg-buildpackage</command></refentrytitle>
     <manvolnum>1</manvolnum>

-  </citerefentry>
-">
+  </citerefentry>"
+>

 
 <!ENTITY gzip "<citerefentry>
     <refentrytitle><command>gzip</command></refentrytitle>
     <manvolnum>1</manvolnum>
 
 <!ENTITY gzip "<citerefentry>
     <refentrytitle><command>gzip</command></refentrytitle>
     <manvolnum>1</manvolnum>

-  </citerefentry>
-">
+  </citerefentry>"
+>

 
 <!ENTITY dpkg-scanpackages "<citerefentry>
     <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>
     <manvolnum>8</manvolnum>
 
 <!ENTITY dpkg-scanpackages "<citerefentry>
     <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>
     <manvolnum>8</manvolnum>

-  </citerefentry>
-">
+  </citerefentry>"
+>

 
 <!ENTITY dpkg-scansources "<citerefentry>
     <refentrytitle><command>dpkg-scansources</command></refentrytitle>
     <manvolnum>8</manvolnum>
 
 <!ENTITY dpkg-scansources "<citerefentry>
     <refentrytitle><command>dpkg-scansources</command></refentrytitle>
     <manvolnum>8</manvolnum>

-  </citerefentry>
-">
+  </citerefentry>"
+>

 
 <!ENTITY dselect "<citerefentry>
     <refentrytitle><command>dselect</command></refentrytitle>
     <manvolnum>8</manvolnum>
 
 <!ENTITY dselect "<citerefentry>
     <refentrytitle><command>dselect</command></refentrytitle>
     <manvolnum>8</manvolnum>

-  </citerefentry>">
+  </citerefentry>"
+>

     
 <!ENTITY aptitude "<citerefentry>
     <refentrytitle><command>aptitude</command></refentrytitle>
     
 <!ENTITY aptitude "<citerefentry>
     <refentrytitle><command>aptitude</command></refentrytitle>


@@ -192,8 +195,8 @@ Voyez la <ulink url='http://bugs.debian.org/src:apt'> page concernant les bogues
    Si vous voulez signaler un bogue, consultez le texte 
    <filename>/usr/share/doc/debian/bug-reporting.txt</filename> ou utilisez la 
 commande &reportbug;.</para>
    Si vous voulez signaler un bogue, consultez le texte 
    <filename>/usr/share/doc/debian/bug-reporting.txt</filename> ou utilisez la 
 commande &reportbug;.</para>

- </refsect1>
- ">
+ </refsect1>"
+>

 
 <!-- Boiler plate Author section -->
 <!ENTITY manauthor "
 
 <!-- Boiler plate Author section -->
 <!ENTITY manauthor "


@@ -201,17 +204,17 @@ commande &reportbug;.</para>
    <para>
    APT a été écrit par l'équipe APT <email>apt@packages.debian.org</email>.
 </para>
    <para>
    APT a été écrit par l'équipe APT <email>apt@packages.debian.org</email>.
 </para>

- </refsect1>
-">
+ </refsect1>"
+>

 
 <!-- Section traduction -->
 <!ENTITY deux-traducteurs "
 <refsect1><title>Traduction</title>
 <para>
 Jérôme Marant. 2000&nbsp;; mise à jour : Philippe Batailler. 2005.
 
 <!-- Section traduction -->
 <!ENTITY deux-traducteurs "
 <refsect1><title>Traduction</title>
 <para>
 Jérôme Marant. 2000&nbsp;; mise à jour : Philippe Batailler. 2005.

-</para>
-</refsect1>
-">
+<email>debian-l10n-french@lists.debian.org</email>.</para>
+</refsect1>"
+>

 
 <!ENTITY traducteur "
 <refsect1><title>Traduction</title>
 
 <!ENTITY traducteur "
 <refsect1><title>Traduction</title>

diff --git a/po/ChangeLog b/po/ChangeLog
index b3b63e3731c56f1303cef9e520a0d57fffee5c4d..b44b5902d00babdf48a84970179489f856227548 100644 (file)
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-22  Clytie Siddall  <clytie@riverland.net.au>
+
+       * vi.po: Completed to 512 strings
+

 2005-11-21  Daniel Nylander  <yeager@lidkoping.net>
 
        * sv.po: Completed to 512 strings
 2005-11-21  Daniel Nylander  <yeager@lidkoping.net>
 
        * sv.po: Completed to 512 strings

diff --git a/po/vi.po b/po/vi.po
index 76f0279f50b5112eba62b0fbd42af5de78296e80..4c9841e0372ae87078f43a6824eb7b68f2ac1e3a 100644 (file)
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2006-01-20 14:01+0100\n"
-"PO-Revision-Date: 2006-01-20 16:55+1030\n"
+"POT-Creation-Date: 2006-01-20 14:06+0100\n"
+"PO-Revision-Date: 2006-01-22 13:04+1030\n"

 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"


@@ -1116,7 +1116,7 @@ msgid "Unable to find a source package for %s"
 msgstr "Không tìm thấy gói nguồn cho %s"
 
 #: cmdline/apt-get.cc:1959
 msgstr "Không tìm thấy gói nguồn cho %s"
 
 #: cmdline/apt-get.cc:1959

-#, fuzzy, c-format
+#, c-format

 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Đang bỏ qua tập tin đã được tải về « %s »\n"
 
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Đang bỏ qua tập tin đã được tải về « %s »\n"
 


@@ -2605,7 +2605,7 @@ msgstr "MD5Sum (tổng kiểm) không khớp được"
 
 #: apt-pkg/acquire-item.cc:645
 msgid "There are no public key available for the following key IDs:\n"
 
 #: apt-pkg/acquire-item.cc:645
 msgid "There are no public key available for the following key IDs:\n"

-msgstr ""
+msgstr "Không có khóa công sẵn sàng cho những ID khóa theo đây:\n"

 
 #: apt-pkg/acquire-item.cc:758
 #, c-format
 
 #: apt-pkg/acquire-item.cc:758
 #, c-format