Merge from bubulle@debian.org--2005/apt--main--0 (translations)

Patches applied:

 * bubulle@debian.org--2005/apt--main--0--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-48

 * bubulle@debian.org--2005/apt--main--0--patch-1
   French translation update

 * bubulle@debian.org--2005/apt--main--0--patch-2
   Remove useles tilde files

 * bubulle@debian.org--2005/apt--main--0--patch-3
   Updated Finnish and Basque translations

 * bubulle@debian.org--2005/apt--main--0--patch-4
   Update with files from apt-sarge. Complete French translation.

 * bubulle@debian.org--2005/apt--main--0--patch-5
   Correct typo in Usage message : s/arbitary/arbitrary. Unfuzzy translations. Closes: #291172

 * bubulle@debian.org--2005/apt--main--0--patch-6
   Updated French manpage. Closes: #291020

 * bubulle@debian.org--2005/apt--main--0--patch-7
   Japanese documentation update. Closes: #265720

 * bubulle@debian.org--2005/apt--main--0--patch-8
   Updated Traditional Chines translation

 * bubulle@debian.org--2005/apt--main--0--patch-9
   Updated Norwegian Bokmal translation from sarge branch

 * bubulle@debian.org--2005/apt--main--0--patch-10
   Updated Slovenian translation

 * bubulle@debian.org--2005/apt--main--0--patch-11
   Remove no_NO translation (not needed after sarge)

 * bubulle@debian.org--2005/apt--main--0--patch-12
   Hungarian translation updated from the sarge branch. Closes: #292204

 * bubulle@debian.org--2005/apt--main--0--patch-13
   Hungarian translation completed. Closes: #292204

 * bubulle@debian.org--2005/apt--main--0--patch-14
   Polish translation updated from sarge

 * bubulle@debian.org--2005/apt--main--0--patch-15
   Initiali Tagalog translation. Closes:#293132

 * bubulle@debian.org--2005/apt--main--0--patch-16
   Really add the Tagalog translation. Closes: #293132

 * bubulle@debian.org--2005/apt--main--0--patch-17
   Completed Tagalog translation. Closes: #293132

 * bubulle@debian.org--2005/apt--main--0--patch-18
   Merge with Matt and update French translation

 * bubulle@debian.org--2005/apt--main--0--patch-19
   Remove no_NO from LINGUAS

 * bubulle@debian.org--2005/apt--main--0--patch-20
   Rebuild the POT file

 * bubulle@debian.org--2005/apt--main--0--patch-21
   Update all PO files from the new apt-all.pot file

 * bubulle@debian.org--2005/apt--main--0--patch-22
   Complete French translation

 * bubulle@debian.org--2005/apt--main--0--patch-23
   Updated Basque translation for main by Piarres Beobide Egana

 * bubulle@debian.org--2005/apt--main--0--patch-24
   Updated Japanese and Norwegian Bokmal translations

 * bubulle@debian.org--2005/apt--main--0--patch-25
   Tagalog translation update by Eric Pareja

 * bubulle@debian.org--2005/apt--main--0--patch-26
   Updated Simplified Chinese translation by Kov Tchai

 * bubulle@debian.org--2005/apt--main--0--patch-27
   Updated Slovak translation by Peter Mann

 * bubulle@debian.org--2005/apt--main--0--patch-28
   Italian translation update

 * bubulle@debian.org--2005/apt--main--0--patch-29
   Dutch translation update by Bart Cornelis

 * bubulle@debian.org--2005/apt--main--0--patch-30
   Danish translation update by Claus Hindsgaul

 * bubulle@debian.org--2005/apt--main--0--patch-31
   Correct LINGUAS to include ru and tl

 * bubulle@debian.org--2005/apt--main--0--patch-32
   Polish translation update by Bartosz Fenski

 * bubulle@debian.org--2005/apt--main--0--patch-33
   Czech translation update by Miroslav Kure

 * bubulle@debian.org--2005/apt--main--0--patch-34
   Brazilian Portuguese translation update by Andre Luis Lopes

 * bubulle@debian.org--2005/apt--main--0--patch-35
   Complete Norwegian Nynorsk translation by H��vard Korsvoll

 * bubulle@debian.org--2005/apt--main--0--patch-36
   Updated Spanish translation by Ruben Porras

 * bubulle@debian.org--2005/apt--main--0--patch-37
   Russian translation update by Yuri Kozlov

 * bubulle@debian.org--2005/apt--main--0--patch-38
   German translation update by Michael Piefel

 * bubulle@debian.org--2005/apt--main--0--patch-39
   Swedish translation update by Peter Karlsson

 * bubulle@debian.org--2005/apt--main--0--patch-40
   Finnish translation update by Tapio Lehtonen

 * bubulle@debian.org--2005/apt--main--0--patch-41
   Hungarian translation update by Kelemen G��bor

 * bubulle@debian.org--2005/apt--main--0--patch-42
   Catalan translation update by Jordi Mallach

 * bubulle@debian.org--2005/apt--main--0--patch-43
   Korean translation update by Changwoo Ryu

 * bubulle@debian.org--2005/apt--main--0--patch-44
   Greek translation updated by George Papamichelakis

 * bubulle@debian.org--2005/apt--main--0--patch-45
   Important corrections to French translation by Mohamed Adn��neTrojette

 * bubulle@debian.org--2005/apt--main--0--patch-46
   Updated Slovenian translation by Jure Cuhalev

 * bubulle@debian.org--2005/apt--main--0--patch-47
   French translation update after proofreading

 * bubulle@debian.org--2005/apt--main--0--patch-48
   Updated Portuguese translation by Miguel Figuereido

 * bubulle@debian.org--2005/apt--main--0--patch-49
   Traditional Chinese translation update by Asho Yeh

 * bubulle@debian.org--2005/apt--main--0--patch-50
   Restored complete French translation

 * bubulle@debian.org--2005/apt--main--0--patch-51
   Remove de.UTF-8 from LINGUAS

 * bubulle@debian.org--2005/apt--main--0--patch-52
   Greek translation completed

 * bubulle@debian.org--2005/apt--main--0--patch-53
   Traditional Chinese translation update

 * bubulle@debian.org--2005/apt--main--0--patch-54
   Merge with matt

 * bubulle@debian.org--2005/apt--main--0--patch-55
   Regenerate apt-all.pot from the sources after merging with Matt

 * bubulle@debian.org--2005/apt--main--0--patch-56
   Re-sync PO files with the POT file

 * bubulle@debian.org--2005/apt--main--0--patch-57
   Correct file permissions

cmdline/apt-cache.cc

@@ -1688,7 +1688,7 @@ bool ShowHelp(CommandLine &Cmd)
       "  -q   Disable progress indicator.\n"
       "  -i   Show only important deps for the unmet command.\n"
       "  -c=? Read this configuration file\n"
-      "  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+      "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
       "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n");
    return true;
 }

cmdline/apt-cdrom.cc

@@ -159,7 +159,7 @@ int ShowHelp()
       "  -f   Fast mode, don't check package files\n"
       "  -a   Thorough scan mode\n"
       "  -c=? Read this configuration file\n"
-      "  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+      "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
       "See fstab(5)\n";
    return 0;
 }

cmdline/apt-config.cc

@@ -84,7 +84,7 @@ int ShowHelp()
       "Options:\n"
       "  -h   This help text.\n" 
       "  -c=? Read this configuration file\n" 
-      "  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n");
+      "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n");
    return 0;
 }
 									/*}}}*/

cmdline/apt-extracttemplates.cc

@@ -238,7 +238,7 @@ int ShowHelp(void)
 	        "  -h   This help text\n"
 		"  -t   Set the temp dir\n"
 		"  -c=? Read this configuration file\n"
-		"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n");
+		"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n");
 	return 0;
 }
 									/*}}}*/

cmdline/apt-get.cc

@@ -2390,7 +2390,7 @@ bool ShowHelp(CommandLine &CmdL)
       "  -b  Build the source package after fetching it\n"
       "  -V  Show verbose version numbers\n"
       "  -c=? Read this configuration file\n"
-      "  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+      "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
       "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
       "pages for more information and options.\n"
       "                       This APT has Super Cow Powers.\n");

cmdline/apt-sortpkgs.cc

@@ -156,7 +156,7 @@ int ShowHelp()
       "  -h   This help text\n"
       "  -s   Use source file sorting\n"
       "  -c=? Read this configuration file\n"
-      "  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n");
+      "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n");
 
    return 0;
 }

debian/changelog

@@ -1,7 +1,9 @@
-apt (0.6.34) UNRELEASED; urgency=low
+apt (0.6.34) hoary; urgency=low
 
   * Add missing semicolon to configure-index (Closes: #295773)
   * Update build-depends on gettext to 0.12 (Closes: #295077)
+  * Merge from bubulle@debian.org--2005/apt--main--0 to get
+    translation updates
 
  -- Matt Zimmerman <mdz@ubuntu.com>  Fri,  4 Mar 2005 16:13:15 -0800
 

doc/fr/apt-cache.fr.8.sgml

@@ -102,7 +102,7 @@ Reverse Provides:
 </programlisting></informalexample>
 			    
      <para>
-On peut voir que libreadline2, version 2.1-8, dépend de libc5, ncurses3.0, et 
+On peut voir que libreadline2, version 2.1-12, dépend de libc5, ncurses3.0, et 
 ldso&nbsp;; ces paquets doivent être installés au préalable pour que 
 libreadline2 fonctionne. À leur tour, libreadlineg2 et libreadline2-altdev 
 dépendent de libreadline2. Si libreadline2 est installé, libc5 et ncurses3.0 (et 
@@ -177,7 +177,7 @@ d
 
      <VarListEntry><Term>showsrc <replaceable/paquet(s)/</Term>
      <ListItem><Para>
-     <literal/showsrc/ affiche toutes les entrées de paquet-source qui
+     <literal/showsrc/ affiche toutes les entrées de paquet source qui
 correspondent aux noms donnés. Toutes les versions sont affichées et toutes
 les entrées qui déclarent que ces noms correspondent à des paquets binaires.
      </VarListEntry>
@@ -247,13 +247,13 @@ l'option <option/--generate/.
      <VarListEntry><Term>dotty <replaceable/paquet(s)/</Term>
      <ListItem><Para>
 La commande <literal/dotty/ prend une liste de paquets sur la ligne de commande
-et affiche une sortie appropriée à une utilisation par dotty avec le paquet
-<ulink url="http://www.research.att.com/sw/tools/graphviz/">GraphViz</>.
+et affiche une sortie appropriée à une utilisation par la commande dotty du 
+paquet <ulink url="http://www.research.att.com/sw/tools/graphviz/">GraphViz</>.
 Il en résulte un ensemble de noeuds et d'arcs représentant les relations 
 entre les paquets. Par défaut les paquets donnés en argument suivent toutes
 leurs dépendances, ce qui peut produire un graphe très volumineux. 
-Pour limiter la sortie aux paquets listés sur la ligne de commande, positionnez
-l'option <literal>APT::Cache::GivenOnly</>.
+Pour limiter la sortie aux seuls paquets listés sur la ligne de commande, 
+positionnez l'option <literal>APT::Cache::GivenOnly</>.
 	      </para>
 <para>
 Les noeuds résultants ont plusieurs formes&nbsp;; les paquets normaux sont 
@@ -264,8 +264,7 @@ sont des hexagones. Les bo
 lignes vertes représentent des conflits.
 	    </para>
      <para>
-Attention, dotty ne peut pas représenter des ensembles de paquets
-plus volumineux.
+Attention, dotty ne peut pas représenter des ensembles très grands de paquets.
      </VarListEntry>
 
      <VarListEntry><Term>policy <replaceable/[ paquet(s) ]/</Term>

doc/fr/apt.ent.fr

@@ -122,14 +122,14 @@ commande &reportbug;.
 <!ENTITY deux-traducteurs "
 <RefSect1><Title>Traduction</>
 <para>
-Jérôme Marant. 2000&nbsp;; mise à jour : Philippe Batailler. 2003.
+Jérôme Marant. 2000&nbsp;; mise à jour : Philippe Batailler. 2004.
 </RefSect1>
 ">
 
 <!ENTITY traducteur "
 <RefSect1><Title>Traduction</>
 <para>
-Philippe Batailler. <email>debian-l10n-french@lists.debian.org</>. 2003.
+Philippe Batailler. <email>debian-l10n-french@lists.debian.org</>. 2004.
 </RefSect1>
 ">
 

doc/ja/apt-cache.ja.8.sgml

@@ -245,9 +245,9 @@ Reverse Provides:
        (real or virtual) has been dropped from the distribution. Usually they
        are referenced from Conflicts statements.
 -->
-       <literal/Missing (紛失)/ は、依存関係中には存在するのに、どのパッケージ
+       <literal/Missing (欠落)/ は、依存関係中には存在するのに、どのパッケージ
        にも提供されていないパッケージ名の数を表します。
-       紛失パッケージがあるということは、全ディストリビューションにアクセスで
+       パッケージがあるということは、全ディストリビューションにアクセスで
        きていないか、(実ないし仮想) パッケージがディストリビューションから
        はずされてしまったかもしれないことを表します。
        通常、これは構文が矛盾することで参照されます。
@@ -414,7 +414,7 @@ Reverse Provides:
 -->
      結果のノードは数種類の形状となります。
      通常パッケージは四角、純仮想パッケージは三角、複仮想パッケージは菱形、
-     六角形は紛失パッケージをそれぞれ表します。
+     六角形は欠落パッケージをそれぞれ表します。
      オレンジの四角は再起が終了した「リーフパッケージ」、青い線は pre-depends、
      緑の線は競合を表します。
      <para>

doc/ja/apt-get.ja.8.sgml

@@ -416,7 +416,7 @@
      held back.
      Configuration Item: <literal/APT::Get::Fix-Missing/.
 -->
-     見つからないパッケージの無視 - パッケージが取得できなかったり、
+     欠落パッケージの無視 - パッケージが取得できなかったり、
      (パッケージの破損で) 取得した後の整合性チェックを通らなかった場合、
      そのパッケージの処理を保留し最後まで処理を続けます。
      このオプションを <option/-f/ オプションと同時に使用すると、

doc/ja/apt.ent.ja

@@ -114,7 +114,7 @@
 <!ENTITY translator "
  <RefSect1><Title>ËÝÌõ¼Ô</>
     <para>
-    ÁÒß· ˾ <email>nabetaro@slug.jp</> (2003)
+    ÁÒß· ˾ <email>nabetaro@mx1.avis.ne.jp</> (2003-2004)
     </para>
     <para>
     Debian JP Documentation ML <email>debian-doc@debian.or.jp</>

po/LINGUAS

@@ -1 +1 @@
-bs ca cs da de de.UTF-8 el en_GB es eu fi fr he hu it ja ko nb nl nn no_NO pl pt pt_BR ro sk sl sv zh_CN zh_TW
+bs ca cs da de el en_GB es eu fi fr he hu it ja ko nb nl nn pl pt pt_BR ro ru sk sl sv tl zh_CN zh_TW

po/apt-all.pot

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-25 14:16+0100\n"
+"POT-Creation-Date: 2005-03-05 12:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -188,7 +188,7 @@ msgid ""
 "  -q   Disable progress indicator.\n"
 "  -i   Show only important deps for the unmet command.\n"
 "  -c=? Read this configuration file\n"
-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
@@ -209,7 +209,7 @@ msgid ""
 "Options:\n"
 "  -h   This help text.\n"
 "  -c=? Read this configuration file\n"
-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
 #: cmdline/apt-extracttemplates.cc:98
@@ -228,7 +228,7 @@ msgid ""
 "  -h   This help text\n"
 "  -t   Set the temp dir\n"
 "  -c=? Read this configuration file\n"
-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
 #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
@@ -1053,7 +1053,7 @@ msgid ""
 "  -b  Build the source package after fetching it\n"
 "  -V  Show verbose version numbers\n"
 "  -c=? Read this configuration file\n"
-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
@@ -1108,7 +1108,7 @@ msgid ""
 "  -h   This help text\n"
 "  -s   Use source file sorting\n"
 "  -c=? Read this configuration file\n"
-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
 #: dselect/install:32
@@ -2292,73 +2292,73 @@ msgstr ""
 msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:503
+#: apt-pkg/cdrom.cc:504
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
 "Mounting CD-ROM\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:512 apt-pkg/cdrom.cc:594
+#: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595
 msgid "Identifying.. "
 msgstr ""
 
-#: apt-pkg/cdrom.cc:537
+#: apt-pkg/cdrom.cc:538
 #, c-format
 msgid "Stored Label: %s \n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:557
+#: apt-pkg/cdrom.cc:558
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/cdrom.cc:576
 msgid "Unmounting CD-ROM\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:579
+#: apt-pkg/cdrom.cc:580
 msgid "Waiting for disc...\n"
 msgstr ""
 
 #. Mount the new CDROM
-#: apt-pkg/cdrom.cc:587
+#: apt-pkg/cdrom.cc:588
 msgid "Mounting CD-ROM...\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:605
+#: apt-pkg/cdrom.cc:606
 msgid "Scanning Disc for index files..\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:644
 #, c-format
 msgid "Found %i package indexes, %i source indexes and %i signatures\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:700
+#: apt-pkg/cdrom.cc:701
 msgid "That is not a valid name, try again.\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:716
+#: apt-pkg/cdrom.cc:717
 #, c-format
 msgid ""
 "This Disc is called: \n"
 "'%s'\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:720
+#: apt-pkg/cdrom.cc:721
 msgid "Copying package lists..."
 msgstr ""
 
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:745
 msgid "Writing new source list\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:753
+#: apt-pkg/cdrom.cc:754
 msgid "Source List entries for this Disc are:\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:787
+#: apt-pkg/cdrom.cc:788
 msgid "Unmounting CD-ROM..."
 msgstr ""