summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog4
-rw-r--r--doc/po/apt-doc.pot538
-rw-r--r--doc/po/de.po584
-rw-r--r--doc/po/es.po577
-rw-r--r--doc/po/fr.po583
-rw-r--r--doc/po/it.po541
-rw-r--r--doc/po/ja.po563
-rw-r--r--doc/po/pl.po541
-rw-r--r--doc/po/pt_BR.po543
-rw-r--r--po/ar.po353
-rw-r--r--po/ast.po367
-rw-r--r--po/bg.po367
-rw-r--r--po/bs.po351
-rw-r--r--po/ca.po367
-rw-r--r--po/cs.po367
-rw-r--r--po/cy.po365
-rw-r--r--po/da.po366
-rw-r--r--po/de.po367
-rw-r--r--po/dz.po368
-rw-r--r--po/el.po367
-rw-r--r--po/en_GB.po367
-rw-r--r--po/es.po367
-rw-r--r--po/eu.po367
-rw-r--r--po/fi.po367
-rw-r--r--po/gl.po367
-rw-r--r--po/hu.po367
-rw-r--r--po/it.po1
-rw-r--r--po/ja.po367
-rw-r--r--po/km.po368
-rw-r--r--po/ko.po367
-rw-r--r--po/ku.po360
-rw-r--r--po/lt.po364
-rw-r--r--po/mr.po367
-rw-r--r--po/nb.po367
-rw-r--r--po/ne.po367
-rw-r--r--po/nl.po367
-rw-r--r--po/nn.po365
-rw-r--r--po/pl.po367
-rw-r--r--po/pt.po367
-rw-r--r--po/pt_BR.po367
-rw-r--r--po/ro.po367
-rw-r--r--po/ru.po388
-rw-r--r--po/sk.po4
-rw-r--r--po/sl.po365
-rw-r--r--po/sv.po367
-rw-r--r--po/th.po367
-rw-r--r--po/tl.po366
-rw-r--r--po/uk.po365
-rw-r--r--po/vi.po367
-rw-r--r--po/zh_CN.po366
-rw-r--r--po/zh_TW.po367
51 files changed, 10234 insertions, 8897 deletions
diff --git a/debian/changelog b/debian/changelog
index 69edf559b..558fd8b10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.7.26) UNRELEASED; urgency=low
+apt (0.7.26~exp1) experimental; urgency=low
[ David Kalnischkies ]
* [BREAK] add possibility to download and use multiply
@@ -60,7 +60,7 @@ apt (0.7.26) UNRELEASED; urgency=low
useful when using several different archives on the same host.
(Closes: #329814, LP: #22354)
- -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 18 Dec 2009 16:54:18 +0100
+ -- Michael Vogt <mvo@debian.org> Thu, 18 Feb 2010 16:11:39 +0100
apt (0.7.25.3) unstable; urgency=low
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 40ed1f589..f3b50640c 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-01-20 12:18+0100\n"
+"POT-Creation-Date: 2010-02-18 20:53+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"
@@ -894,7 +894,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 sources.list.5.xml:33
+#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125 apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 sources.list.5.xml:33
msgid "Description"
msgstr ""
@@ -1284,7 +1284,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
+#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
msgid "options"
msgstr ""
@@ -1307,7 +1307,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376 apt-sortpkgs.1.xml:58
+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376 apt-sortpkgs.1.xml:58
msgid "<option>-s</option>"
msgstr ""
@@ -1327,12 +1327,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
msgid "<option>-q</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
msgid "<option>--quiet</option>"
msgstr ""
@@ -1381,7 +1381,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317 apt-cdrom.8.xml:131
+#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548
msgid "<option>-a</option>"
msgstr ""
@@ -1477,12 +1477,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 apt-sortpkgs.1.xml:64
+#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:554 apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 apt.conf.5.xml:1035 apt_preferences.5.xml:622
+#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 apt.conf.5.xml:1035 apt_preferences.5.xml:630
msgid "Files"
msgstr ""
@@ -1492,7 +1492,7 @@ msgid "&file-sourceslist; &file-statelists;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 sources.list.5.xml:233
+#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569 apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637 sources.list.5.xml:233
msgid "See Also"
msgstr ""
@@ -1502,7 +1502,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
+#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:575 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr ""
@@ -1566,7 +1566,7 @@ msgstr ""
#: apt-cdrom.8.xml:66
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
-"unmount the CDROM device, prompt for a disk to be inserted and then procceed "
+"unmount the CDROM device, prompt for a disk to be inserted and then proceed "
"to scan it and copy the index files. If the disc does not have a proper "
"<filename>disk</filename> directory you will be prompted for a descriptive "
"title."
@@ -1606,7 +1606,7 @@ msgid "Options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328
+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328
msgid "<option>-d</option>"
msgstr ""
@@ -1750,7 +1750,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:53 apt-ftparchive.1.xml:71
+#: apt-config.8.xml:53 apt-ftparchive.1.xml:72
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given "
"one of the commands below must be present."
@@ -1801,7 +1801,7 @@ msgid "Just show the contents of the configuration space."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 apt-sortpkgs.1.xml:70
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593 apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr ""
@@ -1910,7 +1910,8 @@ msgid ""
"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
"<arg><option>--readonly</option></arg> "
-"<arg><option>--contents</option></arg> <arg><option>-o "
+"<arg><option>--contents</option></arg> <arg><option>--arch "
+"<replaceable>architecture</replaceable></option></arg> <arg><option>-o "
"<replaceable>config</replaceable>=<replaceable>string</replaceable></option></arg> "
"<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
"choice=\"req\"> <arg>packages<arg choice=\"plain\" "
@@ -1929,7 +1930,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:56
+#: apt-ftparchive.1.xml:57
msgid ""
"<command>apt-ftparchive</command> is the command line tool that generates "
"the index files that APT uses to access a distribution source. The index "
@@ -1938,7 +1939,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:60
+#: apt-ftparchive.1.xml:61
msgid ""
"<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
"program, incorporating its entire functionality via the "
@@ -1948,7 +1949,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:66
+#: apt-ftparchive.1.xml:67
msgid ""
"Internally <command>apt-ftparchive</command> can make use of binary "
"databases to cache the contents of a .deb file and it does not rely on any "
@@ -1958,12 +1959,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:75
+#: apt-ftparchive.1.xml:76
msgid "packages"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:77
+#: apt-ftparchive.1.xml:78
msgid ""
"The packages command generates a package file from a directory tree. It "
"takes the given directory and recursively searches it for .deb files, "
@@ -1972,17 +1973,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106
+#: apt-ftparchive.1.xml:83 apt-ftparchive.1.xml:107
msgid "The option <option>--db</option> can be used to specify a binary caching DB."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:85
+#: apt-ftparchive.1.xml:86
msgid "sources"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:87
+#: apt-ftparchive.1.xml:88
msgid ""
"The <literal>sources</literal> command generates a source index file from a "
"directory tree. It takes the given directory and recursively searches it "
@@ -1991,7 +1992,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:92
+#: apt-ftparchive.1.xml:93
msgid ""
"If an override file is specified then a source override file will be looked "
"for with an extension of .src. The --source-override option can be used to "
@@ -1999,12 +2000,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:97
+#: apt-ftparchive.1.xml:98
msgid "contents"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:99
+#: apt-ftparchive.1.xml:100
msgid ""
"The <literal>contents</literal> command generates a contents file from a "
"directory tree. It takes the given directory and recursively searches it for "
@@ -2015,12 +2016,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:109
+#: apt-ftparchive.1.xml:110
msgid "release"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:111
+#: apt-ftparchive.1.xml:112
msgid ""
"The <literal>release</literal> command generates a Release file from a "
"directory tree. It recursively searches the given directory for Packages, "
@@ -2030,7 +2031,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:118
+#: apt-ftparchive.1.xml:119
msgid ""
"Values for the additional metadata fields in the Release file are taken from "
"the corresponding variables under "
@@ -2044,12 +2045,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:128
+#: apt-ftparchive.1.xml:129
msgid "generate"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:130
+#: apt-ftparchive.1.xml:131
msgid ""
"The <literal>generate</literal> command is designed to be runnable from a "
"cron script and builds indexes according to the given config file. The "
@@ -2059,24 +2060,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:137 apt-get.8.xml:292
+#: apt-ftparchive.1.xml:138 apt-get.8.xml:292
msgid "clean"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:139
+#: apt-ftparchive.1.xml:140
msgid ""
"The <literal>clean</literal> command tidies the databases used by the given "
"configuration file by removing any records that are no longer necessary."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:145
+#: apt-ftparchive.1.xml:146
msgid "The Generate Configuration"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:147
+#: apt-ftparchive.1.xml:148
msgid ""
"The <literal>generate</literal> command uses a configuration file to "
"describe the archives that are going to be generated. It follows the typical "
@@ -2087,17 +2088,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:156
msgid "The generate configuration has 4 separate sections, each described below."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:157
+#: apt-ftparchive.1.xml:158
msgid "Dir Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:159
+#: apt-ftparchive.1.xml:160
msgid ""
"The <literal>Dir</literal> section defines the standard directories needed "
"to locate the files required during the generation process. These "
@@ -2106,12 +2107,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:164
+#: apt-ftparchive.1.xml:165
msgid "ArchiveDir"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:166
+#: apt-ftparchive.1.xml:167
msgid ""
"Specifies the root of the FTP archive, in a standard Debian configuration "
"this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -2119,44 +2120,44 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:171
+#: apt-ftparchive.1.xml:172
msgid "OverrideDir"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:173
+#: apt-ftparchive.1.xml:174
msgid "Specifies the location of the override files."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:176
+#: apt-ftparchive.1.xml:177
msgid "CacheDir"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:178
+#: apt-ftparchive.1.xml:179
msgid "Specifies the location of the cache files"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:181
+#: apt-ftparchive.1.xml:182
msgid "FileListDir"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:183
+#: apt-ftparchive.1.xml:184
msgid ""
"Specifies the location of the file list files, if the "
"<literal>FileList</literal> setting is used below."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:189
+#: apt-ftparchive.1.xml:190
msgid "Default Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:191
+#: apt-ftparchive.1.xml:192
msgid ""
"The <literal>Default</literal> section specifies default values, and "
"settings that control the operation of the generator. Other sections may "
@@ -2164,12 +2165,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:195
+#: apt-ftparchive.1.xml:196
msgid "Packages::Compress"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:197
+#: apt-ftparchive.1.xml:198
msgid ""
"Sets the default compression schemes to use for the Package index files. It "
"is a string that contains a space separated list of at least one of: '.' (no "
@@ -2178,60 +2179,60 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:203
+#: apt-ftparchive.1.xml:204
msgid "Packages::Extensions"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:205
+#: apt-ftparchive.1.xml:206
msgid ""
"Sets the default list of file extensions that are package files. This "
"defaults to '.deb'."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:209
+#: apt-ftparchive.1.xml:210
msgid "Sources::Compress"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:211
+#: apt-ftparchive.1.xml:212
msgid ""
"This is similar to <literal>Packages::Compress</literal> except that it "
"controls the compression for the Sources files."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:215
+#: apt-ftparchive.1.xml:216
msgid "Sources::Extensions"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:217
+#: apt-ftparchive.1.xml:218
msgid ""
"Sets the default list of file extensions that are source files. This "
"defaults to '.dsc'."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:221
+#: apt-ftparchive.1.xml:222
msgid "Contents::Compress"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:223
+#: apt-ftparchive.1.xml:224
msgid ""
"This is similar to <literal>Packages::Compress</literal> except that it "
"controls the compression for the Contents files."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:227
+#: apt-ftparchive.1.xml:228
msgid "DeLinkLimit"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:229
+#: apt-ftparchive.1.xml:230
msgid ""
"Specifies the number of kilobytes to delink (and replace with hard links) "
"per run. This is used in conjunction with the per-section "
@@ -2239,24 +2240,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:234
+#: apt-ftparchive.1.xml:235
msgid "FileMode"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:236
+#: apt-ftparchive.1.xml:237
msgid ""
"Specifies the mode of all created index files. It defaults to 0644. All "
"index files are set to this mode with no regard to the umask."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:243
+#: apt-ftparchive.1.xml:244
msgid "TreeDefault Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:245
+#: apt-ftparchive.1.xml:246
msgid ""
"Sets defaults specific to <literal>Tree</literal> sections. All of these "
"variables are substitution variables and have the strings $(DIST), "
@@ -2264,12 +2265,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:250
+#: apt-ftparchive.1.xml:251
msgid "MaxContentsChange"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:252
+#: apt-ftparchive.1.xml:253
msgid ""
"Sets the number of kilobytes of contents files that are generated each "
"day. The contents files are round-robined so that over several days they "
@@ -2277,12 +2278,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:257
+#: apt-ftparchive.1.xml:258
msgid "ContentsAge"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:259
+#: apt-ftparchive.1.xml:260
msgid ""
"Controls the number of days a contents file is allowed to be checked without "
"changing. If this limit is passed the mtime of the contents file is "
@@ -2293,60 +2294,60 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:268
+#: apt-ftparchive.1.xml:269
msgid "Directory"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:270
+#: apt-ftparchive.1.xml:271
msgid ""
"Sets the top of the .deb directory tree. Defaults to "
"<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:274
+#: apt-ftparchive.1.xml:275
msgid "SrcDirectory"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:276
+#: apt-ftparchive.1.xml:277
msgid ""
"Sets the top of the source package directory tree. Defaults to "
"<filename>$(DIST)/$(SECTION)/source/</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406
+#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407
msgid "Packages"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:282
+#: apt-ftparchive.1.xml:283
msgid ""
"Sets the output Packages file. Defaults to "
"<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411
+#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412
msgid "Sources"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:288
+#: apt-ftparchive.1.xml:289
msgid ""
"Sets the output Sources file. Defaults to "
"<filename>$(DIST)/$(SECTION)/source/Sources</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:292
+#: apt-ftparchive.1.xml:293
msgid "InternalPrefix"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:294
+#: apt-ftparchive.1.xml:295
msgid ""
"Sets the path prefix that causes a symlink to be considered an internal link "
"instead of an external link. Defaults to "
@@ -2354,12 +2355,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417
+#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418
msgid "Contents"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:301
+#: apt-ftparchive.1.xml:302
msgid ""
"Sets the output Contents file. Defaults to "
"<filename>$(DIST)/Contents-$(ARCH)</filename>. If this setting causes "
@@ -2369,34 +2370,34 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:308
+#: apt-ftparchive.1.xml:309
msgid "Contents::Header"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:310
+#: apt-ftparchive.1.xml:311
msgid "Sets header file to prepend to the contents output."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442
+#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443
msgid "BinCacheDB"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:315
+#: apt-ftparchive.1.xml:316
msgid ""
"Sets the binary cache database to use for this section. Multiple sections "
"can share the same database."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319
+#: apt-ftparchive.1.xml:320
msgid "FileList"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:322
msgid ""
"Specifies that instead of walking the directory tree, "
"<command>apt-ftparchive</command> should read the list of files from the "
@@ -2404,12 +2405,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:326
+#: apt-ftparchive.1.xml:327
msgid "SourceFileList"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:328
+#: apt-ftparchive.1.xml:329
msgid ""
"Specifies that instead of walking the directory tree, "
"<command>apt-ftparchive</command> should read the list of files from the "
@@ -2418,12 +2419,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:336
+#: apt-ftparchive.1.xml:337
msgid "Tree Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:338
+#: apt-ftparchive.1.xml:339
msgid ""
"The <literal>Tree</literal> section defines a standard Debian file tree "
"which consists of a base directory, then multiple sections in that base "
@@ -2433,7 +2434,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:343
+#: apt-ftparchive.1.xml:344
msgid ""
"The <literal>Tree</literal> section takes a scope tag which sets the "
"<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -2442,7 +2443,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:348
+#: apt-ftparchive.1.xml:349
msgid ""
"All of the settings defined in the <literal>TreeDefault</literal> section "
"can be use in a <literal>Tree</literal> section as well as three new "
@@ -2450,7 +2451,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:354
+#: apt-ftparchive.1.xml:355
#, no-wrap
msgid ""
"for i in Sections do \n"
@@ -2460,7 +2461,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
+#: apt-ftparchive.1.xml:352
msgid ""
"When processing a <literal>Tree</literal> section "
"<command>apt-ftparchive</command> performs an operation similar to: "
@@ -2468,12 +2469,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:360
+#: apt-ftparchive.1.xml:361
msgid "Sections"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:362
+#: apt-ftparchive.1.xml:363
msgid ""
"This is a space separated list of sections which appear under the "
"distribution, typically this is something like <literal>main contrib "
@@ -2481,12 +2482,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:367
+#: apt-ftparchive.1.xml:368
msgid "Architectures"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:369
+#: apt-ftparchive.1.xml:370
msgid ""
"This is a space separated list of all the architectures that appear under "
"search section. The special architecture 'source' is used to indicate that "
@@ -2494,56 +2495,56 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422
+#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423
msgid "BinOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:376
+#: apt-ftparchive.1.xml:377
msgid ""
"Sets the binary override file. The override file contains section, priority "
"and maintainer address information."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427
+#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428
msgid "SrcOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:382
+#: apt-ftparchive.1.xml:383
msgid ""
"Sets the source override file. The override file contains section "
"information."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432
+#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433
msgid "ExtraOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434
+#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435
msgid "Sets the binary extra override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437
+#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438
msgid "SrcExtraOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439
+#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440
msgid "Sets the source extra override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:398
+#: apt-ftparchive.1.xml:399
msgid "BinDirectory Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:400
+#: apt-ftparchive.1.xml:401
msgid ""
"The <literal>bindirectory</literal> section defines a binary directory tree "
"with no special structure. The scope tag specifies the location of the "
@@ -2553,64 +2554,64 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:408
+#: apt-ftparchive.1.xml:409
msgid "Sets the Packages file output."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:413
+#: apt-ftparchive.1.xml:414
msgid ""
"Sets the Sources file output. At least one of <literal>Packages</literal> or "
"<literal>Sources</literal> is required."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:419
+#: apt-ftparchive.1.xml:420
msgid "Sets the Contents file output. (optional)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:424
+#: apt-ftparchive.1.xml:425
msgid "Sets the binary override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:429
+#: apt-ftparchive.1.xml:430
msgid "Sets the source override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:444
+#: apt-ftparchive.1.xml:445
msgid "Sets the cache DB."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:447
+#: apt-ftparchive.1.xml:448
msgid "PathPrefix"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:449
+#: apt-ftparchive.1.xml:450
msgid "Appends a path to all the output paths."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:452
+#: apt-ftparchive.1.xml:453
msgid "FileList, SourceFileList"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:454
+#: apt-ftparchive.1.xml:455
msgid "Specifies the file list file."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:461
+#: apt-ftparchive.1.xml:462
msgid "The Binary Override File"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:463
msgid ""
"The binary override file is fully compatible with &dpkg-scanpackages;. It "
"contains 4 fields separated by spaces. The first field is the package name, "
@@ -2620,19 +2621,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:469
#, no-wrap
msgid "old [// oldn]* => new"
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:470
+#: apt-ftparchive.1.xml:471
#, no-wrap
msgid "new"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:467
+#: apt-ftparchive.1.xml:468
msgid ""
"The general form of the maintainer field is: <placeholder "
"type=\"literallayout\" id=\"0\"/> or simply, <placeholder "
@@ -2643,12 +2644,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:478
+#: apt-ftparchive.1.xml:479
msgid "The Source Override File"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:480
+#: apt-ftparchive.1.xml:481
msgid ""
"The source override file is fully compatible with &dpkg-scansources;. It "
"contains 2 fields separated by spaces. The first fields is the source "
@@ -2656,12 +2657,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:485
+#: apt-ftparchive.1.xml:486
msgid "The Extra Override File"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:488
msgid ""
"The extra override file allows any arbitrary tag to be added or replaced in "
"the output. It has 3 columns, the first is the package, the second is the "
@@ -2669,12 +2670,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:496
+#: apt-ftparchive.1.xml:497
msgid "<option>--md5</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:498
+#: apt-ftparchive.1.xml:499
msgid ""
"Generate MD5 sums. This defaults to on, when turned off the generated index "
"files will not have MD5Sum fields where possible. Configuration Item: "
@@ -2682,19 +2683,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:503
+#: apt-ftparchive.1.xml:504
msgid "<option>--db</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:505
+#: apt-ftparchive.1.xml:506
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:512
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -2703,12 +2704,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:517
+#: apt-ftparchive.1.xml:518
msgid "<option>--delink</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:519
+#: apt-ftparchive.1.xml:520
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
"then this option actually enables delinking of the files. It defaults to on "
@@ -2717,12 +2718,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:525
+#: apt-ftparchive.1.xml:526
msgid "<option>--contents</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:527
+#: apt-ftparchive.1.xml:528
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -2732,12 +2733,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:535
+#: apt-ftparchive.1.xml:536
msgid "<option>--source-override</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:538
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
"command. Configuration Item: "
@@ -2745,26 +2746,40 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:541
+#: apt-ftparchive.1.xml:542
msgid "<option>--readonly</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:543
+#: apt-ftparchive.1.xml:544
msgid ""
"Make the caching databases read only. Configuration Item: "
"<literal>APT::FTPArchive::ReadOnlyDB</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:547
-msgid "<option>APT::FTPArchive::AlwaysStat</option>"
+#: apt-ftparchive.1.xml:548
+msgid "<option>--arch</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:549
msgid ""
-"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If "
+"Accept in the <literal>packages</literal> and <literal>contents</literal> "
+"commands only package files matching <literal>*_arch.deb</literal> or "
+"<literal>*_all.deb</literal> instead of all package files in the given "
+"path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:555
+msgid "<option>APT::FTPArchive::AlwaysStat</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:557
+msgid ""
+"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
"packages are recompiled and/or republished with the same version again, this "
"will lead to problems as the now outdated cached metadata like size and "
"checksums will be used. With this option enabled this will no longer happen "
@@ -2776,12 +2791,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:559
+#: apt-ftparchive.1.xml:567
msgid "<option>APT::FTPArchive::LongDescription</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:569
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -2791,12 +2806,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 sources.list.5.xml:193
+#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477 sources.list.5.xml:193
msgid "Examples"
msgstr ""
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:579
+#: apt-ftparchive.1.xml:587
#, no-wrap
msgid ""
"<command>apt-ftparchive</command> packages "
@@ -2805,14 +2820,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:575
+#: apt-ftparchive.1.xml:583
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:589
+#: apt-ftparchive.1.xml:597
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -5875,7 +5890,7 @@ msgstr ""
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt_preferences.5.xml:13
-msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>"
+msgid "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
@@ -5923,6 +5938,17 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:56
msgid ""
+"Preferences are a strong power in the hands of a system administrator but "
+"they can become also their biggest nightmare if used without care! APT will "
+"not questioning the preferences so wrong settings will therefore lead to "
+"uninstallable packages or wrong decisions while upgrading packages. Even "
+"more problems will arise if multiply distribution releases are mixed without "
+"a good understanding of the following paragraphs. You have been warned."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_preferences.5.xml:64
+msgid ""
"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
"directory are parsed in alphanumeric ascending order and need to obey the "
"following naming convention: The files have no or "
@@ -5932,12 +5958,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:63
+#: apt_preferences.5.xml:71
msgid "APT's Default Priority Assignments"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:78
+#: apt_preferences.5.xml:86
#, no-wrap
msgid ""
"<command>apt-get install -t testing "
@@ -5945,13 +5971,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml:89
#, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:65
+#: apt_preferences.5.xml:73
msgid ""
"If there is no preferences file or if there is no entry in the file that "
"applies to a particular version then the priority assigned to that version "
@@ -5968,39 +5994,39 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:90
+#: apt_preferences.5.xml:98
msgid "priority 100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:91
+#: apt_preferences.5.xml:99
msgid "to the version that is already installed (if any)."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:95
+#: apt_preferences.5.xml:103
msgid "priority 500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:96
+#: apt_preferences.5.xml:104
msgid ""
"to the versions that are not installed and do not belong to the target "
"release."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:100
+#: apt_preferences.5.xml:108
msgid "priority 990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:101
+#: apt_preferences.5.xml:109
msgid "to the versions that are not installed and belong to the target release."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:85
+#: apt_preferences.5.xml:93
msgid ""
"If the target release has been specified then APT uses the following "
"algorithm to set the priorities of the versions of a package. Assign: "
@@ -6008,7 +6034,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:114
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -6016,14 +6042,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:110
+#: apt_preferences.5.xml:118
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:113
+#: apt_preferences.5.xml:121
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -6033,19 +6059,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:119
+#: apt_preferences.5.xml:127
msgid "Install the highest priority version."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:120
+#: apt_preferences.5.xml:128
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:131
msgid ""
"If two or more versions have the same priority and version number but either "
"the packages differ in some of their metadata or the "
@@ -6053,7 +6079,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:137
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
"is not as recent as one of the versions available from the sources listed in "
@@ -6064,7 +6090,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:136
+#: apt_preferences.5.xml:144
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
"recent than any of the other available versions. The package will not be "
@@ -6074,7 +6100,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml:149
msgid ""
"Sometimes the installed version of a package is more recent than the version "
"belonging to the target release, but not as recent as a version belonging to "
@@ -6086,12 +6112,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:150
+#: apt_preferences.5.xml:158
msgid "The Effect of APT Preferences"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:152
+#: apt_preferences.5.xml:160
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -6100,7 +6126,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:166
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
"specified packages and specified version or version range. For example, the "
@@ -6110,7 +6136,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:165
+#: apt_preferences.5.xml:173
#, no-wrap
msgid ""
"Package: perl\n"
@@ -6119,7 +6145,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:171
+#: apt_preferences.5.xml:179
msgid ""
"The general form assigns a priority to all of the package versions in a "
"given distribution (that is, to all the versions of packages that are listed "
@@ -6129,7 +6155,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:177
+#: apt_preferences.5.xml:185
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
"of packages. For example, the following record assigns a high priority to "
@@ -6137,7 +6163,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:182
+#: apt_preferences.5.xml:190
#, no-wrap
msgid ""
"Package: *\n"
@@ -6146,7 +6172,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:187
+#: apt_preferences.5.xml:195
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
"This should not be confused with the Origin of a distribution as specified "
@@ -6156,7 +6182,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:193
+#: apt_preferences.5.xml:201
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is "
@@ -6164,7 +6190,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:197
+#: apt_preferences.5.xml:205
#, no-wrap
msgid ""
"Package: *\n"
@@ -6173,7 +6199,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:210
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is "
@@ -6181,7 +6207,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:206
+#: apt_preferences.5.xml:214
#, no-wrap
msgid ""
"Package: *\n"
@@ -6190,7 +6216,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:211
+#: apt_preferences.5.xml:219
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -6198,7 +6224,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:216
+#: apt_preferences.5.xml:224
#, no-wrap
msgid ""
"Package: *\n"
@@ -6207,82 +6233,82 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:227
+#: apt_preferences.5.xml:235
msgid "How APT Interprets Priorities"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:243
msgid "P &gt; 1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:236
+#: apt_preferences.5.xml:244
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:248
msgid "990 &lt; P &lt;=1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:241
+#: apt_preferences.5.xml:249
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:246
+#: apt_preferences.5.xml:254
msgid "500 &lt; P &lt;=990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:247
+#: apt_preferences.5.xml:255
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:252
+#: apt_preferences.5.xml:260
msgid "100 &lt; P &lt;=500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:253
+#: apt_preferences.5.xml:261
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:258
+#: apt_preferences.5.xml:266
msgid "0 &lt; P &lt;=100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:259
+#: apt_preferences.5.xml:267
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:263
+#: apt_preferences.5.xml:271
msgid "P &lt; 0"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:272
msgid "prevents the version from being installed"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:230
+#: apt_preferences.5.xml:238
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -6290,7 +6316,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:269
+#: apt_preferences.5.xml:277
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -6299,14 +6325,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:283
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:279
+#: apt_preferences.5.xml:287
#, no-wrap
msgid ""
"Package: perl\n"
@@ -6323,12 +6349,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:292
+#: apt_preferences.5.xml:300
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:294
+#: apt_preferences.5.xml:302
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -6338,7 +6364,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:299
+#: apt_preferences.5.xml:307
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -6346,7 +6372,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:303
+#: apt_preferences.5.xml:311
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an "
@@ -6355,12 +6381,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:313
+#: apt_preferences.5.xml:321
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:323
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6368,27 +6394,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:327
+#: apt_preferences.5.xml:335
msgid "the <literal>Package:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:336
msgid "gives the package name"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:331 apt_preferences.5.xml:381
+#: apt_preferences.5.xml:339 apt_preferences.5.xml:389
msgid "the <literal>Version:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:332
+#: apt_preferences.5.xml:340
msgid "gives the version number for the named package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:319
+#: apt_preferences.5.xml:327
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/<replaceable>arch</replaceable></filename>: "
@@ -6400,12 +6426,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:356
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:349
+#: apt_preferences.5.xml:357
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6416,18 +6442,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:367
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:365
+#: apt_preferences.5.xml:373
msgid "the <literal>Codename:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:366
+#: apt_preferences.5.xml:374
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: squeeze\" specifies that all of the "
@@ -6438,13 +6464,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:383
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:382
+#: apt_preferences.5.xml:390
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -6455,7 +6481,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:391
+#: apt_preferences.5.xml:399
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -6464,12 +6490,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:400
+#: apt_preferences.5.xml:408
msgid "the <literal>Component:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:409
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -6481,18 +6507,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:418
#, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:424
msgid "the <literal>Origin:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:417
+#: apt_preferences.5.xml:425
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is "
@@ -6501,18 +6527,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:423
+#: apt_preferences.5.xml:431
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:429
+#: apt_preferences.5.xml:437
msgid "the <literal>Label:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:430
+#: apt_preferences.5.xml:438
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is "
@@ -6521,13 +6547,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:444
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:345
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6541,7 +6567,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:443
+#: apt_preferences.5.xml:451
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -6556,12 +6582,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:456
+#: apt_preferences.5.xml:464
msgid "Optional Lines in an APT Preferences Record"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:458
+#: apt_preferences.5.xml:466
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -6569,7 +6595,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:462
+#: apt_preferences.5.xml:470
msgid ""
"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
"optional. If omitted, APT assigns a priority of 1 less than the last value "
@@ -6578,12 +6604,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:471
+#: apt_preferences.5.xml:479
msgid "Tracking Stable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:487
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6598,7 +6624,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:473
+#: apt_preferences.5.xml:481
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6608,7 +6634,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 apt_preferences.5.xml:600
+#: apt_preferences.5.xml:504 apt_preferences.5.xml:550 apt_preferences.5.xml:608
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -6617,7 +6643,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:491
+#: apt_preferences.5.xml:499
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6626,13 +6652,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:508
+#: apt_preferences.5.xml:516
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:510
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -6641,12 +6667,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:514
+#: apt_preferences.5.xml:522
msgid "Tracking Testing or Unstable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:523
+#: apt_preferences.5.xml:531
#, no-wrap
msgid ""
"Package: *\n"
@@ -6663,7 +6689,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:524
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -6674,7 +6700,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:545
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6683,13 +6709,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:565
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:556
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -6701,12 +6727,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:564
+#: apt_preferences.5.xml:572
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:578
+#: apt_preferences.5.xml:586
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package "
@@ -6728,7 +6754,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:566
+#: apt_preferences.5.xml:574
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6743,7 +6769,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:595
+#: apt_preferences.5.xml:603
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -6752,13 +6778,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:615
+#: apt_preferences.5.xml:623
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:606
+#: apt_preferences.5.xml:614
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -6770,12 +6796,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:624
+#: apt_preferences.5.xml:632
msgid "&file-preferences;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:630
+#: apt_preferences.5.xml:638
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr ""
diff --git a/doc/po/de.po b/doc/po/de.po
index f9d374a6d..99d56bed3 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 0.7.24\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2010-01-20 12:18+0100\n"
+"POT-Creation-Date: 2010-02-18 20:53+0100\n"
"PO-Revision-Date: 2009-12-31 17:41+GMT\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -1217,7 +1217,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47
-#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125
+#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125
#: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40
#: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
#: sources.list.5.xml:33
@@ -1750,7 +1750,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
-#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
+#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89
#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
msgid "options"
msgstr "Optionen"
@@ -1778,7 +1778,7 @@ msgstr ""
"pkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376
+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376
#: apt-sortpkgs.1.xml:58
msgid "<option>-s</option>"
msgstr "<option>-s</option>"
@@ -1806,12 +1806,12 @@ msgstr ""
"srcpkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
msgid "<option>-q</option>"
msgstr "<option>-q</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
msgid "<option>--quiet</option>"
msgstr "<option>--quiet</option>"
@@ -1870,7 +1870,7 @@ msgstr ""
"Konfigurationselement: <literal>APT::Cache::ShowFull</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317 apt-cdrom.8.xml:131
+#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548
msgid "<option>-a</option>"
msgstr "<option>-a</option>"
@@ -1987,14 +1987,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:554
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1035 apt_preferences.5.xml:622
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:630
msgid "Files"
msgstr "Dateien"
@@ -2005,9 +2005,9 @@ msgstr "&file-sourceslist; &file-statelists;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569
#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637
#: sources.list.5.xml:233
msgid "See Also"
msgstr "Siehe auch"
@@ -2019,7 +2019,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:575
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr "Diagnose"
@@ -2099,9 +2099,16 @@ msgstr "add"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:66
+#, fuzzy
+#| msgid ""
+#| "<literal>add</literal> is used to add a new disc to the source list. It "
+#| "will unmount the CDROM device, prompt for a disk to be inserted and then "
+#| "procceed to scan it and copy the index files. If the disc does not have a "
+#| "proper <filename>disk</filename> directory you will be prompted for a "
+#| "descriptive title."
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
-"unmount the CDROM device, prompt for a disk to be inserted and then procceed "
+"unmount the CDROM device, prompt for a disk to be inserted and then proceed "
"to scan it and copy the index files. If the disc does not have a proper "
"<filename>disk</filename> directory you will be prompted for a descriptive "
"title."
@@ -2154,7 +2161,7 @@ msgid "Options"
msgstr "Optionen"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328
+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328
msgid "<option>-d</option>"
msgstr "<option>-d</option>"
@@ -2330,7 +2337,7 @@ msgstr ""
"Anwendungen zu benutzen ist."
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:53 apt-ftparchive.1.xml:71
+#: apt-config.8.xml:53 apt-ftparchive.1.xml:72
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given "
"one of the commands below must be present."
@@ -2397,7 +2404,7 @@ msgid "Just show the contents of the configuration space."
msgstr "Nur der Inhalt des Konfigurationsbereichs wird angezeigt."
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593
#: apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr "&apt-conf;"
@@ -2528,10 +2535,32 @@ msgstr "Hilfsprogramm zum Generieren von Indexdateien"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-ftparchive.1.xml:36
+#, fuzzy
+#| msgid ""
+#| "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
+#| "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
+#| "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
+#| "arg> <arg><option>-o <replaceable>config</"
+#| "replaceable>=<replaceable>string</replaceable></option></arg> "
+#| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#| "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
+#| "\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
+#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
+#| "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
+#| "replaceable></arg><arg><replaceable>override</"
+#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
+#| "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></"
+#| "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</"
+#| "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
+#| "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep="
+#| "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg "
+#| "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </"
+#| "group>"
msgid ""
"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
"<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
+"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></"
"arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</"
"replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></"
"option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep="
@@ -2568,7 +2597,7 @@ msgstr ""
"arg></group>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:56
+#: apt-ftparchive.1.xml:57
msgid ""
"<command>apt-ftparchive</command> is the command line tool that generates "
"the index files that APT uses to access a distribution source. The index "
@@ -2581,7 +2610,7 @@ msgstr ""
"Inhalts dieser Stelle generiert werden."
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:60
+#: apt-ftparchive.1.xml:61
msgid ""
"<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
"program, incorporating its entire functionality via the <literal>packages</"
@@ -2595,7 +2624,7 @@ msgstr ""
"für ein komplettes Archiv zu »skripten«."
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:66
+#: apt-ftparchive.1.xml:67
msgid ""
"Internally <command>apt-ftparchive</command> can make use of binary "
"databases to cache the contents of a .deb file and it does not rely on any "
@@ -2611,12 +2640,12 @@ msgstr ""
"Ausgabedateien erzeugt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:75
+#: apt-ftparchive.1.xml:76
msgid "packages"
msgstr "packages"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:77
+#: apt-ftparchive.1.xml:78
msgid ""
"The packages command generates a package file from a directory tree. It "
"takes the given directory and recursively searches it for .deb files, "
@@ -2629,7 +2658,7 @@ msgstr ""
"Befehl entspricht etwa &dpkg-scanpackages;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106
+#: apt-ftparchive.1.xml:83 apt-ftparchive.1.xml:107
msgid ""
"The option <option>--db</option> can be used to specify a binary caching DB."
msgstr ""
@@ -2637,12 +2666,12 @@ msgstr ""
"Zwischenspeichern von Programmen anzugeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:85
+#: apt-ftparchive.1.xml:86
msgid "sources"
msgstr "sources"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:87
+#: apt-ftparchive.1.xml:88
msgid ""
"The <literal>sources</literal> command generates a source index file from a "
"directory tree. It takes the given directory and recursively searches it "
@@ -2655,7 +2684,7 @@ msgstr ""
"stdout ausgibt. Dieser Befehl entspricht etwa &dpkg-scansources;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:92
+#: apt-ftparchive.1.xml:93
msgid ""
"If an override file is specified then a source override file will be looked "
"for with an extension of .src. The --source-override option can be used to "
@@ -2666,12 +2695,12 @@ msgstr ""
"benutzt werden, um die Quellen-Override-Datei, die benutzt wird, zu ändern."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:97
+#: apt-ftparchive.1.xml:98
msgid "contents"
msgstr "contents"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:99
+#: apt-ftparchive.1.xml:100
msgid ""
"The <literal>contents</literal> command generates a contents file from a "
"directory tree. It takes the given directory and recursively searches it "
@@ -2689,12 +2718,12 @@ msgstr ""
"getrennt in der Ausgabe."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:109
+#: apt-ftparchive.1.xml:110
msgid "release"
msgstr "release"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:111
+#: apt-ftparchive.1.xml:112
msgid ""
"The <literal>release</literal> command generates a Release file from a "
"directory tree. It recursively searches the given directory for Packages, "
@@ -2709,7 +2738,7 @@ msgstr ""
"stdout, die einen MD5- und SHA1-Hash für jede Datei enthält."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:118
+#: apt-ftparchive.1.xml:119
msgid ""
"Values for the additional metadata fields in the Release file are taken from "
"the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -2729,12 +2758,12 @@ msgstr ""
"<literal>Description</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:128
+#: apt-ftparchive.1.xml:129
msgid "generate"
msgstr "generate"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:130
+#: apt-ftparchive.1.xml:131
msgid ""
"The <literal>generate</literal> command is designed to be runnable from a "
"cron script and builds indexes according to the given config file. The "
@@ -2750,12 +2779,12 @@ msgstr ""
"Verwaltung der erforderlichen Einstellungen bereitstellt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:137 apt-get.8.xml:292
+#: apt-ftparchive.1.xml:138 apt-get.8.xml:292
msgid "clean"
msgstr "clean"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:139
+#: apt-ftparchive.1.xml:140
msgid ""
"The <literal>clean</literal> command tidies the databases used by the given "
"configuration file by removing any records that are no longer necessary."
@@ -2765,12 +2794,12 @@ msgstr ""
"Datensätze entfernt."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:145
+#: apt-ftparchive.1.xml:146
msgid "The Generate Configuration"
msgstr "Die Generate-Konfiguration"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:147
+#: apt-ftparchive.1.xml:148
msgid ""
"The <literal>generate</literal> command uses a configuration file to "
"describe the archives that are going to be generated. It follows the typical "
@@ -2788,7 +2817,7 @@ msgstr ""
"wenn die Markierung »scope« behandelt wird."
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:156
msgid ""
"The generate configuration has 4 separate sections, each described below."
msgstr ""
@@ -2796,12 +2825,12 @@ msgstr ""
"unterhalb beschrieben"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:157
+#: apt-ftparchive.1.xml:158
msgid "Dir Section"
msgstr "Dir-Abschnitt"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:159
+#: apt-ftparchive.1.xml:160
msgid ""
"The <literal>Dir</literal> section defines the standard directories needed "
"to locate the files required during the generation process. These "
@@ -2815,12 +2844,12 @@ msgstr ""
"absoluten Pfad zu bilden."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:164
+#: apt-ftparchive.1.xml:165
msgid "ArchiveDir"
msgstr "ArchiveDir"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:166
+#: apt-ftparchive.1.xml:167
msgid ""
"Specifies the root of the FTP archive, in a standard Debian configuration "
"this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -2831,32 +2860,32 @@ msgstr ""
"enthält."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:171
+#: apt-ftparchive.1.xml:172
msgid "OverrideDir"
msgstr "OverrideDir"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:173
+#: apt-ftparchive.1.xml:174
msgid "Specifies the location of the override files."
msgstr "Gibt den Ort der Override-Dateien an"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:176
+#: apt-ftparchive.1.xml:177
msgid "CacheDir"
msgstr "CacheDir"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:178
+#: apt-ftparchive.1.xml:179
msgid "Specifies the location of the cache files"
msgstr "Gibt den Ort der Zwischenspeicherdateien an"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:181
+#: apt-ftparchive.1.xml:182
msgid "FileListDir"
msgstr "FileListDir"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:183
+#: apt-ftparchive.1.xml:184
msgid ""
"Specifies the location of the file list files, if the <literal>FileList</"
"literal> setting is used below."
@@ -2865,12 +2894,12 @@ msgstr ""
"unterhalb gesetzt ist."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:189
+#: apt-ftparchive.1.xml:190
msgid "Default Section"
msgstr "Vorgabe-Abschnitt"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:191
+#: apt-ftparchive.1.xml:192
msgid ""
"The <literal>Default</literal> section specifies default values, and "
"settings that control the operation of the generator. Other sections may "
@@ -2881,12 +2910,12 @@ msgstr ""
"können diese Vorgaben mit einer Einstellung pro Abschnitt überschreiben."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:195
+#: apt-ftparchive.1.xml:196
msgid "Packages::Compress"
msgstr "Packages::Compress"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:197
+#: apt-ftparchive.1.xml:198
msgid ""
"Sets the default compression schemes to use for the Package index files. It "
"is a string that contains a space separated list of at least one of: '.' (no "
@@ -2899,12 +2928,12 @@ msgstr ""
"»gzip« und »bzip2«. Die Vorgabe für alle Kompressionsschemata ist ». gzip«."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:203
+#: apt-ftparchive.1.xml:204
msgid "Packages::Extensions"
msgstr "Packages::Extensions"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:205
+#: apt-ftparchive.1.xml:206
msgid ""
"Sets the default list of file extensions that are package files. This "
"defaults to '.deb'."
@@ -2913,12 +2942,12 @@ msgstr ""
"Vorgabe ist ».deb«."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:209
+#: apt-ftparchive.1.xml:210
msgid "Sources::Compress"
msgstr "Sources::Compress"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:211
+#: apt-ftparchive.1.xml:212
msgid ""
"This is similar to <literal>Packages::Compress</literal> except that it "
"controls the compression for the Sources files."
@@ -2927,12 +2956,12 @@ msgstr ""
"Kompression der Quelldateien steuert."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:215
+#: apt-ftparchive.1.xml:216
msgid "Sources::Extensions"
msgstr "Sources::Extensions"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:217
+#: apt-ftparchive.1.xml:218
msgid ""
"Sets the default list of file extensions that are source files. This "
"defaults to '.dsc'."
@@ -2941,12 +2970,12 @@ msgstr ""
"Vorgabe ist ».dsc«."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:221
+#: apt-ftparchive.1.xml:222
msgid "Contents::Compress"
msgstr "Contents::Compress"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:223
+#: apt-ftparchive.1.xml:224
msgid ""
"This is similar to <literal>Packages::Compress</literal> except that it "
"controls the compression for the Contents files."
@@ -2955,12 +2984,12 @@ msgstr ""
"Kompression der Inhaltsdateien steuert."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:227
+#: apt-ftparchive.1.xml:228
msgid "DeLinkLimit"
msgstr "DeLinkLimit"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:229
+#: apt-ftparchive.1.xml:230
msgid ""
"Specifies the number of kilobytes to delink (and replace with hard links) "
"per run. This is used in conjunction with the per-section <literal>External-"
@@ -2971,12 +3000,12 @@ msgstr ""
"<literal>External-Links</literal>-Einstellung pro Abschnitt benutzt."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:234
+#: apt-ftparchive.1.xml:235
msgid "FileMode"
msgstr "FileMode"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:236
+#: apt-ftparchive.1.xml:237
msgid ""
"Specifies the mode of all created index files. It defaults to 0644. All "
"index files are set to this mode with no regard to the umask."
@@ -2985,12 +3014,12 @@ msgstr ""
"Indexdateien werden ohne Beachtung von umask auf diese Rechte gesetzt."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:243
+#: apt-ftparchive.1.xml:244
msgid "TreeDefault Section"
msgstr "TreeDefault-Abschnitt"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:245
+#: apt-ftparchive.1.xml:246
msgid ""
"Sets defaults specific to <literal>Tree</literal> sections. All of these "
"variables are substitution variables and have the strings $(DIST), "
@@ -3001,12 +3030,12 @@ msgstr ""
"$(SECTION) und $(ARCH) durch ihre jeweiligen Werte ersetzt."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:250
+#: apt-ftparchive.1.xml:251
msgid "MaxContentsChange"
msgstr "MaxContentsChange"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:252
+#: apt-ftparchive.1.xml:253
msgid ""
"Sets the number of kilobytes of contents files that are generated each day. "
"The contents files are round-robined so that over several days they will all "
@@ -3017,12 +3046,12 @@ msgstr ""
"Tage alle neu gebildet werden."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:257
+#: apt-ftparchive.1.xml:258
msgid "ContentsAge"
msgstr "ContentsAge"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:259
+#: apt-ftparchive.1.xml:260
msgid ""
"Controls the number of days a contents file is allowed to be checked without "
"changing. If this limit is passed the mtime of the contents file is updated. "
@@ -3040,12 +3069,12 @@ msgstr ""
"eine neue Datei benötigen. Die Vorgabe ist 10, die Einheiten sind Tage."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:268
+#: apt-ftparchive.1.xml:269
msgid "Directory"
msgstr "Directory"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:270
+#: apt-ftparchive.1.xml:271
msgid ""
"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
"$(SECTION)/binary-$(ARCH)/</filename>"
@@ -3054,12 +3083,12 @@ msgstr ""
"$(SECTION)/binary-$(ARCH)/</filename>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:274
+#: apt-ftparchive.1.xml:275
msgid "SrcDirectory"
msgstr "SrcDirectory"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:276
+#: apt-ftparchive.1.xml:277
msgid ""
"Sets the top of the source package directory tree. Defaults to <filename>"
"$(DIST)/$(SECTION)/source/</filename>"
@@ -3068,12 +3097,12 @@ msgstr ""
"$(DIST)/$(SECTION)/source/</filename>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406
+#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407
msgid "Packages"
msgstr "Packages"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:282
+#: apt-ftparchive.1.xml:283
msgid ""
"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
"binary-$(ARCH)/Packages</filename>"
@@ -3082,12 +3111,12 @@ msgstr ""
"binary-$(ARCH)/Packages</filename>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411
+#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412
msgid "Sources"
msgstr "Sources"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:288
+#: apt-ftparchive.1.xml:289
#, fuzzy
#| msgid ""
#| "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
@@ -3100,12 +3129,12 @@ msgstr ""
"source/Sources</filename>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:292
+#: apt-ftparchive.1.xml:293
msgid "InternalPrefix"
msgstr "InternalPrefix"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:294
+#: apt-ftparchive.1.xml:295
msgid ""
"Sets the path prefix that causes a symlink to be considered an internal link "
"instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -3116,12 +3145,12 @@ msgstr ""
"<filename>$(DIST)/$(SECTION)/</filename>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417
+#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418
msgid "Contents"
msgstr "Contents"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:301
+#: apt-ftparchive.1.xml:302
msgid ""
"Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
"</filename>. If this setting causes multiple Packages files to map onto a "
@@ -3135,22 +3164,22 @@ msgstr ""
"automatisch integrieren."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:308
+#: apt-ftparchive.1.xml:309
msgid "Contents::Header"
msgstr "Contents::Header"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:310
+#: apt-ftparchive.1.xml:311
msgid "Sets header file to prepend to the contents output."
msgstr "Setzt die Kopfdatendatei, um sie der Inhaltsausgabe voranzustellen."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442
+#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443
msgid "BinCacheDB"
msgstr "BinCacheDB"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:315
+#: apt-ftparchive.1.xml:316
msgid ""
"Sets the binary cache database to use for this section. Multiple sections "
"can share the same database."
@@ -3159,12 +3188,12 @@ msgstr ""
"Abschnitt. Mehrere Abschnitte können sich die gleiche Datenbank teilen."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319
+#: apt-ftparchive.1.xml:320
msgid "FileList"
msgstr "FileList"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:322
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -3175,12 +3204,12 @@ msgstr ""
"Relativen Dateinamen wird das Archivverzeichnis vorangestellt."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:326
+#: apt-ftparchive.1.xml:327
msgid "SourceFileList"
msgstr "SourceFileList"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:328
+#: apt-ftparchive.1.xml:329
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -3193,12 +3222,12 @@ msgstr ""
"benutzt, wenn Quellindizes verarbeitet werden."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:336
+#: apt-ftparchive.1.xml:337
msgid "Tree Section"
msgstr "Tree-Abschnitt"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:338
+#: apt-ftparchive.1.xml:339
msgid ""
"The <literal>Tree</literal> section defines a standard Debian file tree "
"which consists of a base directory, then multiple sections in that base "
@@ -3213,7 +3242,7 @@ msgstr ""
"<literal>Directory</literal>-Ersetzungsvariable definiert."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:343
+#: apt-ftparchive.1.xml:344
msgid ""
"The <literal>Tree</literal> section takes a scope tag which sets the "
"<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -3227,7 +3256,7 @@ msgstr ""
"filename>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:348
+#: apt-ftparchive.1.xml:349
msgid ""
"All of the settings defined in the <literal>TreeDefault</literal> section "
"can be use in a <literal>Tree</literal> section as well as three new "
@@ -3238,7 +3267,7 @@ msgstr ""
"Variablen benutzt werden."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:354
+#: apt-ftparchive.1.xml:355
#, fuzzy, no-wrap
#| msgid ""
#| "for i in Sections do \n"
@@ -3255,7 +3284,7 @@ msgstr ""
" Generiere for DIST=Geltungsbereich SECTION=i ARCH=j\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
+#: apt-ftparchive.1.xml:352
#, fuzzy
#| msgid ""
#| "When processing a <literal>Tree</literal> section <command>apt-"
@@ -3269,12 +3298,12 @@ msgstr ""
"<command>apt-ftparchive</command> eine Operation aus, die folgender ähnelt:"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:360
+#: apt-ftparchive.1.xml:361
msgid "Sections"
msgstr "Abschnitte"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:362
+#: apt-ftparchive.1.xml:363
msgid ""
"This is a space separated list of sections which appear under the "
"distribution, typically this is something like <literal>main contrib non-"
@@ -3285,12 +3314,12 @@ msgstr ""
"non-free</literal>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:367
+#: apt-ftparchive.1.xml:368
msgid "Architectures"
msgstr "Architekturen"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:369
+#: apt-ftparchive.1.xml:370
msgid ""
"This is a space separated list of all the architectures that appear under "
"search section. The special architecture 'source' is used to indicate that "
@@ -3301,12 +3330,12 @@ msgstr ""
"benutzt, um anzugeben, dass dieser Baum ein Quellarchiv besitzt."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422
+#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423
msgid "BinOverride"
msgstr "BinOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:376
+#: apt-ftparchive.1.xml:377
msgid ""
"Sets the binary override file. The override file contains section, priority "
"and maintainer address information."
@@ -3315,12 +3344,12 @@ msgstr ""
"Priorität und Adressinformationen des Betreuers."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427
+#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428
msgid "SrcOverride"
msgstr "SrcOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:382
+#: apt-ftparchive.1.xml:383
msgid ""
"Sets the source override file. The override file contains section "
"information."
@@ -3329,32 +3358,32 @@ msgstr ""
"Abschnittsinformationen."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432
+#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433
msgid "ExtraOverride"
msgstr "ExtraOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434
+#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435
msgid "Sets the binary extra override file."
msgstr "Setzt die zusätzliche Programm-Override-Datei."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437
+#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438
msgid "SrcExtraOverride"
msgstr "SrcExtraOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439
+#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440
msgid "Sets the source extra override file."
msgstr "Setzt die zusätzliche Quell-Override-Datei."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:398
+#: apt-ftparchive.1.xml:399
msgid "BinDirectory Section"
msgstr "BinDirectory-Abschnitt"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:400
+#: apt-ftparchive.1.xml:401
msgid ""
"The <literal>bindirectory</literal> section defines a binary directory tree "
"with no special structure. The scope tag specifies the location of the "
@@ -3369,12 +3398,12 @@ msgstr ""
"<literal>Abschnitt</literal><literal>Architektur</literal> ähnlich."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:408
+#: apt-ftparchive.1.xml:409
msgid "Sets the Packages file output."
msgstr "Setzt die Packages-Dateiausgabe."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:413
+#: apt-ftparchive.1.xml:414
msgid ""
"Sets the Sources file output. At least one of <literal>Packages</literal> or "
"<literal>Sources</literal> is required."
@@ -3383,52 +3412,52 @@ msgstr ""
"<literal>Sources</literal> ist erforderlich."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:419
+#: apt-ftparchive.1.xml:420
msgid "Sets the Contents file output. (optional)"
msgstr "Setzt die Contents-Dateiausgabe. (optional)"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:424
+#: apt-ftparchive.1.xml:425
msgid "Sets the binary override file."
msgstr "Setzt die Programm-Override-Datei."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:429
+#: apt-ftparchive.1.xml:430
msgid "Sets the source override file."
msgstr "Setzt die Quell-Override-Datei."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:444
+#: apt-ftparchive.1.xml:445
msgid "Sets the cache DB."
msgstr "Setzt die Zwischenspeicherdatenbank."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:447
+#: apt-ftparchive.1.xml:448
msgid "PathPrefix"
msgstr "PathPrefix"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:449
+#: apt-ftparchive.1.xml:450
msgid "Appends a path to all the output paths."
msgstr "Hängt einen Pfad an alle Ausgabepfade an."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:452
+#: apt-ftparchive.1.xml:453
msgid "FileList, SourceFileList"
msgstr "FileList, SourceFileList"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:454
+#: apt-ftparchive.1.xml:455
msgid "Specifies the file list file."
msgstr "Gibt die Dateilistendatei an."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:461
+#: apt-ftparchive.1.xml:462
msgid "The Binary Override File"
msgstr "Die Programm-Override-Datei "
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:463
msgid ""
"The binary override file is fully compatible with &dpkg-scanpackages;. It "
"contains 4 fields separated by spaces. The first field is the package name, "
@@ -3443,19 +3472,19 @@ msgstr ""
"und das letzte Feld ist das Betreuerumsetzungsfeld."
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:469
#, no-wrap
msgid "old [// oldn]* => new"
msgstr "alt [// oldn]* => neu"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:470
+#: apt-ftparchive.1.xml:471
#, no-wrap
msgid "new"
msgstr "neu"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:467
+#: apt-ftparchive.1.xml:468
msgid ""
"The general form of the maintainer field is: <placeholder type="
"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -3472,12 +3501,12 @@ msgstr ""
"bedingungslos."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:478
+#: apt-ftparchive.1.xml:479
msgid "The Source Override File"
msgstr "Die Quell-Override-Datei"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:480
+#: apt-ftparchive.1.xml:481
msgid ""
"The source override file is fully compatible with &dpkg-scansources;. It "
"contains 2 fields separated by spaces. The first fields is the source "
@@ -3488,12 +3517,12 @@ msgstr ""
"Quellpaketname, das zweite ist der Abschnitt, dem er zugeordnet ist."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:485
+#: apt-ftparchive.1.xml:486
msgid "The Extra Override File"
msgstr "Die zusätzlich Override-Datei"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:488
msgid ""
"The extra override file allows any arbitrary tag to be added or replaced in "
"the output. It has 3 columns, the first is the package, the second is the "
@@ -3505,12 +3534,12 @@ msgstr ""
"ist der neue Wert."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:496
+#: apt-ftparchive.1.xml:497
msgid "<option>--md5</option>"
msgstr "<option>--md5</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:498
+#: apt-ftparchive.1.xml:499
msgid ""
"Generate MD5 sums. This defaults to on, when turned off the generated index "
"files will not have MD5Sum fields where possible. Configuration Item: "
@@ -3521,12 +3550,12 @@ msgstr ""
"ist. Konfigurationselement: <literal>APT::FTPArchive::MD5</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:503
+#: apt-ftparchive.1.xml:504
msgid "<option>--db</option>"
msgstr "<option>--db</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:505
+#: apt-ftparchive.1.xml:506
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3536,7 +3565,7 @@ msgstr ""
"DB</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:512
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3550,12 +3579,12 @@ msgstr ""
"Konfigurationselement: <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:517
+#: apt-ftparchive.1.xml:518
msgid "<option>--delink</option>"
msgstr "<option>--delink</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:519
+#: apt-ftparchive.1.xml:520
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
"then this option actually enables delinking of the files. It defaults to on "
@@ -3569,12 +3598,12 @@ msgstr ""
"DeLinkAct</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:525
+#: apt-ftparchive.1.xml:526
msgid "<option>--contents</option>"
msgstr "<option>--contents</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:527
+#: apt-ftparchive.1.xml:528
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -3590,12 +3619,12 @@ msgstr ""
"Konfigurationselement: <literal>APT::FTPArchive::Contents</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:535
+#: apt-ftparchive.1.xml:536
msgid "<option>--source-override</option>"
msgstr "<option>--source-override</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:538
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
"command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3606,12 +3635,12 @@ msgstr ""
"SourceOverride</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:541
+#: apt-ftparchive.1.xml:542
msgid "<option>--readonly</option>"
msgstr "<option>--readonly</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:543
+#: apt-ftparchive.1.xml:544
msgid ""
"Make the caching databases read only. Configuration Item: <literal>APT::"
"FTPArchive::ReadOnlyDB</literal>."
@@ -3620,16 +3649,43 @@ msgstr ""
"<literal>APT::FTPArchive::ReadOnlyDB</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:547
+#: apt-ftparchive.1.xml:548
+#, fuzzy
+#| msgid "<option>-a</option>"
+msgid "<option>--arch</option>"
+msgstr "<option>-a</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:549
+#, fuzzy
+#| msgid ""
+#| "If the command is either <literal>install</literal> or <literal>remove</"
+#| "literal>, then this option acts like running <literal>autoremove</"
+#| "literal> command, removing the unused dependency packages. Configuration "
+#| "Item: <literal>APT::Get::AutomaticRemove</literal>."
+msgid ""
+"Accept in the <literal>packages</literal> and <literal>contents</literal> "
+"commands only package files matching <literal>*_arch.deb</literal> or "
+"<literal>*_all.deb</literal> instead of all package files in the given "
+"path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>."
+msgstr ""
+"Wenn der Befehl entweder <literal>install</literal> oder <literal>remove</"
+"literal> lautet, dann bewirkt diese Option wie das Ausführen des "
+"<literal>autoremove</literal>-Befehls das Entfernen der nicht benutzten "
+"Abhhängigkeitspakete. Konfigurationselement: <literal>APT::Get::"
+"AutomaticRemove</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:555
#, fuzzy
#| msgid "<option>APT::FTPArchive::LongDescription</option>"
msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr "<option>APT::FTPArchive::LongDescription</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:549
+#: apt-ftparchive.1.xml:557
msgid ""
-"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If "
+"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
"packages are recompiled and/or republished with the same version again, this "
"will lead to problems as the now outdated cached metadata like size and "
"checksums will be used. With this option enabled this will no longer happen "
@@ -3641,12 +3697,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:559
+#: apt-ftparchive.1.xml:567
msgid "<option>APT::FTPArchive::LongDescription</option>"
msgstr "<option>APT::FTPArchive::LongDescription</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:569
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -3661,19 +3717,19 @@ msgstr ""
"Dateien mit <command>apt-ftparchive</command> zu erstellen."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469
+#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477
#: sources.list.5.xml:193
msgid "Examples"
msgstr "Beispiele"
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:579
+#: apt-ftparchive.1.xml:587
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr "<command>apt-ftparchive</command> Pakete <replaceable>Verzeichnis</replaceable> | <command>gzip</command> > <filename>Pakete.gz</filename>\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:575
+#: apt-ftparchive.1.xml:583
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3683,7 +3739,7 @@ msgstr ""
">"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:589
+#: apt-ftparchive.1.xml:597
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -7930,7 +7986,10 @@ msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt_preferences.5.xml:13
-msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>"
+#, fuzzy
+#| msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>"
+msgid ""
+"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
msgstr "&apt-author.team; &apt-email; &apt-product; <date>04. Mai 2009</date>"
#. type: Content of: <refentry><refnamediv><refname>
@@ -7997,6 +8056,17 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:56
msgid ""
+"Preferences are a strong power in the hands of a system administrator but "
+"they can become also their biggest nightmare if used without care! APT will "
+"not questioning the preferences so wrong settings will therefore lead to "
+"uninstallable packages or wrong decisions while upgrading packages. Even "
+"more problems will arise if multiply distribution releases are mixed without "
+"a good understanding of the following paragraphs. You have been warned."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_preferences.5.xml:64
+msgid ""
"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
"directory are parsed in alphanumeric ascending order and need to obey the "
"following naming convention: The files have no or \"<literal>pref</literal>"
@@ -8006,24 +8076,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:63
+#: apt_preferences.5.xml:71
msgid "APT's Default Priority Assignments"
msgstr "APTs Standardprioritätszuweisungen"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:78
+#: apt_preferences.5.xml:86
#, no-wrap
msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
msgstr "<command>apt-get install -t testing <replaceable>irgendein_Paket</replaceable></command>\n"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml:89
#, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr "APT::Default-Release \"stable\";\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:65
+#: apt_preferences.5.xml:73
msgid ""
"If there is no preferences file or if there is no entry in the file that "
"applies to a particular version then the priority assigned to that version "
@@ -8051,22 +8121,22 @@ msgstr ""
"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:90
+#: apt_preferences.5.xml:98
msgid "priority 100"
msgstr "Priorität 100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:91
+#: apt_preferences.5.xml:99
msgid "to the version that is already installed (if any)."
msgstr "zu der Version, die bereits installiert ist (wenn vorhanden)."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:95
+#: apt_preferences.5.xml:103
msgid "priority 500"
msgstr "Priorität 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:96
+#: apt_preferences.5.xml:104
msgid ""
"to the versions that are not installed and do not belong to the target "
"release."
@@ -8075,19 +8145,19 @@ msgstr ""
"gehören."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:100
+#: apt_preferences.5.xml:108
msgid "priority 990"
msgstr "Priorität 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:101
+#: apt_preferences.5.xml:109
msgid ""
"to the versions that are not installed and belong to the target release."
msgstr ""
"zu den Versionen, die nicht installiert sind und zum Ziel-Release gehören."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:85
+#: apt_preferences.5.xml:93
msgid ""
"If the target release has been specified then APT uses the following "
"algorithm to set the priorities of the versions of a package. Assign: "
@@ -8098,7 +8168,7 @@ msgstr ""
"Zuweisung: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:114
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -8109,7 +8179,7 @@ msgstr ""
"installierten Paketversionen eine Priorität von 500 zu."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:110
+#: apt_preferences.5.xml:118
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
@@ -8119,7 +8189,7 @@ msgstr ""
"ist."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:113
+#: apt_preferences.5.xml:121
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -8135,12 +8205,12 @@ msgstr ""
"Downgrading eines Paketes riskant sein kann.)"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:119
+#: apt_preferences.5.xml:127
msgid "Install the highest priority version."
msgstr "Die Version mit der höchsten Priorität installieren."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:120
+#: apt_preferences.5.xml:128
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
@@ -8149,7 +8219,7 @@ msgstr ""
"aktuellste installiert (das ist die mit der höheren Versionsnummer)."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:131
msgid ""
"If two or more versions have the same priority and version number but either "
"the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -8161,7 +8231,7 @@ msgstr ""
"installierte installiert."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:137
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
"is not as recent as one of the versions available from the sources listed in "
@@ -8177,7 +8247,7 @@ msgstr ""
"upgrade</command> ausgeführt wird."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:136
+#: apt_preferences.5.xml:144
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
"recent than any of the other available versions. The package will not be "
@@ -8191,7 +8261,7 @@ msgstr ""
"upgrade</command> ausgeführt wird."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml:149
msgid ""
"Sometimes the installed version of a package is more recent than the version "
"belonging to the target release, but not as recent as a version belonging to "
@@ -8211,12 +8281,12 @@ msgstr ""
"hat."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:150
+#: apt_preferences.5.xml:158
msgid "The Effect of APT Preferences"
msgstr "Die Auswirkungen von APT-Einstellungen"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:152
+#: apt_preferences.5.xml:160
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -8230,7 +8300,7 @@ msgstr ""
"allgemeine Gestalt."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:166
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
"specified packages and specified version or version range. For example, the "
@@ -8246,7 +8316,7 @@ msgstr ""
"können durch Leerzeichen getrennt werden."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:165
+#: apt_preferences.5.xml:173
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8258,7 +8328,7 @@ msgstr ""
"Pin-Priority: 1001\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:171
+#: apt_preferences.5.xml:179
msgid ""
"The general form assigns a priority to all of the package versions in a "
"given distribution (that is, to all the versions of packages that are listed "
@@ -8273,7 +8343,7 @@ msgstr ""
"ausgebildeten Domänennamen identifiziert wird, eine Priorität zu."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:177
+#: apt_preferences.5.xml:185
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
"of packages. For example, the following record assigns a high priority to "
@@ -8284,7 +8354,7 @@ msgstr ""
"Paketversionen eine hohe Priorität zu, die lokal liegen."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:182
+#: apt_preferences.5.xml:190
#, no-wrap
msgid ""
"Package: *\n"
@@ -8296,7 +8366,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:187
+#: apt_preferences.5.xml:195
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
"This should not be confused with the Origin of a distribution as specified "
@@ -8312,7 +8382,7 @@ msgstr ""
"wie »Debian« oder »Ximian«."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:193
+#: apt_preferences.5.xml:201
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -8323,7 +8393,7 @@ msgstr ""
"Priorität zu."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:197
+#: apt_preferences.5.xml:205
#, no-wrap
msgid ""
"Package: *\n"
@@ -8335,7 +8405,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:210
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
@@ -8346,7 +8416,7 @@ msgstr ""
"zu."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:206
+#: apt_preferences.5.xml:214
#, no-wrap
msgid ""
"Package: *\n"
@@ -8358,7 +8428,7 @@ msgstr ""
"Pin-Priority: 900\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:211
+#: apt_preferences.5.xml:219
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -8369,7 +8439,7 @@ msgstr ""
"Nummer »<literal>3.0</literal>« ist, eine hohe Priorität zu."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:216
+#: apt_preferences.5.xml:224
#, no-wrap
msgid ""
"Package: *\n"
@@ -8381,17 +8451,17 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:227
+#: apt_preferences.5.xml:235
msgid "How APT Interprets Priorities"
msgstr "Wie APT Prioritäten interpretiert"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:243
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:236
+#: apt_preferences.5.xml:244
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -8400,12 +8470,12 @@ msgstr ""
"des Pakets durchführt"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:248
msgid "990 &lt; P &lt;=1000"
msgstr "990 &lt; P &lt;=1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:241
+#: apt_preferences.5.xml:249
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -8414,12 +8484,12 @@ msgstr ""
"Ziel-Release kommt, außer wenn die installierte Version aktueller ist"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:246
+#: apt_preferences.5.xml:254
msgid "500 &lt; P &lt;=990"
msgstr "500 &lt; P &lt;=990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:247
+#: apt_preferences.5.xml:255
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
@@ -8429,12 +8499,12 @@ msgstr ""
"neuer ist"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:252
+#: apt_preferences.5.xml:260
msgid "100 &lt; P &lt;=500"
msgstr "100 &lt; P &lt;=500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:253
+#: apt_preferences.5.xml:261
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
@@ -8444,12 +8514,12 @@ msgstr ""
"installierte Version neuer ist"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:258
+#: apt_preferences.5.xml:266
msgid "0 &lt; P &lt;=100"
msgstr "0 &lt; P &lt;=100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:259
+#: apt_preferences.5.xml:267
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
@@ -8458,17 +8528,17 @@ msgstr ""
"installierte Version des Pakets gibt"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:263
+#: apt_preferences.5.xml:271
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:272
msgid "prevents the version from being installed"
msgstr "verhindert das Installieren der Version"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:230
+#: apt_preferences.5.xml:238
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -8479,7 +8549,7 @@ msgstr ""
"(grob gesagt): <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:269
+#: apt_preferences.5.xml:277
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -8493,7 +8563,7 @@ msgstr ""
"erste dieser Datensätze die Priorität der Paketversion fest."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:283
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -8502,7 +8572,7 @@ msgstr ""
"bereits gezeigten Datensätze:"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:279
+#: apt_preferences.5.xml:287
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8530,12 +8600,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:292
+#: apt_preferences.5.xml:300
msgid "Then:"
msgstr "Dann:"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:294
+#: apt_preferences.5.xml:302
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -8550,7 +8620,7 @@ msgstr ""
"dann wird von <literal>perl</literal> ein Downgrade durchgeführt."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:299
+#: apt_preferences.5.xml:307
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -8561,7 +8631,7 @@ msgstr ""
"sogar wenn diese Versionen zum Ziel-Release gehören."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:303
+#: apt_preferences.5.xml:311
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -8575,12 +8645,12 @@ msgstr ""
"Pakets installiert ist."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:313
+#: apt_preferences.5.xml:321
msgid "Determination of Package Version and Distribution Properties"
msgstr "Festlegung von Paketversion und Distributions-Eigenschaften"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:323
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8591,27 +8661,27 @@ msgstr ""
"bereitstellen, um die an diesem Ort verfügbaren Pakete zu beschreiben."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:327
+#: apt_preferences.5.xml:335
msgid "the <literal>Package:</literal> line"
msgstr "die <literal>Package:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:336
msgid "gives the package name"
msgstr "gibt den Paketnamen an"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:331 apt_preferences.5.xml:381
+#: apt_preferences.5.xml:339 apt_preferences.5.xml:389
msgid "the <literal>Version:</literal> line"
msgstr "die <literal>Version:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:332
+#: apt_preferences.5.xml:340
msgid "gives the version number for the named package"
msgstr "gibt die Versionsnummer für das genannte Paket an"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:319
+#: apt_preferences.5.xml:327
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8632,12 +8702,12 @@ msgstr ""
"Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:356
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "die <literal>Archive:</literal>- oder <literal>Suite:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:349
+#: apt_preferences.5.xml:357
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8654,18 +8724,18 @@ msgstr ""
"folgende Zeile benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:367
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:365
+#: apt_preferences.5.xml:373
msgid "the <literal>Codename:</literal> line"
msgstr "die <literal>Codename:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:366
+#: apt_preferences.5.xml:374
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: squeeze\" specifies that all of the "
@@ -8681,13 +8751,13 @@ msgstr ""
"die folgende Zeile benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:383
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr "Pin: release n=squeeze\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:382
+#: apt_preferences.5.xml:390
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -8703,7 +8773,7 @@ msgstr ""
"eine der folgenden Zeilen benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:391
+#: apt_preferences.5.xml:399
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -8715,12 +8785,12 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:400
+#: apt_preferences.5.xml:408
msgid "the <literal>Component:</literal> line"
msgstr "die <literal>Component:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:409
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -8738,18 +8808,18 @@ msgstr ""
"Zeilen benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:418
#, no-wrap
msgid "Pin: release c=main\n"
msgstr "Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:424
msgid "the <literal>Origin:</literal> line"
msgstr "die <literal>Origin:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:417
+#: apt_preferences.5.xml:425
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8761,18 +8831,18 @@ msgstr ""
"in der APT-Einstellungsdatei anzugeben würde die folgende Zeile benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:423
+#: apt_preferences.5.xml:431
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr "Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:429
+#: apt_preferences.5.xml:437
msgid "the <literal>Label:</literal> line"
msgstr "die <literal>Label:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:430
+#: apt_preferences.5.xml:438
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8785,13 +8855,13 @@ msgstr ""
"die folgende Zeile benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:444
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:345
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -8813,7 +8883,7 @@ msgstr ""
"relevant: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:443
+#: apt_preferences.5.xml:451
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -8839,12 +8909,12 @@ msgstr ""
"Distribution heruntergeladen wurde."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:456
+#: apt_preferences.5.xml:464
msgid "Optional Lines in an APT Preferences Record"
msgstr "Optionale Zeilen in einem APT-Einstellungsdatensatz"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:458
+#: apt_preferences.5.xml:466
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -8855,7 +8925,7 @@ msgstr ""
"anfangen. Dieses stellt einen Platz für Kommentare bereit."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:462
+#: apt_preferences.5.xml:470
msgid ""
"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
"optional. If omitted, APT assigns a priority of 1 less than the last value "
@@ -8869,12 +8939,12 @@ msgstr ""
"anfängt."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:471
+#: apt_preferences.5.xml:479
msgid "Tracking Stable"
msgstr "Stable verfolgen"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:487
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8898,7 +8968,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:473
+#: apt_preferences.5.xml:481
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -8913,8 +8983,8 @@ msgstr ""
"Distribution gehören. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:496 apt_preferences.5.xml:542
-#: apt_preferences.5.xml:600
+#: apt_preferences.5.xml:504 apt_preferences.5.xml:550
+#: apt_preferences.5.xml:608
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -8926,7 +8996,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:491
+#: apt_preferences.5.xml:499
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -8939,13 +9009,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:508
+#: apt_preferences.5.xml:516
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>Paket</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:510
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -8959,12 +9029,12 @@ msgstr ""
"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:514
+#: apt_preferences.5.xml:522
msgid "Tracking Testing or Unstable"
msgstr "Testing oder Unstable verfolgen"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:523
+#: apt_preferences.5.xml:531
#, no-wrap
msgid ""
"Package: *\n"
@@ -8992,7 +9062,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:524
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -9009,7 +9079,7 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:545
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -9022,13 +9092,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:565
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>Paket</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:556
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -9048,12 +9118,12 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:564
+#: apt_preferences.5.xml:572
msgid "Tracking the evolution of a codename release"
msgstr "Die Entwicklung eines Codename-Releases verfolgen"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:578
+#: apt_preferences.5.xml:586
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -9087,7 +9157,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:566
+#: apt_preferences.5.xml:574
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -9113,7 +9183,7 @@ msgstr ""
"benutzen. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:595
+#: apt_preferences.5.xml:603
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -9126,13 +9196,13 @@ msgstr ""
"durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:615
+#: apt_preferences.5.xml:623
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>Paket</replaceable>/sid\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:606
+#: apt_preferences.5.xml:614
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -9152,12 +9222,12 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:624
+#: apt_preferences.5.xml:632
msgid "&file-preferences;"
msgstr "&file-preferences;"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:630
+#: apt_preferences.5.xml:638
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
diff --git a/doc/po/es.po b/doc/po/es.po
index 533978695..c162dca97 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
-"POT-Creation-Date: 2010-01-20 12:18+0100\n"
+"POT-Creation-Date: 2010-02-18 20:53+0100\n"
"PO-Revision-Date: 2004-09-20 17:05+0000\n"
"Last-Translator: Rubén Porras Campo <nahoo@inicia.es>\n"
"Language-Team: <debian-l10n-spanish@lists.debian.org>\n"
@@ -865,7 +865,7 @@ msgstr ""
#. type: Plain text
#: apt.ent:380
-#, no-wrap, fuzzy
+#, fuzzy, no-wrap
msgid ""
"<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed\n"
" to the translation in the past, who is responsible now and maybe further information\n"
@@ -989,7 +989,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47
-#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125
+#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125
#: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40
#: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
#: sources.list.5.xml:33
@@ -1580,7 +1580,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
-#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
+#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89
#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
#, fuzzy
msgid "options"
@@ -1611,7 +1611,7 @@ msgstr ""
"configuración: <literal>Dir::Cache::pkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376
+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376
#: apt-sortpkgs.1.xml:58
#, fuzzy
msgid "<option>-s</option>"
@@ -1641,13 +1641,13 @@ msgstr ""
"configuración: <literal>Dir::Cache::srcpkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
#, fuzzy
msgid "<option>-q</option>"
msgstr "<option>-q</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
#, fuzzy
msgid "<option>--quiet</option>"
msgstr "<option>--quiet</option>"
@@ -1714,7 +1714,7 @@ msgstr ""
"configuración: <literal>APT::Cache::ShowFull</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317 apt-cdrom.8.xml:131
+#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548
#, fuzzy
msgid "<option>-a</option>"
msgstr "<option>-a</option>"
@@ -1846,7 +1846,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:554
#: apt-sortpkgs.1.xml:64
#, fuzzy
msgid "&apt-commonoptions;"
@@ -1857,7 +1857,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1035 apt_preferences.5.xml:622
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:630
#, fuzzy
msgid "Files"
msgstr "Ficheros"
@@ -1869,9 +1869,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569
#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637
#: sources.list.5.xml:233
#, fuzzy
msgid "See Also"
@@ -1918,7 +1918,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:575
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
#, fuzzy
msgid "Diagnostics"
@@ -2011,7 +2011,7 @@ msgstr "add"
#, fuzzy
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
-"unmount the CDROM device, prompt for a disk to be inserted and then procceed "
+"unmount the CDROM device, prompt for a disk to be inserted and then proceed "
"to scan it and copy the index files. If the disc does not have a proper "
"<filename>disk</filename> directory you will be prompted for a descriptive "
"title."
@@ -2068,7 +2068,7 @@ msgid "Options"
msgstr "Opciones"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328
+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328
#, fuzzy
msgid "<option>-d</option>"
msgstr "<option>-d</option>"
@@ -2269,7 +2269,7 @@ msgstr ""
"scripts."
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:53 apt-ftparchive.1.xml:71
+#: apt-config.8.xml:53 apt-ftparchive.1.xml:72
#, fuzzy
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given "
@@ -2344,7 +2344,7 @@ msgid "Just show the contents of the configuration space."
msgstr "Sólo muestra el contenido del espacio de configuración."
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593
#: apt-sortpkgs.1.xml:70
#, fuzzy
msgid "&apt-conf;"
@@ -2470,10 +2470,12 @@ msgstr ""
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-ftparchive.1.xml:36
+#, fuzzy
msgid ""
"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
"<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
+"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></"
"arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</"
"replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></"
"option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep="
@@ -2489,9 +2491,36 @@ msgid ""
"\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice="
"\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>"
msgstr ""
+"<arg rep=\"norepeat\" choice=\"opt\">add <arg rep=\"repeat\" choice=\"plain"
+"\"><replaceable>fichero</replaceable></arg></arg>\n"
+"<arg rep=\"norepeat\" choice=\"opt\">gencaches</arg>\n"
+"<arg rep=\"norepeat\" choice=\"opt\">showpkg <arg rep=\"repeat\" choice="
+"\"plain\"><replaceable>paquete</replaceable></arg></arg>\n"
+"<arg rep=\"norepeat\" choice=\"opt\">showsrc <arg rep=\"repeat\" choice="
+"\"plain\"><replaceable>paquete</replaceable></arg></arg>\n"
+"<arg rep=\"norepeat\" choice=\"opt\">stats</arg>\n"
+"<arg rep=\"norepeat\" choice=\"opt\">dump</arg>\n"
+"<arg rep=\"norepeat\" choice=\"opt\">dumpavail</arg>\n"
+"<arg rep=\"norepeat\" choice=\"opt\">unmet</arg>\n"
+"<arg rep=\"norepeat\" choice=\"opt\">search <arg rep=\"norepeat\" choice="
+"\"plain\"><replaceable>expresión regular</replaceable></arg></arg>\n"
+"<arg rep=\"norepeat\" choice=\"opt\">show <arg rep=\"repeat\" choice=\"plain"
+"\"><replaceable>paquete</replaceable></arg></arg>\n"
+"<arg rep=\"norepeat\" choice=\"opt\">depends <arg rep=\"repeat\" choice="
+"\"plain\"><replaceable>paquete</replaceable></arg></arg>\n"
+"<arg rep=\"norepeat\" choice=\"opt\">rdepends <arg rep=\"repeat\" choice="
+"\"plain\"><replaceable>pkg</replaceable></arg></arg>\n"
+"<arg rep=\"norepeat\" choice=\"opt\">pkgnames <arg rep=\"norepeat\" choice="
+"\"plain\"><replaceable>prefijo</replaceable></arg></arg>\n"
+"<arg rep=\"norepeat\" choice=\"opt\">dotty <arg rep=\"repeat\" choice=\"plain"
+"\"><replaceable>paquete</replaceable></arg></arg>\n"
+"<arg rep=\"norepeat\" choice=\"opt\">policy <arg rep=\"repeat\" choice="
+"\"plain\"><replaceable>paquetes</replaceable></arg></arg>\n"
+"<arg rep=\"norepeat\" choice=\"opt\">madison <arg rep=\"repeat\" choice="
+"\"plain\"><replaceable>paquetes</replaceable></arg></arg>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:56
+#: apt-ftparchive.1.xml:57
msgid ""
"<command>apt-ftparchive</command> is the command line tool that generates "
"the index files that APT uses to access a distribution source. The index "
@@ -2500,7 +2529,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:60
+#: apt-ftparchive.1.xml:61
msgid ""
"<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
"program, incorporating its entire functionality via the <literal>packages</"
@@ -2510,7 +2539,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:66
+#: apt-ftparchive.1.xml:67
msgid ""
"Internally <command>apt-ftparchive</command> can make use of binary "
"databases to cache the contents of a .deb file and it does not rely on any "
@@ -2520,12 +2549,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:75
+#: apt-ftparchive.1.xml:76
msgid "packages"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:77
+#: apt-ftparchive.1.xml:78
msgid ""
"The packages command generates a package file from a directory tree. It "
"takes the given directory and recursively searches it for .deb files, "
@@ -2534,19 +2563,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106
+#: apt-ftparchive.1.xml:83 apt-ftparchive.1.xml:107
msgid ""
"The option <option>--db</option> can be used to specify a binary caching DB."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:85
+#: apt-ftparchive.1.xml:86
#, fuzzy
msgid "sources"
msgstr "source"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:87
+#: apt-ftparchive.1.xml:88
msgid ""
"The <literal>sources</literal> command generates a source index file from a "
"directory tree. It takes the given directory and recursively searches it "
@@ -2555,7 +2584,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:92
+#: apt-ftparchive.1.xml:93
msgid ""
"If an override file is specified then a source override file will be looked "
"for with an extension of .src. The --source-override option can be used to "
@@ -2563,12 +2592,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:97
+#: apt-ftparchive.1.xml:98
msgid "contents"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:99
+#: apt-ftparchive.1.xml:100
msgid ""
"The <literal>contents</literal> command generates a contents file from a "
"directory tree. It takes the given directory and recursively searches it "
@@ -2579,12 +2608,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:109
+#: apt-ftparchive.1.xml:110
msgid "release"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:111
+#: apt-ftparchive.1.xml:112
msgid ""
"The <literal>release</literal> command generates a Release file from a "
"directory tree. It recursively searches the given directory for Packages, "
@@ -2594,7 +2623,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:118
+#: apt-ftparchive.1.xml:119
msgid ""
"Values for the additional metadata fields in the Release file are taken from "
"the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -2606,12 +2635,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:128
+#: apt-ftparchive.1.xml:129
msgid "generate"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:130
+#: apt-ftparchive.1.xml:131
msgid ""
"The <literal>generate</literal> command is designed to be runnable from a "
"cron script and builds indexes according to the given config file. The "
@@ -2621,25 +2650,25 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:137 apt-get.8.xml:292
+#: apt-ftparchive.1.xml:138 apt-get.8.xml:292
#, fuzzy
msgid "clean"
msgstr "clean"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:139
+#: apt-ftparchive.1.xml:140
msgid ""
"The <literal>clean</literal> command tidies the databases used by the given "
"configuration file by removing any records that are no longer necessary."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:145
+#: apt-ftparchive.1.xml:146
msgid "The Generate Configuration"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:147
+#: apt-ftparchive.1.xml:148
msgid ""
"The <literal>generate</literal> command uses a configuration file to "
"describe the archives that are going to be generated. It follows the typical "
@@ -2650,19 +2679,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:156
msgid ""
"The generate configuration has 4 separate sections, each described below."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:157
+#: apt-ftparchive.1.xml:158
#, fuzzy
msgid "Dir Section"
msgstr "Descripción"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:159
+#: apt-ftparchive.1.xml:160
msgid ""
"The <literal>Dir</literal> section defines the standard directories needed "
"to locate the files required during the generation process. These "
@@ -2671,13 +2700,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:164
+#: apt-ftparchive.1.xml:165
#, fuzzy
msgid "ArchiveDir"
msgstr "Arquitectura"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:166
+#: apt-ftparchive.1.xml:167
msgid ""
"Specifies the root of the FTP archive, in a standard Debian configuration "
"this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -2685,46 +2714,46 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:171
+#: apt-ftparchive.1.xml:172
msgid "OverrideDir"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:173
+#: apt-ftparchive.1.xml:174
msgid "Specifies the location of the override files."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:176
+#: apt-ftparchive.1.xml:177
#, fuzzy
msgid "CacheDir"
msgstr "check"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:178
+#: apt-ftparchive.1.xml:179
msgid "Specifies the location of the cache files"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:181
+#: apt-ftparchive.1.xml:182
#, fuzzy
msgid "FileListDir"
msgstr "Ficheros"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:183
+#: apt-ftparchive.1.xml:184
msgid ""
"Specifies the location of the file list files, if the <literal>FileList</"
"literal> setting is used below."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:189
+#: apt-ftparchive.1.xml:190
msgid "Default Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:191
+#: apt-ftparchive.1.xml:192
msgid ""
"The <literal>Default</literal> section specifies default values, and "
"settings that control the operation of the generator. Other sections may "
@@ -2732,12 +2761,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:195
+#: apt-ftparchive.1.xml:196
msgid "Packages::Compress"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:197
+#: apt-ftparchive.1.xml:198
msgid ""
"Sets the default compression schemes to use for the Package index files. It "
"is a string that contains a space separated list of at least one of: '.' (no "
@@ -2746,60 +2775,60 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:203
+#: apt-ftparchive.1.xml:204
msgid "Packages::Extensions"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:205
+#: apt-ftparchive.1.xml:206
msgid ""
"Sets the default list of file extensions that are package files. This "
"defaults to '.deb'."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:209
+#: apt-ftparchive.1.xml:210
msgid "Sources::Compress"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:211
+#: apt-ftparchive.1.xml:212
msgid ""
"This is similar to <literal>Packages::Compress</literal> except that it "
"controls the compression for the Sources files."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:215
+#: apt-ftparchive.1.xml:216
msgid "Sources::Extensions"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:217
+#: apt-ftparchive.1.xml:218
msgid ""
"Sets the default list of file extensions that are source files. This "
"defaults to '.dsc'."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:221
+#: apt-ftparchive.1.xml:222
msgid "Contents::Compress"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:223
+#: apt-ftparchive.1.xml:224
msgid ""
"This is similar to <literal>Packages::Compress</literal> except that it "
"controls the compression for the Contents files."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:227
+#: apt-ftparchive.1.xml:228
msgid "DeLinkLimit"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:229
+#: apt-ftparchive.1.xml:230
msgid ""
"Specifies the number of kilobytes to delink (and replace with hard links) "
"per run. This is used in conjunction with the per-section <literal>External-"
@@ -2807,25 +2836,25 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:234
+#: apt-ftparchive.1.xml:235
#, fuzzy
msgid "FileMode"
msgstr "Ficheros"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:236
+#: apt-ftparchive.1.xml:237
msgid ""
"Specifies the mode of all created index files. It defaults to 0644. All "
"index files are set to this mode with no regard to the umask."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:243
+#: apt-ftparchive.1.xml:244
msgid "TreeDefault Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:245
+#: apt-ftparchive.1.xml:246
msgid ""
"Sets defaults specific to <literal>Tree</literal> sections. All of these "
"variables are substitution variables and have the strings $(DIST), "
@@ -2833,12 +2862,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:250
+#: apt-ftparchive.1.xml:251
msgid "MaxContentsChange"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:252
+#: apt-ftparchive.1.xml:253
msgid ""
"Sets the number of kilobytes of contents files that are generated each day. "
"The contents files are round-robined so that over several days they will all "
@@ -2846,12 +2875,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:257
+#: apt-ftparchive.1.xml:258
msgid "ContentsAge"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:259
+#: apt-ftparchive.1.xml:260
msgid ""
"Controls the number of days a contents file is allowed to be checked without "
"changing. If this limit is passed the mtime of the contents file is updated. "
@@ -2862,63 +2891,63 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:268
+#: apt-ftparchive.1.xml:269
#, fuzzy
msgid "Directory"
msgstr "Run-Directory"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:270
+#: apt-ftparchive.1.xml:271
msgid ""
"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
"$(SECTION)/binary-$(ARCH)/</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:274
+#: apt-ftparchive.1.xml:275
#, fuzzy
msgid "SrcDirectory"
msgstr "Run-Directory"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:276
+#: apt-ftparchive.1.xml:277
msgid ""
"Sets the top of the source package directory tree. Defaults to <filename>"
"$(DIST)/$(SECTION)/source/</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406
+#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407
msgid "Packages"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:282
+#: apt-ftparchive.1.xml:283
msgid ""
"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
"binary-$(ARCH)/Packages</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411
+#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412
#, fuzzy
msgid "Sources"
msgstr "Source-Symlinks"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:288
+#: apt-ftparchive.1.xml:289
msgid ""
"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
"source/Sources</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:292
+#: apt-ftparchive.1.xml:293
msgid "InternalPrefix"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:294
+#: apt-ftparchive.1.xml:295
msgid ""
"Sets the path prefix that causes a symlink to be considered an internal link "
"instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -2926,12 +2955,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417
+#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418
msgid "Contents"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:301
+#: apt-ftparchive.1.xml:302
msgid ""
"Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
"</filename>. If this setting causes multiple Packages files to map onto a "
@@ -2940,36 +2969,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:308
+#: apt-ftparchive.1.xml:309
msgid "Contents::Header"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:310
+#: apt-ftparchive.1.xml:311
msgid "Sets header file to prepend to the contents output."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442
+#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443
#, fuzzy
msgid "BinCacheDB"
msgstr "check"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:315
+#: apt-ftparchive.1.xml:316
msgid ""
"Sets the binary cache database to use for this section. Multiple sections "
"can share the same database."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319
+#: apt-ftparchive.1.xml:320
#, fuzzy
msgid "FileList"
msgstr "Ficheros"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:322
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -2977,13 +3006,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:326
+#: apt-ftparchive.1.xml:327
#, fuzzy
msgid "SourceFileList"
msgstr "source"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:328
+#: apt-ftparchive.1.xml:329
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -2992,12 +3021,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:336
+#: apt-ftparchive.1.xml:337
msgid "Tree Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:338
+#: apt-ftparchive.1.xml:339
msgid ""
"The <literal>Tree</literal> section defines a standard Debian file tree "
"which consists of a base directory, then multiple sections in that base "
@@ -3007,7 +3036,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:343
+#: apt-ftparchive.1.xml:344
msgid ""
"The <literal>Tree</literal> section takes a scope tag which sets the "
"<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -3016,7 +3045,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:348
+#: apt-ftparchive.1.xml:349
msgid ""
"All of the settings defined in the <literal>TreeDefault</literal> section "
"can be use in a <literal>Tree</literal> section as well as three new "
@@ -3024,7 +3053,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:354
+#: apt-ftparchive.1.xml:355
#, no-wrap
msgid ""
"for i in Sections do \n"
@@ -3034,7 +3063,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
+#: apt-ftparchive.1.xml:352
msgid ""
"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
"command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -3042,13 +3071,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:360
+#: apt-ftparchive.1.xml:361
#, fuzzy
msgid "Sections"
msgstr "Opciones"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:362
+#: apt-ftparchive.1.xml:363
msgid ""
"This is a space separated list of sections which appear under the "
"distribution, typically this is something like <literal>main contrib non-"
@@ -3056,13 +3085,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:367
+#: apt-ftparchive.1.xml:368
#, fuzzy
msgid "Architectures"
msgstr "Arquitectura"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:369
+#: apt-ftparchive.1.xml:370
msgid ""
"This is a space separated list of all the architectures that appear under "
"search section. The special architecture 'source' is used to indicate that "
@@ -3070,57 +3099,57 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422
+#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423
msgid "BinOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:376
+#: apt-ftparchive.1.xml:377
msgid ""
"Sets the binary override file. The override file contains section, priority "
"and maintainer address information."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427
+#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428
msgid "SrcOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:382
+#: apt-ftparchive.1.xml:383
msgid ""
"Sets the source override file. The override file contains section "
"information."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432
+#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433
msgid "ExtraOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434
+#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435
msgid "Sets the binary extra override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437
+#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438
msgid "SrcExtraOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439
+#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440
msgid "Sets the source extra override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:398
+#: apt-ftparchive.1.xml:399
#, fuzzy
msgid "BinDirectory Section"
msgstr "Run-Directory"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:400
+#: apt-ftparchive.1.xml:401
msgid ""
"The <literal>bindirectory</literal> section defines a binary directory tree "
"with no special structure. The scope tag specifies the location of the "
@@ -3130,64 +3159,64 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:408
+#: apt-ftparchive.1.xml:409
msgid "Sets the Packages file output."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:413
+#: apt-ftparchive.1.xml:414
msgid ""
"Sets the Sources file output. At least one of <literal>Packages</literal> or "
"<literal>Sources</literal> is required."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:419
+#: apt-ftparchive.1.xml:420
msgid "Sets the Contents file output. (optional)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:424
+#: apt-ftparchive.1.xml:425
msgid "Sets the binary override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:429
+#: apt-ftparchive.1.xml:430
msgid "Sets the source override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:444
+#: apt-ftparchive.1.xml:445
msgid "Sets the cache DB."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:447
+#: apt-ftparchive.1.xml:448
msgid "PathPrefix"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:449
+#: apt-ftparchive.1.xml:450
msgid "Appends a path to all the output paths."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:452
+#: apt-ftparchive.1.xml:453
msgid "FileList, SourceFileList"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:454
+#: apt-ftparchive.1.xml:455
msgid "Specifies the file list file."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:461
+#: apt-ftparchive.1.xml:462
msgid "The Binary Override File"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:463
msgid ""
"The binary override file is fully compatible with &dpkg-scanpackages;. It "
"contains 4 fields separated by spaces. The first field is the package name, "
@@ -3197,19 +3226,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:469
#, no-wrap
msgid "old [// oldn]* => new"
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:470
+#: apt-ftparchive.1.xml:471
#, no-wrap
msgid "new"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:467
+#: apt-ftparchive.1.xml:468
msgid ""
"The general form of the maintainer field is: <placeholder type="
"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -3220,12 +3249,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:478
+#: apt-ftparchive.1.xml:479
msgid "The Source Override File"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:480
+#: apt-ftparchive.1.xml:481
msgid ""
"The source override file is fully compatible with &dpkg-scansources;. It "
"contains 2 fields separated by spaces. The first fields is the source "
@@ -3233,12 +3262,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:485
+#: apt-ftparchive.1.xml:486
msgid "The Extra Override File"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:488
msgid ""
"The extra override file allows any arbitrary tag to be added or replaced in "
"the output. It has 3 columns, the first is the package, the second is the "
@@ -3246,13 +3275,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:496
+#: apt-ftparchive.1.xml:497
#, fuzzy
msgid "<option>--md5</option>"
msgstr "<option>-d</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:498
+#: apt-ftparchive.1.xml:499
msgid ""
"Generate MD5 sums. This defaults to on, when turned off the generated index "
"files will not have MD5Sum fields where possible. Configuration Item: "
@@ -3260,13 +3289,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:503
+#: apt-ftparchive.1.xml:504
#, fuzzy
msgid "<option>--db</option>"
msgstr "<option>-d</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:505
+#: apt-ftparchive.1.xml:506
#, fuzzy
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
@@ -3276,7 +3305,7 @@ msgstr ""
"Opción de configuración: <literal>APT::Cache::NamesOnly</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:512
#, fuzzy
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
@@ -3291,13 +3320,13 @@ msgstr ""
"Opción de configuración: <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:517
+#: apt-ftparchive.1.xml:518
#, fuzzy
msgid "<option>--delink</option>"
msgstr "<option>-d</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:519
+#: apt-ftparchive.1.xml:520
#, fuzzy
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
@@ -3311,13 +3340,13 @@ msgstr ""
"Cache::Generate</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:525
+#: apt-ftparchive.1.xml:526
#, fuzzy
msgid "<option>--contents</option>"
msgstr "<option>--recon</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:527
+#: apt-ftparchive.1.xml:528
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -3327,13 +3356,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:535
+#: apt-ftparchive.1.xml:536
#, fuzzy
msgid "<option>--source-override</option>"
msgstr "<option>--force-yes</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:538
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
"command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3341,13 +3370,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:541
+#: apt-ftparchive.1.xml:542
#, fuzzy
msgid "<option>--readonly</option>"
msgstr "<option>--recon</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:543
+#: apt-ftparchive.1.xml:544
#, fuzzy
msgid ""
"Make the caching databases read only. Configuration Item: <literal>APT::"
@@ -3357,15 +3386,35 @@ msgstr ""
"Opción de configuración: <literal>APT::Cache::NamesOnly</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:547
+#: apt-ftparchive.1.xml:548
+#, fuzzy
+msgid "<option>--arch</option>"
+msgstr "<option>-a</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:549
+#, fuzzy
+msgid ""
+"Accept in the <literal>packages</literal> and <literal>contents</literal> "
+"commands only package files matching <literal>*_arch.deb</literal> or "
+"<literal>*_all.deb</literal> instead of all package files in the given "
+"path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>."
+msgstr ""
+"No actualiza los paquetes. Cuando se usa juntamente con <literal>install</"
+"literal>, <literal>no-upgrade</literal> evita que se actualicen los paquetes "
+"listados en la línea de órdenes si ya están previamente instalados. Opción "
+"de Configuración: <literal>APT::Get::Upgrade</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:555
#, fuzzy
msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr "<option>--all-versions</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:549
+#: apt-ftparchive.1.xml:557
msgid ""
-"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If "
+"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
"packages are recompiled and/or republished with the same version again, this "
"will lead to problems as the now outdated cached metadata like size and "
"checksums will be used. With this option enabled this will no longer happen "
@@ -3377,13 +3426,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:559
+#: apt-ftparchive.1.xml:567
#, fuzzy
msgid "<option>APT::FTPArchive::LongDescription</option>"
msgstr "<option>--all-versions</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:569
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -3393,27 +3442,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469
+#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477
#: sources.list.5.xml:193
#, fuzzy
msgid "Examples"
msgstr "Ejemplos"
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:579
+#: apt-ftparchive.1.xml:587
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:575
+#: apt-ftparchive.1.xml:583
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:589
+#: apt-ftparchive.1.xml:597
#, fuzzy
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
@@ -7178,7 +7227,8 @@ msgstr "&apt-cache; &apt-conf;"
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt_preferences.5.xml:13
-msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>"
+msgid ""
+"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
@@ -7245,6 +7295,17 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:56
msgid ""
+"Preferences are a strong power in the hands of a system administrator but "
+"they can become also their biggest nightmare if used without care! APT will "
+"not questioning the preferences so wrong settings will therefore lead to "
+"uninstallable packages or wrong decisions while upgrading packages. Even "
+"more problems will arise if multiply distribution releases are mixed without "
+"a good understanding of the following paragraphs. You have been warned."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_preferences.5.xml:64
+msgid ""
"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
"directory are parsed in alphanumeric ascending order and need to obey the "
"following naming convention: The files have no or \"<literal>pref</literal>"
@@ -7254,13 +7315,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:63
+#: apt_preferences.5.xml:71
#, fuzzy
msgid "APT's Default Priority Assignments"
msgstr "¿Cómo asigna APT las prioridades?"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:78
+#: apt_preferences.5.xml:86
#, fuzzy, no-wrap
msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
msgstr ""
@@ -7268,7 +7329,7 @@ msgstr ""
"<command>apt-get install -t testing <replaceable>paquete</replaceable></command>\n"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml:89
#, fuzzy, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr ""
@@ -7276,7 +7337,7 @@ msgstr ""
"APT::Default-Release \"stable\";\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:65
+#: apt_preferences.5.xml:73
#, fuzzy
msgid ""
"If there is no preferences file or if there is no entry in the file that "
@@ -7301,25 +7362,25 @@ msgstr ""
"(<filename>/etc/apt/apt.conf</filename>). Por ejemplo,"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:90
+#: apt_preferences.5.xml:98
#, fuzzy
msgid "priority 100"
msgstr "prioridad 100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:91
+#: apt_preferences.5.xml:99
#, fuzzy
msgid "to the version that is already installed (if any)."
msgstr "a la versión instalada (si existe)."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:95
+#: apt_preferences.5.xml:103
#, fuzzy
msgid "priority 500"
msgstr "prioridad 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:96
+#: apt_preferences.5.xml:104
#, fuzzy
msgid ""
"to the versions that are not installed and do not belong to the target "
@@ -7328,13 +7389,13 @@ msgstr ""
"a la versión que ni está instalada ni pertenece a la distribución objetivo."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:100
+#: apt_preferences.5.xml:108
#, fuzzy
msgid "priority 990"
msgstr "prioridad 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:101
+#: apt_preferences.5.xml:109
#, fuzzy
msgid ""
"to the versions that are not installed and belong to the target release."
@@ -7343,7 +7404,7 @@ msgstr ""
"distribución objetivo."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:85
+#: apt_preferences.5.xml:93
#, fuzzy
msgid ""
"If the target release has been specified then APT uses the following "
@@ -7355,7 +7416,7 @@ msgstr ""
"Asigna:"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:114
#, fuzzy
msgid ""
"If the target release has not been specified then APT simply assigns "
@@ -7366,7 +7427,7 @@ msgstr ""
"todas las versiones de los paquetes instalados y 500 al resto."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:110
+#: apt_preferences.5.xml:118
#, fuzzy
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
@@ -7376,7 +7437,7 @@ msgstr ""
"determinar qué versión del paquete debe instalar."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:113
+#: apt_preferences.5.xml:121
#, fuzzy
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
@@ -7393,13 +7454,13 @@ msgstr ""
"ser peligroso)."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:119
+#: apt_preferences.5.xml:127
#, fuzzy
msgid "Install the highest priority version."
msgstr "Instalar la versión de mayor prioridad."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:120
+#: apt_preferences.5.xml:128
#, fuzzy
msgid ""
"If two or more versions have the same priority, install the most recent one "
@@ -7409,7 +7470,7 @@ msgstr ""
"(esto es, la que tiene un número de versión mayor)."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:131
#, fuzzy
msgid ""
"If two or more versions have the same priority and version number but either "
@@ -7421,7 +7482,7 @@ msgstr ""
"<literal>--reinstall</literal> se instala la que no está instalada."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:137
#, fuzzy
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
@@ -7437,7 +7498,7 @@ msgstr ""
"get upgrade</command>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:136
+#: apt_preferences.5.xml:144
#, fuzzy
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
@@ -7452,7 +7513,7 @@ msgstr ""
"get upgrade</command>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml:149
#, fuzzy
msgid ""
"Sometimes the installed version of a package is more recent than the version "
@@ -7472,13 +7533,13 @@ msgstr ""
"mayor que la versión instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:150
+#: apt_preferences.5.xml:158
#, fuzzy
msgid "The Effect of APT Preferences"
msgstr "El efecto de las preferencias sobre APT"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:152
+#: apt_preferences.5.xml:160
#, fuzzy
msgid ""
"The APT preferences file allows the system administrator to control the "
@@ -7492,7 +7553,7 @@ msgstr ""
"registros pueden tener una o dos formas: una específica y otra general."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:166
#, fuzzy
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
@@ -7508,7 +7569,7 @@ msgstr ""
"\"<literal>5.8</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:165
+#: apt_preferences.5.xml:173
#, fuzzy, no-wrap
msgid ""
"Package: perl\n"
@@ -7521,7 +7582,7 @@ msgstr ""
"Pin-Priority: 1001\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:171
+#: apt_preferences.5.xml:179
#, fuzzy
msgid ""
"The general form assigns a priority to all of the package versions in a "
@@ -7537,7 +7598,7 @@ msgstr ""
"nombre de dominio."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:177
+#: apt_preferences.5.xml:185
#, fuzzy
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
@@ -7549,7 +7610,7 @@ msgstr ""
"prioridad alta a todas las versiones disponibles desde un sitio local."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:182
+#: apt_preferences.5.xml:190
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -7562,7 +7623,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:187
+#: apt_preferences.5.xml:195
#, fuzzy
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
@@ -7579,7 +7640,7 @@ msgstr ""
"\"Debian\" o \"Ximian\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:193
+#: apt_preferences.5.xml:201
#, fuzzy
msgid ""
"The following record assigns a low priority to all package versions "
@@ -7591,7 +7652,7 @@ msgstr ""
"Archivo \"<literal>unstable</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:197
+#: apt_preferences.5.xml:205
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -7604,7 +7665,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:210
#, fuzzy
msgid ""
"The following record assigns a high priority to all package versions "
@@ -7616,7 +7677,7 @@ msgstr ""
"Archivo \"<literal>unstable</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:206
+#: apt_preferences.5.xml:214
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -7629,7 +7690,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:211
+#: apt_preferences.5.xml:219
#, fuzzy
msgid ""
"The following record assigns a high priority to all package versions "
@@ -7642,7 +7703,7 @@ msgstr ""
"literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:216
+#: apt_preferences.5.xml:224
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -7655,19 +7716,19 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:227
+#: apt_preferences.5.xml:235
#, fuzzy
msgid "How APT Interprets Priorities"
msgstr "¿Cómo interpreta APT las prioridades?"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:243
#, fuzzy
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:236
+#: apt_preferences.5.xml:244
#, fuzzy
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
@@ -7677,13 +7738,13 @@ msgstr ""
"el sistema."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:248
#, fuzzy
msgid "990 &lt; P &lt;=1000"
msgstr "990 &lt; P &lt;=1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:241
+#: apt_preferences.5.xml:249
#, fuzzy
msgid ""
"causes a version to be installed even if it does not come from the target "
@@ -7693,13 +7754,13 @@ msgstr ""
"que la versión instalada sea más reciente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:246
+#: apt_preferences.5.xml:254
#, fuzzy
msgid "500 &lt; P &lt;=990"
msgstr "500 &lt; P &lt;=990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:247
+#: apt_preferences.5.xml:255
#, fuzzy
msgid ""
"causes a version to be installed unless there is a version available "
@@ -7710,13 +7771,13 @@ msgstr ""
"reciente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:252
+#: apt_preferences.5.xml:260
#, fuzzy
msgid "100 &lt; P &lt;=500"
msgstr "100 &lt; P &lt;=500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:253
+#: apt_preferences.5.xml:261
#, fuzzy
msgid ""
"causes a version to be installed unless there is a version available "
@@ -7726,13 +7787,13 @@ msgstr ""
"distribución o la versión instalada sea más reciente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:258
+#: apt_preferences.5.xml:266
#, fuzzy
msgid "0 &lt; P &lt;=100"
msgstr "0 &lt; P &lt;=100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:259
+#: apt_preferences.5.xml:267
#, fuzzy
msgid ""
"causes a version to be installed only if there is no installed version of "
@@ -7741,19 +7802,19 @@ msgstr ""
"la versión sólo se instala si no hay ninguna versión del paquete instalado."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:263
+#: apt_preferences.5.xml:271
#, fuzzy
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:272
#, fuzzy
msgid "prevents the version from being installed"
msgstr "la versión nunca se instala."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:230
+#: apt_preferences.5.xml:238
#, fuzzy
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
@@ -7764,7 +7825,7 @@ msgstr ""
"números enteros. Se interpretan (en general) del siguiente modo:"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:269
+#: apt_preferences.5.xml:277
#, fuzzy
msgid ""
"If any specific-form records match an available package version then the "
@@ -7779,7 +7840,7 @@ msgstr ""
"prioridad de la versión del paquete."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:283
#, fuzzy
msgid ""
"For example, suppose the APT preferences file contains the three records "
@@ -7789,7 +7850,7 @@ msgstr ""
"registros antes mencionados:"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:279
+#: apt_preferences.5.xml:287
#, fuzzy, no-wrap
msgid ""
"Package: perl\n"
@@ -7818,12 +7879,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:292
+#: apt_preferences.5.xml:300
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:294
+#: apt_preferences.5.xml:302
#, fuzzy
msgid ""
"The most recent available version of the <literal>perl</literal> package "
@@ -7839,7 +7900,7 @@ msgstr ""
"entonces se instala la versión5.8*."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:299
+#: apt_preferences.5.xml:307
#, fuzzy
msgid ""
"A version of any package other than <literal>perl</literal> that is "
@@ -7851,7 +7912,7 @@ msgstr ""
"versiones, incluso sobre los pertenecientes a la distribución objetivo."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:303
+#: apt_preferences.5.xml:311
#, fuzzy
msgid ""
"A version of a package whose origin is not the local system but some other "
@@ -7865,7 +7926,7 @@ msgstr ""
"versión del paquete instalado."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:313
+#: apt_preferences.5.xml:321
#, fuzzy
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
@@ -7873,7 +7934,7 @@ msgstr ""
"distribución"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:323
#, fuzzy
msgid ""
"The locations listed in the &sources-list; file should provide "
@@ -7885,31 +7946,31 @@ msgstr ""
"describen los paquetes disponibles en cada uno de los sitios."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:327
+#: apt_preferences.5.xml:335
#, fuzzy
msgid "the <literal>Package:</literal> line"
msgstr "La línea <literal>Package:</literal> "
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:336
#, fuzzy
msgid "gives the package name"
msgstr "Indica el nombre del paquete"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:331 apt_preferences.5.xml:381
+#: apt_preferences.5.xml:339 apt_preferences.5.xml:389
#, fuzzy
msgid "the <literal>Version:</literal> line"
msgstr "La línea <literal>Version:</literal> "
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:332
+#: apt_preferences.5.xml:340
#, fuzzy
msgid "gives the version number for the named package"
msgstr "Indica el número de versión del paquete"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:319
+#: apt_preferences.5.xml:327
#, fuzzy
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
@@ -7931,13 +7992,13 @@ msgstr ""
"cada registro:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:356
#, fuzzy
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:349
+#: apt_preferences.5.xml:357
#, fuzzy
msgid ""
"names the archive to which all the packages in the directory tree belong. "
@@ -7956,7 +8017,7 @@ msgstr ""
"preferencias de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:367
#, fuzzy, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
@@ -7964,13 +8025,13 @@ msgstr ""
"Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:365
+#: apt_preferences.5.xml:373
#, fuzzy
msgid "the <literal>Codename:</literal> line"
msgstr "La línea <literal>Component:</literal> "
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:366
+#: apt_preferences.5.xml:374
#, fuzzy
msgid ""
"names the codename to which all the packages in the directory tree belong. "
@@ -7988,13 +8049,13 @@ msgstr ""
"preferencias de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:383
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:382
+#: apt_preferences.5.xml:390
#, fuzzy
msgid ""
"names the release version. For example, the packages in the tree might "
@@ -8011,7 +8072,7 @@ msgstr ""
"siguientes línea en el fichero de preferencias de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:391
+#: apt_preferences.5.xml:399
#, fuzzy, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -8024,13 +8085,13 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:400
+#: apt_preferences.5.xml:408
#, fuzzy
msgid "the <literal>Component:</literal> line"
msgstr "La línea <literal>Component:</literal> "
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:409
#, fuzzy
msgid ""
"names the licensing component associated with the packages in the directory "
@@ -8049,7 +8110,7 @@ msgstr ""
"de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:418
#, fuzzy, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
@@ -8057,13 +8118,13 @@ msgstr ""
"Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:424
#, fuzzy
msgid "the <literal>Origin:</literal> line"
msgstr "La línea <literal>Origin:</literal> "
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:417
+#: apt_preferences.5.xml:425
#, fuzzy
msgid ""
"names the originator of the packages in the directory tree of the "
@@ -8077,7 +8138,7 @@ msgstr ""
"tendrá que poner la siguiente línea en el fichero de preferencias de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:423
+#: apt_preferences.5.xml:431
#, fuzzy, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
@@ -8085,13 +8146,13 @@ msgstr ""
"Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:429
+#: apt_preferences.5.xml:437
#, fuzzy
msgid "the <literal>Label:</literal> line"
msgstr "La línea <literal>Label:</literal> "
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:430
+#: apt_preferences.5.xml:438
#, fuzzy
msgid ""
"names the label of the packages in the directory tree of the "
@@ -8105,7 +8166,7 @@ msgstr ""
"la siguiente línea en el fichero de preferencias de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:444
#, fuzzy, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
@@ -8113,7 +8174,7 @@ msgstr ""
"Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:345
#, fuzzy
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
@@ -8135,7 +8196,7 @@ msgstr ""
"<filename>Release</filename> son relevantes para las prioridades de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:443
+#: apt_preferences.5.xml:451
#, fuzzy
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
@@ -8161,13 +8222,13 @@ msgstr ""
"la distribución <literal>inestable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:456
+#: apt_preferences.5.xml:464
#, fuzzy
msgid "Optional Lines in an APT Preferences Record"
msgstr "Líneas opcionales en un registro de preferencias de APT"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:458
+#: apt_preferences.5.xml:466
#, fuzzy
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
@@ -8179,7 +8240,7 @@ msgstr ""
"Útil para comentarios."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:462
+#: apt_preferences.5.xml:470
#, fuzzy
msgid ""
"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
@@ -8192,13 +8253,13 @@ msgstr ""
"una línea que empieze con <literal>Pin-Priority: release ...</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:471
+#: apt_preferences.5.xml:479
#, fuzzy
msgid "Tracking Stable"
msgstr "Siguiendo la distribución estable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:487
#, fuzzy, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8223,7 +8284,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:473
+#: apt_preferences.5.xml:481
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a priority "
@@ -8238,8 +8299,8 @@ msgstr ""
"de las distribuciones <literal>Debian</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:496 apt_preferences.5.xml:542
-#: apt_preferences.5.xml:600
+#: apt_preferences.5.xml:504 apt_preferences.5.xml:550
+#: apt_preferences.5.xml:608
#, fuzzy, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -8252,7 +8313,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:491
+#: apt_preferences.5.xml:499
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -8266,13 +8327,13 @@ msgstr ""
"última versión <literal>estable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:508
+#: apt_preferences.5.xml:516
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "rdepends <replaceable>paquetes(s)</replaceable>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:510
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -8285,13 +8346,13 @@ msgstr ""
"de nuevo amenos que se ejecute de nuevo la orden."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:514
+#: apt_preferences.5.xml:522
#, fuzzy
msgid "Tracking Testing or Unstable"
msgstr "Siguiendo la distribución de pruebas o inestable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:523
+#: apt_preferences.5.xml:531
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -8320,7 +8381,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:524
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
@@ -8337,7 +8398,7 @@ msgstr ""
"de <literal>Debian</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:545
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -8351,13 +8412,13 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:565
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "rdepends <replaceable>paquetes(s)</replaceable>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:556
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -8377,12 +8438,12 @@ msgstr ""
"versión instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:564
+#: apt_preferences.5.xml:572
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:578
+#: apt_preferences.5.xml:586
#, fuzzy, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -8412,7 +8473,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:566
+#: apt_preferences.5.xml:574
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -8427,7 +8488,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:595
+#: apt_preferences.5.xml:603
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -8441,13 +8502,13 @@ msgstr ""
"última versión <literal>estable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:615
+#: apt_preferences.5.xml:623
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "rdepends <replaceable>paquetes(s)</replaceable>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:606
+#: apt_preferences.5.xml:614
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -8467,13 +8528,13 @@ msgstr ""
"versión instalada."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:624
+#: apt_preferences.5.xml:632
#, fuzzy
msgid "&file-preferences;"
msgstr "apt_preferences"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:630
+#: apt_preferences.5.xml:638
#, fuzzy
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-conf;, &apt-get;, &sources-list;"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index ed881fa32..de84a2ffe 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2010-01-20 12:18+0100\n"
+"POT-Creation-Date: 2010-02-18 20:53+0100\n"
"PO-Revision-Date: 2010-01-29 19:58+0100\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1218,7 +1218,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47
-#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125
+#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125
#: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40
#: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
#: sources.list.5.xml:33
@@ -1752,7 +1752,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
-#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
+#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89
#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
msgid "options"
msgstr "options"
@@ -1779,7 +1779,7 @@ msgstr ""
"<literal>Dir::Cache::pkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376
+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376
#: apt-sortpkgs.1.xml:58
msgid "<option>-s</option>"
msgstr "<option>-s</option>"
@@ -1806,12 +1806,12 @@ msgstr ""
"<literal>Dir::Cache::srcpkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
msgid "<option>-q</option>"
msgstr "<option>-q</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
msgid "<option>--quiet</option>"
msgstr "<option>--quiet</option>"
@@ -1872,7 +1872,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317 apt-cdrom.8.xml:131
+#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548
msgid "<option>-a</option>"
msgstr "<option>-a</option>"
@@ -1992,14 +1992,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:554
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1035 apt_preferences.5.xml:622
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:630
msgid "Files"
msgstr "Fichiers"
@@ -2010,9 +2010,9 @@ msgstr "&file-sourceslist; &file-statelists;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569
#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637
#: sources.list.5.xml:233
msgid "See Also"
msgstr "Voir aussi"
@@ -2024,7 +2024,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;."
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:575
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr "Diagnostics"
@@ -2104,9 +2104,16 @@ msgstr "add"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:66
+#, fuzzy
+#| msgid ""
+#| "<literal>add</literal> is used to add a new disc to the source list. It "
+#| "will unmount the CDROM device, prompt for a disk to be inserted and then "
+#| "procceed to scan it and copy the index files. If the disc does not have a "
+#| "proper <filename>disk</filename> directory you will be prompted for a "
+#| "descriptive title."
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
-"unmount the CDROM device, prompt for a disk to be inserted and then procceed "
+"unmount the CDROM device, prompt for a disk to be inserted and then proceed "
"to scan it and copy the index files. If the disc does not have a proper "
"<filename>disk</filename> directory you will be prompted for a descriptive "
"title."
@@ -2159,7 +2166,7 @@ msgid "Options"
msgstr "Options"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328
+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328
msgid "<option>-d</option>"
msgstr "<option>-d</option>"
@@ -2337,7 +2344,7 @@ msgstr ""
"apt.conf</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:53 apt-ftparchive.1.xml:71
+#: apt-config.8.xml:53 apt-ftparchive.1.xml:72
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given "
"one of the commands below must be present."
@@ -2404,7 +2411,7 @@ msgid "Just show the contents of the configuration space."
msgstr "Affiche seulement le contenu de l'espace de configuration."
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593
#: apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr "&apt-conf;"
@@ -2534,10 +2541,32 @@ msgstr "Outil de création de fichiers d'index"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-ftparchive.1.xml:36
+#, fuzzy
+#| msgid ""
+#| "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
+#| "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
+#| "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
+#| "arg> <arg><option>-o <replaceable>config</"
+#| "replaceable>=<replaceable>string</replaceable></option></arg> "
+#| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#| "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
+#| "\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
+#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
+#| "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
+#| "replaceable></arg><arg><replaceable>override</"
+#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
+#| "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></"
+#| "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</"
+#| "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
+#| "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep="
+#| "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg "
+#| "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </"
+#| "group>"
msgid ""
"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
"<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
+"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></"
"arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</"
"replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></"
"option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep="
@@ -2574,7 +2603,7 @@ msgstr ""
"replaceable></arg></arg> </group>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:56
+#: apt-ftparchive.1.xml:57
msgid ""
"<command>apt-ftparchive</command> is the command line tool that generates "
"the index files that APT uses to access a distribution source. The index "
@@ -2586,7 +2615,7 @@ msgstr ""
"index doit être créé pour un site et basé sur le contenu de ce site."
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:60
+#: apt-ftparchive.1.xml:61
msgid ""
"<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
"program, incorporating its entire functionality via the <literal>packages</"
@@ -2601,7 +2630,7 @@ msgstr ""
"élaborée pour « scripter » le processus de création d'une archive complète."
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:66
+#: apt-ftparchive.1.xml:67
msgid ""
"Internally <command>apt-ftparchive</command> can make use of binary "
"databases to cache the contents of a .deb file and it does not rely on any "
@@ -2616,12 +2645,12 @@ msgstr ""
"voulus."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:75
+#: apt-ftparchive.1.xml:76
msgid "packages"
msgstr "packages"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:77
+#: apt-ftparchive.1.xml:78
msgid ""
"The packages command generates a package file from a directory tree. It "
"takes the given directory and recursively searches it for .deb files, "
@@ -2635,7 +2664,7 @@ msgstr ""
"équivalente à &dpkg-scanpackages;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106
+#: apt-ftparchive.1.xml:83 apt-ftparchive.1.xml:107
msgid ""
"The option <option>--db</option> can be used to specify a binary caching DB."
msgstr ""
@@ -2643,12 +2672,12 @@ msgstr ""
"binaire."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:85
+#: apt-ftparchive.1.xml:86
msgid "sources"
msgstr "sources"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:87
+#: apt-ftparchive.1.xml:88
msgid ""
"The <literal>sources</literal> command generates a source index file from a "
"directory tree. It takes the given directory and recursively searches it "
@@ -2662,7 +2691,7 @@ msgstr ""
"équivalente à &dpkg-scansources;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:92
+#: apt-ftparchive.1.xml:93
msgid ""
"If an override file is specified then a source override file will be looked "
"for with an extension of .src. The --source-override option can be used to "
@@ -2673,12 +2702,12 @@ msgstr ""
"source-override</option> pour changer de fichier source d'« override »."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:97
+#: apt-ftparchive.1.xml:98
msgid "contents"
msgstr "contents"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:99
+#: apt-ftparchive.1.xml:100
msgid ""
"The <literal>contents</literal> command generates a contents file from a "
"directory tree. It takes the given directory and recursively searches it "
@@ -2696,12 +2725,12 @@ msgstr ""
"sépare les paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:109
+#: apt-ftparchive.1.xml:110
msgid "release"
msgstr "release"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:111
+#: apt-ftparchive.1.xml:112
msgid ""
"The <literal>release</literal> command generates a Release file from a "
"directory tree. It recursively searches the given directory for Packages, "
@@ -2716,7 +2745,7 @@ msgstr ""
"standard avec un résumé MD5 et un résumé SHA1 pour chaque fichier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:118
+#: apt-ftparchive.1.xml:119
msgid ""
"Values for the additional metadata fields in the Release file are taken from "
"the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -2735,12 +2764,12 @@ msgstr ""
"<literal>Components</literal>, <literal>Description</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:128
+#: apt-ftparchive.1.xml:129
msgid "generate"
msgstr "generate"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:130
+#: apt-ftparchive.1.xml:131
msgid ""
"The <literal>generate</literal> command is designed to be runnable from a "
"cron script and builds indexes according to the given config file. The "
@@ -2754,12 +2783,12 @@ msgstr ""
"préciser index et répertoires aussi bien que les paramètres requis."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:137 apt-get.8.xml:292
+#: apt-ftparchive.1.xml:138 apt-get.8.xml:292
msgid "clean"
msgstr "clean"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:139
+#: apt-ftparchive.1.xml:140
msgid ""
"The <literal>clean</literal> command tidies the databases used by the given "
"configuration file by removing any records that are no longer necessary."
@@ -2769,12 +2798,12 @@ msgstr ""
"sont plus nécessaires."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:145
+#: apt-ftparchive.1.xml:146
msgid "The Generate Configuration"
msgstr "Configuration de la commande generate"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:147
+#: apt-ftparchive.1.xml:148
msgid ""
"The <literal>generate</literal> command uses a configuration file to "
"describe the archives that are going to be generated. It follows the typical "
@@ -2791,19 +2820,19 @@ msgstr ""
"arborescence. Cela n'affecte que l'usage de l'étiquette de visée (scope tag)."
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:156
msgid ""
"The generate configuration has 4 separate sections, each described below."
msgstr ""
"Ce fichier de configuration possède quatre sections, décrites ci-dessous."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:157
+#: apt-ftparchive.1.xml:158
msgid "Dir Section"
msgstr "La section Dir"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:159
+#: apt-ftparchive.1.xml:160
msgid ""
"The <literal>Dir</literal> section defines the standard directories needed "
"to locate the files required during the generation process. These "
@@ -2816,12 +2845,12 @@ msgstr ""
"manière à produire un chemin absolu et complet."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:164
+#: apt-ftparchive.1.xml:165
msgid "ArchiveDir"
msgstr "ArchiveDir"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:166
+#: apt-ftparchive.1.xml:167
msgid ""
"Specifies the root of the FTP archive, in a standard Debian configuration "
"this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -2832,32 +2861,32 @@ msgstr ""
"filename> et les noeuds des distributions."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:171
+#: apt-ftparchive.1.xml:172
msgid "OverrideDir"
msgstr "OverrideDir"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:173
+#: apt-ftparchive.1.xml:174
msgid "Specifies the location of the override files."
msgstr "Indique l'emplacement des fichiers d'« override »."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:176
+#: apt-ftparchive.1.xml:177
msgid "CacheDir"
msgstr "CacheDir"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:178
+#: apt-ftparchive.1.xml:179
msgid "Specifies the location of the cache files"
msgstr "Indique l'emplacement des fichiers de cache."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:181
+#: apt-ftparchive.1.xml:182
msgid "FileListDir"
msgstr "FileListDir"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:183
+#: apt-ftparchive.1.xml:184
msgid ""
"Specifies the location of the file list files, if the <literal>FileList</"
"literal> setting is used below."
@@ -2866,12 +2895,12 @@ msgstr ""
"sert de la valeur <literal>FileList</literal> définie plus bas)."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:189
+#: apt-ftparchive.1.xml:190
msgid "Default Section"
msgstr "La section Default"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:191
+#: apt-ftparchive.1.xml:192
msgid ""
"The <literal>Default</literal> section specifies default values, and "
"settings that control the operation of the generator. Other sections may "
@@ -2882,12 +2911,12 @@ msgstr ""
"annulées dans d'autres sections (paramètrage par section)."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:195
+#: apt-ftparchive.1.xml:196
msgid "Packages::Compress"
msgstr "Packages::Compress"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:197
+#: apt-ftparchive.1.xml:198
msgid ""
"Sets the default compression schemes to use for the Package index files. It "
"is a string that contains a space separated list of at least one of: '.' (no "
@@ -2900,12 +2929,12 @@ msgstr ""
"défaut, c'est la chaîne « . gzip »."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:203
+#: apt-ftparchive.1.xml:204
msgid "Packages::Extensions"
msgstr "Packages::Extensions"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:205
+#: apt-ftparchive.1.xml:206
msgid ""
"Sets the default list of file extensions that are package files. This "
"defaults to '.deb'."
@@ -2914,12 +2943,12 @@ msgstr ""
"paquets. Par défaut, c'est « .deb »."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:209
+#: apt-ftparchive.1.xml:210
msgid "Sources::Compress"
msgstr "Sources::Compress"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:211
+#: apt-ftparchive.1.xml:212
msgid ""
"This is similar to <literal>Packages::Compress</literal> except that it "
"controls the compression for the Sources files."
@@ -2928,12 +2957,12 @@ msgstr ""
"compressés les fichiers sources."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:215
+#: apt-ftparchive.1.xml:216
msgid "Sources::Extensions"
msgstr "Sources::Extensions"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:217
+#: apt-ftparchive.1.xml:218
msgid ""
"Sets the default list of file extensions that are source files. This "
"defaults to '.dsc'."
@@ -2942,12 +2971,12 @@ msgstr ""
"fichiers sources. Par défaut, c'est « .dsc »."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:221
+#: apt-ftparchive.1.xml:222
msgid "Contents::Compress"
msgstr "Contents::Compress"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:223
+#: apt-ftparchive.1.xml:224
msgid ""
"This is similar to <literal>Packages::Compress</literal> except that it "
"controls the compression for the Contents files."
@@ -2956,12 +2985,12 @@ msgstr ""
"compressés les fichiers « Contents »."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:227
+#: apt-ftparchive.1.xml:228
msgid "DeLinkLimit"
msgstr "DeLinkLimit"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:229
+#: apt-ftparchive.1.xml:230
msgid ""
"Specifies the number of kilobytes to delink (and replace with hard links) "
"per run. This is used in conjunction with the per-section <literal>External-"
@@ -2972,12 +3001,12 @@ msgstr ""
"paramètre <literal>External-Links</literal>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:234
+#: apt-ftparchive.1.xml:235
msgid "FileMode"
msgstr "FileMode"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:236
+#: apt-ftparchive.1.xml:237
msgid ""
"Specifies the mode of all created index files. It defaults to 0644. All "
"index files are set to this mode with no regard to the umask."
@@ -2987,12 +3016,12 @@ msgstr ""
"utilisateur (umasq) est ignoré."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:243
+#: apt-ftparchive.1.xml:244
msgid "TreeDefault Section"
msgstr "La section TreeDefault"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:245
+#: apt-ftparchive.1.xml:246
msgid ""
"Sets defaults specific to <literal>Tree</literal> sections. All of these "
"variables are substitution variables and have the strings $(DIST), "
@@ -3004,12 +3033,12 @@ msgstr ""
"respective."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:250
+#: apt-ftparchive.1.xml:251
msgid "MaxContentsChange"
msgstr "MaxContentsChange"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:252
+#: apt-ftparchive.1.xml:253
msgid ""
"Sets the number of kilobytes of contents files that are generated each day. "
"The contents files are round-robined so that over several days they will all "
@@ -3021,12 +3050,12 @@ msgstr ""
"soient reconstruits."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:257
+#: apt-ftparchive.1.xml:258
msgid "ContentsAge"
msgstr "ContentsAge"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:259
+#: apt-ftparchive.1.xml:260
msgid ""
"Controls the number of days a contents file is allowed to be checked without "
"changing. If this limit is passed the mtime of the contents file is updated. "
@@ -3044,12 +3073,12 @@ msgstr ""
"nombre vaut 10, l'unité étant le jour."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:268
+#: apt-ftparchive.1.xml:269
msgid "Directory"
msgstr "Directory"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:270
+#: apt-ftparchive.1.xml:271
msgid ""
"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
"$(SECTION)/binary-$(ARCH)/</filename>"
@@ -3058,12 +3087,12 @@ msgstr ""
"$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:274
+#: apt-ftparchive.1.xml:275
msgid "SrcDirectory"
msgstr "SrcDirectory"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:276
+#: apt-ftparchive.1.xml:277
msgid ""
"Sets the top of the source package directory tree. Defaults to <filename>"
"$(DIST)/$(SECTION)/source/</filename>"
@@ -3072,12 +3101,12 @@ msgstr ""
"<filename>$(DIST)/$(SECTION)/source/</filename>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406
+#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407
msgid "Packages"
msgstr "Packages"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:282
+#: apt-ftparchive.1.xml:283
msgid ""
"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
"binary-$(ARCH)/Packages</filename>"
@@ -3086,12 +3115,12 @@ msgstr ""
"$(SECTION)/binary-$(ARCH)/Packages</filename>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411
+#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412
msgid "Sources"
msgstr "Sources"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:288
+#: apt-ftparchive.1.xml:289
msgid ""
"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
"source/Sources</filename>"
@@ -3100,12 +3129,12 @@ msgstr ""
"$(SECTION)/source/Sources</filename>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:292
+#: apt-ftparchive.1.xml:293
msgid "InternalPrefix"
msgstr "InternalPrefix"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:294
+#: apt-ftparchive.1.xml:295
msgid ""
"Sets the path prefix that causes a symlink to be considered an internal link "
"instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -3116,12 +3145,12 @@ msgstr ""
"défaut, c'est <filename>$(DIST)/$(SECTION)/</filename>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417
+#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418
msgid "Contents"
msgstr "Contents"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:301
+#: apt-ftparchive.1.xml:302
msgid ""
"Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
"</filename>. If this setting causes multiple Packages files to map onto a "
@@ -3134,22 +3163,22 @@ msgstr ""
"ftparchive</command> les intègre automatiquement."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:308
+#: apt-ftparchive.1.xml:309
msgid "Contents::Header"
msgstr "Contents::Header"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:310
+#: apt-ftparchive.1.xml:311
msgid "Sets header file to prepend to the contents output."
msgstr "Indique l'en-tête à préfixer au fichier « Contents » créé."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442
+#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443
msgid "BinCacheDB"
msgstr "BinCacheDB"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:315
+#: apt-ftparchive.1.xml:316
msgid ""
"Sets the binary cache database to use for this section. Multiple sections "
"can share the same database."
@@ -3158,12 +3187,12 @@ msgstr ""
"Différentes sections peuvent partager cette base de données."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319
+#: apt-ftparchive.1.xml:320
msgid "FileList"
msgstr "FileList"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:322
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -3174,12 +3203,12 @@ msgstr ""
"relatifs sont préfixés par le répertoire de l'archive."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:326
+#: apt-ftparchive.1.xml:327
msgid "SourceFileList"
msgstr "SourceFileList"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:328
+#: apt-ftparchive.1.xml:329
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -3192,12 +3221,12 @@ msgstr ""
"traiter les index de sources."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:336
+#: apt-ftparchive.1.xml:337
msgid "Tree Section"
msgstr "La section Tree"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:338
+#: apt-ftparchive.1.xml:339
msgid ""
"The <literal>Tree</literal> section defines a standard Debian file tree "
"which consists of a base directory, then multiple sections in that base "
@@ -3211,7 +3240,7 @@ msgstr ""
"par la variable de substitution <literal>Directory</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:343
+#: apt-ftparchive.1.xml:344
msgid ""
"The <literal>Tree</literal> section takes a scope tag which sets the "
"<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -3224,7 +3253,7 @@ msgstr ""
"C'est par exemple : <filename>dists/woody</filename>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:348
+#: apt-ftparchive.1.xml:349
msgid ""
"All of the settings defined in the <literal>TreeDefault</literal> section "
"can be use in a <literal>Tree</literal> section as well as three new "
@@ -3235,7 +3264,7 @@ msgstr ""
"trois nouvelles variables suivantes."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:354
+#: apt-ftparchive.1.xml:355
#, no-wrap
msgid ""
"for i in Sections do \n"
@@ -3249,7 +3278,7 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
+#: apt-ftparchive.1.xml:352
msgid ""
"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
"command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -3260,12 +3289,12 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:360
+#: apt-ftparchive.1.xml:361
msgid "Sections"
msgstr "Sections"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:362
+#: apt-ftparchive.1.xml:363
msgid ""
"This is a space separated list of sections which appear under the "
"distribution, typically this is something like <literal>main contrib non-"
@@ -3276,12 +3305,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:367
+#: apt-ftparchive.1.xml:368
msgid "Architectures"
msgstr "Architectures"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:369
+#: apt-ftparchive.1.xml:370
msgid ""
"This is a space separated list of all the architectures that appear under "
"search section. The special architecture 'source' is used to indicate that "
@@ -3292,12 +3321,12 @@ msgstr ""
"que l'arborescence est une arborescence de sources."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422
+#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423
msgid "BinOverride"
msgstr "BinOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:376
+#: apt-ftparchive.1.xml:377
msgid ""
"Sets the binary override file. The override file contains section, priority "
"and maintainer address information."
@@ -3306,12 +3335,12 @@ msgstr ""
"informations sur la section, la priorité et le responsable du paquet."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427
+#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428
msgid "SrcOverride"
msgstr "SrcOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:382
+#: apt-ftparchive.1.xml:383
msgid ""
"Sets the source override file. The override file contains section "
"information."
@@ -3320,32 +3349,32 @@ msgstr ""
"informations sur la section."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432
+#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433
msgid "ExtraOverride"
msgstr "ExtraOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434
+#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435
msgid "Sets the binary extra override file."
msgstr "Indique un autre fichier d'« override » pour les binaires."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437
+#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438
msgid "SrcExtraOverride"
msgstr "SrcExtraOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439
+#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440
msgid "Sets the source extra override file."
msgstr "Indique un autre fichier d'« override » pour les sources."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:398
+#: apt-ftparchive.1.xml:399
msgid "BinDirectory Section"
msgstr "La section BinDirectory"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:400
+#: apt-ftparchive.1.xml:401
msgid ""
"The <literal>bindirectory</literal> section defines a binary directory tree "
"with no special structure. The scope tag specifies the location of the "
@@ -3360,12 +3389,12 @@ msgstr ""
"paramètrage de <literal>Section</literal><literal>Architecture</literal>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:408
+#: apt-ftparchive.1.xml:409
msgid "Sets the Packages file output."
msgstr "Définit le fichier « Packages » créé."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:413
+#: apt-ftparchive.1.xml:414
msgid ""
"Sets the Sources file output. At least one of <literal>Packages</literal> or "
"<literal>Sources</literal> is required."
@@ -3374,52 +3403,52 @@ msgstr ""
"<literal>Packages</literal> ou <literal>Sources</literal> est nécessaire."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:419
+#: apt-ftparchive.1.xml:420
msgid "Sets the Contents file output. (optional)"
msgstr "Définit le fichier « Contents » créé."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:424
+#: apt-ftparchive.1.xml:425
msgid "Sets the binary override file."
msgstr "Définit le fichier d'« override » pour les binaires."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:429
+#: apt-ftparchive.1.xml:430
msgid "Sets the source override file."
msgstr "Définit le fichier d'« override » pour les sources."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:444
+#: apt-ftparchive.1.xml:445
msgid "Sets the cache DB."
msgstr "Définit la base de données cache."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:447
+#: apt-ftparchive.1.xml:448
msgid "PathPrefix"
msgstr "PathPrefix"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:449
+#: apt-ftparchive.1.xml:450
msgid "Appends a path to all the output paths."
msgstr "Ajoute un chemin à tous les chemins créés."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:452
+#: apt-ftparchive.1.xml:453
msgid "FileList, SourceFileList"
msgstr "FileList, SourceFileList"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:454
+#: apt-ftparchive.1.xml:455
msgid "Specifies the file list file."
msgstr "Définit le fichier contenant la liste des fichiers."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:461
+#: apt-ftparchive.1.xml:462
msgid "The Binary Override File"
msgstr "Le fichier d'« Override » pour les binaires."
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:463
msgid ""
"The binary override file is fully compatible with &dpkg-scanpackages;. It "
"contains 4 fields separated by spaces. The first field is the package name, "
@@ -3434,19 +3463,19 @@ msgstr ""
"responsable de paquet."
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:469
#, no-wrap
msgid "old [// oldn]* => new"
msgstr "old [// oldn]* =&gt; new"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:470
+#: apt-ftparchive.1.xml:471
#, no-wrap
msgid "new"
msgstr "new"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:467
+#: apt-ftparchive.1.xml:468
msgid ""
"The general form of the maintainer field is: <placeholder type="
"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -3463,12 +3492,12 @@ msgstr ""
"deuxième forme remplace inconditionnellement le champ."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:478
+#: apt-ftparchive.1.xml:479
msgid "The Source Override File"
msgstr "Le fichier d'« Override » pour les sources"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:480
+#: apt-ftparchive.1.xml:481
msgid ""
"The source override file is fully compatible with &dpkg-scansources;. It "
"contains 2 fields separated by spaces. The first fields is the source "
@@ -3479,12 +3508,12 @@ msgstr ""
"sa section."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:485
+#: apt-ftparchive.1.xml:486
msgid "The Extra Override File"
msgstr "Le fichier supplémentaire d'« Override »"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:488
msgid ""
"The extra override file allows any arbitrary tag to be added or replaced in "
"the output. It has 3 columns, the first is the package, the second is the "
@@ -3496,12 +3525,12 @@ msgstr ""
"la nouvelle valeur."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:496
+#: apt-ftparchive.1.xml:497
msgid "<option>--md5</option>"
msgstr "<option>--md5</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:498
+#: apt-ftparchive.1.xml:499
msgid ""
"Generate MD5 sums. This defaults to on, when turned off the generated index "
"files will not have MD5Sum fields where possible. Configuration Item: "
@@ -3513,12 +3542,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:503
+#: apt-ftparchive.1.xml:504
msgid "<option>--db</option>"
msgstr "<option>--db</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:505
+#: apt-ftparchive.1.xml:506
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3528,7 +3557,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:512
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3543,12 +3572,12 @@ msgstr ""
"configuration : <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:517
+#: apt-ftparchive.1.xml:518
msgid "<option>--delink</option>"
msgstr "<option>--delink</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:519
+#: apt-ftparchive.1.xml:520
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
"then this option actually enables delinking of the files. It defaults to on "
@@ -3562,12 +3591,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:525
+#: apt-ftparchive.1.xml:526
msgid "<option>--contents</option>"
msgstr "<option>--contents</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:527
+#: apt-ftparchive.1.xml:528
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -3583,12 +3612,12 @@ msgstr ""
"de configuration : <literal>APT::FTPArchive::Contents</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:535
+#: apt-ftparchive.1.xml:536
msgid "<option>--source-override</option>"
msgstr "<option>--source-override</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:538
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
"command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3599,12 +3628,12 @@ msgstr ""
"FTPArchive::SourceOverride</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:541
+#: apt-ftparchive.1.xml:542
msgid "<option>--readonly</option>"
msgstr "<option>--readonly</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:543
+#: apt-ftparchive.1.xml:544
msgid ""
"Make the caching databases read only. Configuration Item: <literal>APT::"
"FTPArchive::ReadOnlyDB</literal>."
@@ -3613,16 +3642,42 @@ msgstr ""
"configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:547
+#: apt-ftparchive.1.xml:548
+#, fuzzy
+#| msgid "<option>-a</option>"
+msgid "<option>--arch</option>"
+msgstr "<option>-a</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:549
+#, fuzzy
+#| msgid ""
+#| "If the command is either <literal>install</literal> or <literal>remove</"
+#| "literal>, then this option acts like running <literal>autoremove</"
+#| "literal> command, removing the unused dependency packages. Configuration "
+#| "Item: <literal>APT::Get::AutomaticRemove</literal>."
+msgid ""
+"Accept in the <literal>packages</literal> and <literal>contents</literal> "
+"commands only package files matching <literal>*_arch.deb</literal> or "
+"<literal>*_all.deb</literal> instead of all package files in the given "
+"path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>."
+msgstr ""
+"Si la commande utilisée est soit <literal>install</literal> soit "
+"<literal>remove</literal>, cette option a le même effet "
+"qu'<literal>autoremove</literal> et supprime les paquets de dépendance "
+"inutilisés. Élément de configuration : <literal>APT::Get::Upgrade</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:555
#, fuzzy
#| msgid "<option>APT::FTPArchive::LongDescription</option>"
msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr "<option>APT::FTPArchive::LongDescription</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:549
+#: apt-ftparchive.1.xml:557
msgid ""
-"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If "
+"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
"packages are recompiled and/or republished with the same version again, this "
"will lead to problems as the now outdated cached metadata like size and "
"checksums will be used. With this option enabled this will no longer happen "
@@ -3634,12 +3689,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:559
+#: apt-ftparchive.1.xml:567
msgid "<option>APT::FTPArchive::LongDescription</option>"
msgstr "<option>APT::FTPArchive::LongDescription</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:569
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -3654,19 +3709,19 @@ msgstr ""
"pas possible de créer ces fichiers avec <command>apt-ftparchive</command>."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469
+#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477
#: sources.list.5.xml:193
msgid "Examples"
msgstr "Exemples"
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:579
+#: apt-ftparchive.1.xml:587
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:575
+#: apt-ftparchive.1.xml:583
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3675,7 +3730,7 @@ msgstr ""
"paquets binaires (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:589
+#: apt-ftparchive.1.xml:597
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -7903,7 +7958,10 @@ msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt_preferences.5.xml:13
-msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>"
+#, fuzzy
+#| msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>"
+msgid ""
+"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
msgstr "&apt-author.team; &apt-email; &apt-product; <date>04 mai 2009</date>"
#. type: Content of: <refentry><refnamediv><refname>
@@ -7969,6 +8027,17 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:56
msgid ""
+"Preferences are a strong power in the hands of a system administrator but "
+"they can become also their biggest nightmare if used without care! APT will "
+"not questioning the preferences so wrong settings will therefore lead to "
+"uninstallable packages or wrong decisions while upgrading packages. Even "
+"more problems will arise if multiply distribution releases are mixed without "
+"a good understanding of the following paragraphs. You have been warned."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_preferences.5.xml:64
+msgid ""
"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
"directory are parsed in alphanumeric ascending order and need to obey the "
"following naming convention: The files have no or \"<literal>pref</literal>"
@@ -7978,24 +8047,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:63
+#: apt_preferences.5.xml:71
msgid "APT's Default Priority Assignments"
msgstr "Priorités affectées par défaut"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:78
+#: apt_preferences.5.xml:86
#, no-wrap
msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
msgstr "<command>apt-get install -t testing <replaceable>paquet</replaceable></command>\n"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml:89
#, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr "APT::Default-Release \"stable\";\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:65
+#: apt_preferences.5.xml:73
msgid ""
"If there is no preferences file or if there is no entry in the file that "
"applies to a particular version then the priority assigned to that version "
@@ -8020,22 +8089,22 @@ msgstr ""
"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:90
+#: apt_preferences.5.xml:98
msgid "priority 100"
msgstr "une priorité égale à 100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:91
+#: apt_preferences.5.xml:99
msgid "to the version that is already installed (if any)."
msgstr "est affectée à la version déjà installée (si elle existe)."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:95
+#: apt_preferences.5.xml:103
msgid "priority 500"
msgstr "une priorité égale à 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:96
+#: apt_preferences.5.xml:104
msgid ""
"to the versions that are not installed and do not belong to the target "
"release."
@@ -8044,12 +8113,12 @@ msgstr ""
"pas à la distribution par défaut."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:100
+#: apt_preferences.5.xml:108
msgid "priority 990"
msgstr "une priorité égale à 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:101
+#: apt_preferences.5.xml:109
msgid ""
"to the versions that are not installed and belong to the target release."
msgstr ""
@@ -8057,7 +8126,7 @@ msgstr ""
"la distribution par défaut."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:85
+#: apt_preferences.5.xml:93
msgid ""
"If the target release has been specified then APT uses the following "
"algorithm to set the priorities of the versions of a package. Assign: "
@@ -8068,7 +8137,7 @@ msgstr ""
"type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:114
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -8079,7 +8148,7 @@ msgstr ""
"une priorité égale à 500 à tout version non installée."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:110
+#: apt_preferences.5.xml:118
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
@@ -8088,7 +8157,7 @@ msgstr ""
"qu'il faut installer (par ordre de priorité) :"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:113
+#: apt_preferences.5.xml:121
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -8104,12 +8173,12 @@ msgstr ""
"arrière."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:119
+#: apt_preferences.5.xml:127
msgid "Install the highest priority version."
msgstr "Installer la version qui possède la priorité la plus haute."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:120
+#: apt_preferences.5.xml:128
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
@@ -8118,7 +8187,7 @@ msgstr ""
"plus récente (c.-à-d. celle dont le numéro de version est le plus grand)."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:131
msgid ""
"If two or more versions have the same priority and version number but either "
"the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -8130,7 +8199,7 @@ msgstr ""
"qui n'est pas installée."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:137
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
"is not as recent as one of the versions available from the sources listed in "
@@ -8145,7 +8214,7 @@ msgstr ""
"replaceable></command> ou <command>apt-get dist-upgrade</command>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:136
+#: apt_preferences.5.xml:144
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
"recent than any of the other available versions. The package will not be "
@@ -8158,7 +8227,7 @@ msgstr ""
"<command>apt-get upgrade</command> ne provoquent pas de retour en arrière."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml:149
msgid ""
"Sometimes the installed version of a package is more recent than the version "
"belonging to the target release, but not as recent as a version belonging to "
@@ -8177,12 +8246,12 @@ msgstr ""
"priorité que celle de la version installée."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:150
+#: apt_preferences.5.xml:158
msgid "The Effect of APT Preferences"
msgstr "Conséquences des préférences"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:152
+#: apt_preferences.5.xml:160
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -8195,7 +8264,7 @@ msgstr ""
"formes, une forme particulière et une forme générale."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:166
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
"specified packages and specified version or version range. For example, the "
@@ -8210,7 +8279,7 @@ msgstr ""
"dont le numéro de version commence par <literal>5.8</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:165
+#: apt_preferences.5.xml:173
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8222,7 +8291,7 @@ msgstr ""
"Pin-Priority: 1001\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:171
+#: apt_preferences.5.xml:179
msgid ""
"The general form assigns a priority to all of the package versions in a "
"given distribution (that is, to all the versions of packages that are listed "
@@ -8237,7 +8306,7 @@ msgstr ""
"un nom complètement qualifié."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:177
+#: apt_preferences.5.xml:185
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
"of packages. For example, the following record assigns a high priority to "
@@ -8248,7 +8317,7 @@ msgstr ""
"priorité haute à toutes les versions disponibles dans le site local."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:182
+#: apt_preferences.5.xml:190
#, no-wrap
msgid ""
"Package: *\n"
@@ -8260,7 +8329,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:187
+#: apt_preferences.5.xml:195
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
"This should not be confused with the Origin of a distribution as specified "
@@ -8275,7 +8344,7 @@ msgstr ""
"mais le nom d'un auteur ou d'un distributeur, comme « Debian » ou « Ximian »."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:193
+#: apt_preferences.5.xml:201
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -8286,7 +8355,7 @@ msgstr ""
"<literal>unstable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:197
+#: apt_preferences.5.xml:205
#, no-wrap
msgid ""
"Package: *\n"
@@ -8298,7 +8367,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:210
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
@@ -8309,7 +8378,7 @@ msgstr ""
"<literal>squeeze</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:206
+#: apt_preferences.5.xml:214
#, no-wrap
msgid ""
"Package: *\n"
@@ -8321,7 +8390,7 @@ msgstr ""
"Pin-Priority: 900\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:211
+#: apt_preferences.5.xml:219
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -8333,7 +8402,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:216
+#: apt_preferences.5.xml:224
#, no-wrap
msgid ""
"Package: *\n"
@@ -8345,17 +8414,17 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:227
+#: apt_preferences.5.xml:235
msgid "How APT Interprets Priorities"
msgstr "Méthode d'interprétation des priorités par APT"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:243
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:236
+#: apt_preferences.5.xml:244
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -8364,12 +8433,12 @@ msgstr ""
"retour en arrière."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:248
msgid "990 &lt; P &lt;=1000"
msgstr "990 &lt; P &lt;=1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:241
+#: apt_preferences.5.xml:249
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -8379,12 +8448,12 @@ msgstr ""
"plus récente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:246
+#: apt_preferences.5.xml:254
msgid "500 &lt; P &lt;=990"
msgstr "500 &lt; P &lt;=990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:247
+#: apt_preferences.5.xml:255
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
@@ -8393,12 +8462,12 @@ msgstr ""
"distribution par défaut ou si la version installée est plus récente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:252
+#: apt_preferences.5.xml:260
msgid "100 &lt; P &lt;=500"
msgstr "100 &lt; P &lt;=500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:253
+#: apt_preferences.5.xml:261
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
@@ -8407,29 +8476,29 @@ msgstr ""
"autre distribution ou si la version installée est plus récente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:258
+#: apt_preferences.5.xml:266
msgid "0 &lt; P &lt;=100"
msgstr "0 &lt; P &lt;=100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:259
+#: apt_preferences.5.xml:267
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
msgstr "la version sera installée si aucune version du paquet n'est installée."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:263
+#: apt_preferences.5.xml:271
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:272
msgid "prevents the version from being installed"
msgstr "cette priorité empêche l'installation de la version."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:230
+#: apt_preferences.5.xml:238
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -8440,7 +8509,7 @@ msgstr ""
"<placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:269
+#: apt_preferences.5.xml:277
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -8454,7 +8523,7 @@ msgstr ""
"trouvée détermine la priorité."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:283
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -8463,7 +8532,7 @@ msgstr ""
"entrées décrites ci-dessous :"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:279
+#: apt_preferences.5.xml:287
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8491,12 +8560,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:292
+#: apt_preferences.5.xml:300
msgid "Then:"
msgstr "Alors :"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:294
+#: apt_preferences.5.xml:302
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -8510,7 +8579,7 @@ msgstr ""
"installée est une version 5.9*, il y aura un retour en arrière."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:299
+#: apt_preferences.5.xml:307
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -8521,7 +8590,7 @@ msgstr ""
"appartenant à la distribution par défaut."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:303
+#: apt_preferences.5.xml:311
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -8534,13 +8603,13 @@ msgstr ""
"paquet n'est déjà installée."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:313
+#: apt_preferences.5.xml:321
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
"Détermination de la version des paquets et des propriétés des distributions"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:323
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8551,27 +8620,27 @@ msgstr ""
"décrivent les paquets disponibles à cet endroit."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:327
+#: apt_preferences.5.xml:335
msgid "the <literal>Package:</literal> line"
msgstr "la ligne <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:336
msgid "gives the package name"
msgstr "donne le nom du paquet"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:331 apt_preferences.5.xml:381
+#: apt_preferences.5.xml:339 apt_preferences.5.xml:389
msgid "the <literal>Version:</literal> line"
msgstr "la ligne <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:332
+#: apt_preferences.5.xml:340
msgid "gives the version number for the named package"
msgstr "donne le numéro de version du paquet"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:319
+#: apt_preferences.5.xml:327
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8592,12 +8661,12 @@ msgstr ""
"\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:356
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "La ligne <literal>Archive:</literal> ou <literal>Suite:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:349
+#: apt_preferences.5.xml:357
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8614,18 +8683,18 @@ msgstr ""
"préférences demanderait cette ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:367
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:365
+#: apt_preferences.5.xml:373
msgid "the <literal>Codename:</literal> line"
msgstr "la ligne <literal>Codename:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:366
+#: apt_preferences.5.xml:374
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: squeeze\" specifies that all of the "
@@ -8641,13 +8710,13 @@ msgstr ""
"préférences demanderait cette ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:383
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr "Pin: release n=squeeze\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:382
+#: apt_preferences.5.xml:390
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -8663,7 +8732,7 @@ msgstr ""
"préférences demanderait ces lignes :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:391
+#: apt_preferences.5.xml:399
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -8675,12 +8744,12 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:400
+#: apt_preferences.5.xml:408
msgid "the <literal>Component:</literal> line"
msgstr "La ligne <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:409
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -8698,18 +8767,18 @@ msgstr ""
"fichier des préférences demanderait cette ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:418
#, no-wrap
msgid "Pin: release c=main\n"
msgstr "Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:424
msgid "the <literal>Origin:</literal> line"
msgstr "La ligne <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:417
+#: apt_preferences.5.xml:425
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8722,18 +8791,18 @@ msgstr ""
"ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:423
+#: apt_preferences.5.xml:431
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr "Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:429
+#: apt_preferences.5.xml:437
msgid "the <literal>Label:</literal> line"
msgstr "La ligne <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:430
+#: apt_preferences.5.xml:438
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8746,13 +8815,13 @@ msgstr ""
"préférences demanderait cette ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:444
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:345
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -8774,7 +8843,7 @@ msgstr ""
"déterminer les priorités : <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:443
+#: apt_preferences.5.xml:451
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -8799,12 +8868,12 @@ msgstr ""
"<literal>unstable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:456
+#: apt_preferences.5.xml:464
msgid "Optional Lines in an APT Preferences Record"
msgstr "Lignes facultatives dans le fichier des préférences"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:458
+#: apt_preferences.5.xml:466
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -8815,7 +8884,7 @@ msgstr ""
"commentaires."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:462
+#: apt_preferences.5.xml:470
msgid ""
"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
"optional. If omitted, APT assigns a priority of 1 less than the last value "
@@ -8828,12 +8897,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:471
+#: apt_preferences.5.xml:479
msgid "Tracking Stable"
msgstr "Méthode pour suivre Stable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:487
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8857,7 +8926,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:473
+#: apt_preferences.5.xml:481
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -8872,8 +8941,8 @@ msgstr ""
"literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:496 apt_preferences.5.xml:542
-#: apt_preferences.5.xml:600
+#: apt_preferences.5.xml:504 apt_preferences.5.xml:550
+#: apt_preferences.5.xml:608
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -8885,7 +8954,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:491
+#: apt_preferences.5.xml:499
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -8898,13 +8967,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:508
+#: apt_preferences.5.xml:516
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>paquet</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:510
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -8917,12 +8986,12 @@ msgstr ""
"de relancer la commande. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:514
+#: apt_preferences.5.xml:522
msgid "Tracking Testing or Unstable"
msgstr "Méthode pour suivre Testing ou Unstable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:523
+#: apt_preferences.5.xml:531
#, no-wrap
msgid ""
"Package: *\n"
@@ -8950,7 +9019,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:524
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -8967,7 +9036,7 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:545
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -8980,13 +9049,13 @@ msgstr ""
"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:565
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>paquet</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:556
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -9005,12 +9074,12 @@ msgstr ""
"installée. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:564
+#: apt_preferences.5.xml:572
msgid "Tracking the evolution of a codename release"
msgstr "Suivre l'évolution d'une version par son nom de code"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:578
+#: apt_preferences.5.xml:586
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -9044,7 +9113,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:566
+#: apt_preferences.5.xml:574
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -9068,7 +9137,7 @@ msgstr ""
"exemples précédents. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:595
+#: apt_preferences.5.xml:603
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -9081,13 +9150,13 @@ msgstr ""
"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:615
+#: apt_preferences.5.xml:623
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>paquet</replaceable>/sid\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:606
+#: apt_preferences.5.xml:614
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -9106,12 +9175,12 @@ msgstr ""
"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:624
+#: apt_preferences.5.xml:632
msgid "&file-preferences;"
msgstr "&file-preferences;"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:630
+#: apt_preferences.5.xml:638
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
diff --git a/doc/po/it.po b/doc/po/it.po
index fd2e2994e..917e7712f 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2010-01-20 12:18+0100\n"
+"POT-Creation-Date: 2010-02-18 20:53+0100\n"
"PO-Revision-Date: 2003-04-26 23:26+0100\n"
"Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n"
"Language-Team: <debian-l10n-italian@lists.debian.org>\n"
@@ -866,7 +866,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47
-#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125
+#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125
#: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40
#: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
#: sources.list.5.xml:33
@@ -1257,7 +1257,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
-#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
+#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89
#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
msgid "options"
msgstr ""
@@ -1281,7 +1281,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376
+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376
#: apt-sortpkgs.1.xml:58
msgid "<option>-s</option>"
msgstr ""
@@ -1302,12 +1302,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
msgid "<option>-q</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
msgid "<option>--quiet</option>"
msgstr ""
@@ -1356,7 +1356,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317 apt-cdrom.8.xml:131
+#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548
msgid "<option>-a</option>"
msgstr ""
@@ -1452,14 +1452,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:554
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1035 apt_preferences.5.xml:622
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:630
msgid "Files"
msgstr ""
@@ -1470,9 +1470,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569
#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637
#: sources.list.5.xml:233
msgid "See Also"
msgstr ""
@@ -1484,7 +1484,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:575
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr ""
@@ -1549,7 +1549,7 @@ msgstr ""
#: apt-cdrom.8.xml:66
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
-"unmount the CDROM device, prompt for a disk to be inserted and then procceed "
+"unmount the CDROM device, prompt for a disk to be inserted and then proceed "
"to scan it and copy the index files. If the disc does not have a proper "
"<filename>disk</filename> directory you will be prompted for a descriptive "
"title."
@@ -1589,7 +1589,7 @@ msgid "Options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328
+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328
msgid "<option>-d</option>"
msgstr ""
@@ -1733,7 +1733,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:53 apt-ftparchive.1.xml:71
+#: apt-config.8.xml:53 apt-ftparchive.1.xml:72
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given "
"one of the commands below must be present."
@@ -1784,7 +1784,7 @@ msgid "Just show the contents of the configuration space."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593
#: apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr ""
@@ -1893,6 +1893,7 @@ msgid ""
"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
"<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
+"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></"
"arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</"
"replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></"
"option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep="
@@ -1910,7 +1911,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:56
+#: apt-ftparchive.1.xml:57
msgid ""
"<command>apt-ftparchive</command> is the command line tool that generates "
"the index files that APT uses to access a distribution source. The index "
@@ -1919,7 +1920,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:60
+#: apt-ftparchive.1.xml:61
msgid ""
"<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
"program, incorporating its entire functionality via the <literal>packages</"
@@ -1929,7 +1930,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:66
+#: apt-ftparchive.1.xml:67
msgid ""
"Internally <command>apt-ftparchive</command> can make use of binary "
"databases to cache the contents of a .deb file and it does not rely on any "
@@ -1939,12 +1940,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:75
+#: apt-ftparchive.1.xml:76
msgid "packages"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:77
+#: apt-ftparchive.1.xml:78
msgid ""
"The packages command generates a package file from a directory tree. It "
"takes the given directory and recursively searches it for .deb files, "
@@ -1953,18 +1954,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106
+#: apt-ftparchive.1.xml:83 apt-ftparchive.1.xml:107
msgid ""
"The option <option>--db</option> can be used to specify a binary caching DB."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:85
+#: apt-ftparchive.1.xml:86
msgid "sources"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:87
+#: apt-ftparchive.1.xml:88
msgid ""
"The <literal>sources</literal> command generates a source index file from a "
"directory tree. It takes the given directory and recursively searches it "
@@ -1973,7 +1974,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:92
+#: apt-ftparchive.1.xml:93
msgid ""
"If an override file is specified then a source override file will be looked "
"for with an extension of .src. The --source-override option can be used to "
@@ -1981,12 +1982,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:97
+#: apt-ftparchive.1.xml:98
msgid "contents"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:99
+#: apt-ftparchive.1.xml:100
msgid ""
"The <literal>contents</literal> command generates a contents file from a "
"directory tree. It takes the given directory and recursively searches it "
@@ -1997,12 +1998,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:109
+#: apt-ftparchive.1.xml:110
msgid "release"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:111
+#: apt-ftparchive.1.xml:112
msgid ""
"The <literal>release</literal> command generates a Release file from a "
"directory tree. It recursively searches the given directory for Packages, "
@@ -2012,7 +2013,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:118
+#: apt-ftparchive.1.xml:119
msgid ""
"Values for the additional metadata fields in the Release file are taken from "
"the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -2024,13 +2025,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:128
+#: apt-ftparchive.1.xml:129
#, fuzzy
msgid "generate"
msgstr "Descrizione generale"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:130
+#: apt-ftparchive.1.xml:131
msgid ""
"The <literal>generate</literal> command is designed to be runnable from a "
"cron script and builds indexes according to the given config file. The "
@@ -2040,24 +2041,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:137 apt-get.8.xml:292
+#: apt-ftparchive.1.xml:138 apt-get.8.xml:292
msgid "clean"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:139
+#: apt-ftparchive.1.xml:140
msgid ""
"The <literal>clean</literal> command tidies the databases used by the given "
"configuration file by removing any records that are no longer necessary."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:145
+#: apt-ftparchive.1.xml:146
msgid "The Generate Configuration"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:147
+#: apt-ftparchive.1.xml:148
msgid ""
"The <literal>generate</literal> command uses a configuration file to "
"describe the archives that are going to be generated. It follows the typical "
@@ -2068,18 +2069,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:156
msgid ""
"The generate configuration has 4 separate sections, each described below."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:157
+#: apt-ftparchive.1.xml:158
msgid "Dir Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:159
+#: apt-ftparchive.1.xml:160
msgid ""
"The <literal>Dir</literal> section defines the standard directories needed "
"to locate the files required during the generation process. These "
@@ -2088,12 +2089,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:164
+#: apt-ftparchive.1.xml:165
msgid "ArchiveDir"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:166
+#: apt-ftparchive.1.xml:167
msgid ""
"Specifies the root of the FTP archive, in a standard Debian configuration "
"this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -2101,44 +2102,44 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:171
+#: apt-ftparchive.1.xml:172
msgid "OverrideDir"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:173
+#: apt-ftparchive.1.xml:174
msgid "Specifies the location of the override files."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:176
+#: apt-ftparchive.1.xml:177
msgid "CacheDir"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:178
+#: apt-ftparchive.1.xml:179
msgid "Specifies the location of the cache files"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:181
+#: apt-ftparchive.1.xml:182
msgid "FileListDir"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:183
+#: apt-ftparchive.1.xml:184
msgid ""
"Specifies the location of the file list files, if the <literal>FileList</"
"literal> setting is used below."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:189
+#: apt-ftparchive.1.xml:190
msgid "Default Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:191
+#: apt-ftparchive.1.xml:192
msgid ""
"The <literal>Default</literal> section specifies default values, and "
"settings that control the operation of the generator. Other sections may "
@@ -2146,12 +2147,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:195
+#: apt-ftparchive.1.xml:196
msgid "Packages::Compress"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:197
+#: apt-ftparchive.1.xml:198
msgid ""
"Sets the default compression schemes to use for the Package index files. It "
"is a string that contains a space separated list of at least one of: '.' (no "
@@ -2160,60 +2161,60 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:203
+#: apt-ftparchive.1.xml:204
msgid "Packages::Extensions"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:205
+#: apt-ftparchive.1.xml:206
msgid ""
"Sets the default list of file extensions that are package files. This "
"defaults to '.deb'."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:209
+#: apt-ftparchive.1.xml:210
msgid "Sources::Compress"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:211
+#: apt-ftparchive.1.xml:212
msgid ""
"This is similar to <literal>Packages::Compress</literal> except that it "
"controls the compression for the Sources files."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:215
+#: apt-ftparchive.1.xml:216
msgid "Sources::Extensions"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:217
+#: apt-ftparchive.1.xml:218
msgid ""
"Sets the default list of file extensions that are source files. This "
"defaults to '.dsc'."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:221
+#: apt-ftparchive.1.xml:222
msgid "Contents::Compress"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:223
+#: apt-ftparchive.1.xml:224
msgid ""
"This is similar to <literal>Packages::Compress</literal> except that it "
"controls the compression for the Contents files."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:227
+#: apt-ftparchive.1.xml:228
msgid "DeLinkLimit"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:229
+#: apt-ftparchive.1.xml:230
msgid ""
"Specifies the number of kilobytes to delink (and replace with hard links) "
"per run. This is used in conjunction with the per-section <literal>External-"
@@ -2221,24 +2222,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:234
+#: apt-ftparchive.1.xml:235
msgid "FileMode"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:236
+#: apt-ftparchive.1.xml:237
msgid ""
"Specifies the mode of all created index files. It defaults to 0644. All "
"index files are set to this mode with no regard to the umask."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:243
+#: apt-ftparchive.1.xml:244
msgid "TreeDefault Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:245
+#: apt-ftparchive.1.xml:246
msgid ""
"Sets defaults specific to <literal>Tree</literal> sections. All of these "
"variables are substitution variables and have the strings $(DIST), "
@@ -2246,12 +2247,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:250
+#: apt-ftparchive.1.xml:251
msgid "MaxContentsChange"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:252
+#: apt-ftparchive.1.xml:253
msgid ""
"Sets the number of kilobytes of contents files that are generated each day. "
"The contents files are round-robined so that over several days they will all "
@@ -2259,12 +2260,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:257
+#: apt-ftparchive.1.xml:258
msgid "ContentsAge"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:259
+#: apt-ftparchive.1.xml:260
msgid ""
"Controls the number of days a contents file is allowed to be checked without "
"changing. If this limit is passed the mtime of the contents file is updated. "
@@ -2275,60 +2276,60 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:268
+#: apt-ftparchive.1.xml:269
msgid "Directory"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:270
+#: apt-ftparchive.1.xml:271
msgid ""
"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
"$(SECTION)/binary-$(ARCH)/</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:274
+#: apt-ftparchive.1.xml:275
msgid "SrcDirectory"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:276
+#: apt-ftparchive.1.xml:277
msgid ""
"Sets the top of the source package directory tree. Defaults to <filename>"
"$(DIST)/$(SECTION)/source/</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406
+#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407
msgid "Packages"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:282
+#: apt-ftparchive.1.xml:283
msgid ""
"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
"binary-$(ARCH)/Packages</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411
+#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412
msgid "Sources"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:288
+#: apt-ftparchive.1.xml:289
msgid ""
"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
"source/Sources</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:292
+#: apt-ftparchive.1.xml:293
msgid "InternalPrefix"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:294
+#: apt-ftparchive.1.xml:295
msgid ""
"Sets the path prefix that causes a symlink to be considered an internal link "
"instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -2336,12 +2337,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417
+#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418
msgid "Contents"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:301
+#: apt-ftparchive.1.xml:302
msgid ""
"Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
"</filename>. If this setting causes multiple Packages files to map onto a "
@@ -2350,34 +2351,34 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:308
+#: apt-ftparchive.1.xml:309
msgid "Contents::Header"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:310
+#: apt-ftparchive.1.xml:311
msgid "Sets header file to prepend to the contents output."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442
+#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443
msgid "BinCacheDB"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:315
+#: apt-ftparchive.1.xml:316
msgid ""
"Sets the binary cache database to use for this section. Multiple sections "
"can share the same database."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319
+#: apt-ftparchive.1.xml:320
msgid "FileList"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:322
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -2385,12 +2386,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:326
+#: apt-ftparchive.1.xml:327
msgid "SourceFileList"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:328
+#: apt-ftparchive.1.xml:329
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -2399,12 +2400,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:336
+#: apt-ftparchive.1.xml:337
msgid "Tree Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:338
+#: apt-ftparchive.1.xml:339
msgid ""
"The <literal>Tree</literal> section defines a standard Debian file tree "
"which consists of a base directory, then multiple sections in that base "
@@ -2414,7 +2415,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:343
+#: apt-ftparchive.1.xml:344
msgid ""
"The <literal>Tree</literal> section takes a scope tag which sets the "
"<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -2423,7 +2424,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:348
+#: apt-ftparchive.1.xml:349
msgid ""
"All of the settings defined in the <literal>TreeDefault</literal> section "
"can be use in a <literal>Tree</literal> section as well as three new "
@@ -2431,7 +2432,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:354
+#: apt-ftparchive.1.xml:355
#, no-wrap
msgid ""
"for i in Sections do \n"
@@ -2441,7 +2442,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
+#: apt-ftparchive.1.xml:352
msgid ""
"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
"command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -2449,12 +2450,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:360
+#: apt-ftparchive.1.xml:361
msgid "Sections"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:362
+#: apt-ftparchive.1.xml:363
msgid ""
"This is a space separated list of sections which appear under the "
"distribution, typically this is something like <literal>main contrib non-"
@@ -2462,12 +2463,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:367
+#: apt-ftparchive.1.xml:368
msgid "Architectures"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:369
+#: apt-ftparchive.1.xml:370
msgid ""
"This is a space separated list of all the architectures that appear under "
"search section. The special architecture 'source' is used to indicate that "
@@ -2475,56 +2476,56 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422
+#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423
msgid "BinOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:376
+#: apt-ftparchive.1.xml:377
msgid ""
"Sets the binary override file. The override file contains section, priority "
"and maintainer address information."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427
+#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428
msgid "SrcOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:382
+#: apt-ftparchive.1.xml:383
msgid ""
"Sets the source override file. The override file contains section "
"information."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432
+#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433
msgid "ExtraOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434
+#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435
msgid "Sets the binary extra override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437
+#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438
msgid "SrcExtraOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439
+#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440
msgid "Sets the source extra override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:398
+#: apt-ftparchive.1.xml:399
msgid "BinDirectory Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:400
+#: apt-ftparchive.1.xml:401
msgid ""
"The <literal>bindirectory</literal> section defines a binary directory tree "
"with no special structure. The scope tag specifies the location of the "
@@ -2534,64 +2535,64 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:408
+#: apt-ftparchive.1.xml:409
msgid "Sets the Packages file output."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:413
+#: apt-ftparchive.1.xml:414
msgid ""
"Sets the Sources file output. At least one of <literal>Packages</literal> or "
"<literal>Sources</literal> is required."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:419
+#: apt-ftparchive.1.xml:420
msgid "Sets the Contents file output. (optional)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:424
+#: apt-ftparchive.1.xml:425
msgid "Sets the binary override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:429
+#: apt-ftparchive.1.xml:430
msgid "Sets the source override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:444
+#: apt-ftparchive.1.xml:445
msgid "Sets the cache DB."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:447
+#: apt-ftparchive.1.xml:448
msgid "PathPrefix"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:449
+#: apt-ftparchive.1.xml:450
msgid "Appends a path to all the output paths."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:452
+#: apt-ftparchive.1.xml:453
msgid "FileList, SourceFileList"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:454
+#: apt-ftparchive.1.xml:455
msgid "Specifies the file list file."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:461
+#: apt-ftparchive.1.xml:462
msgid "The Binary Override File"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:463
msgid ""
"The binary override file is fully compatible with &dpkg-scanpackages;. It "
"contains 4 fields separated by spaces. The first field is the package name, "
@@ -2601,19 +2602,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:469
#, no-wrap
msgid "old [// oldn]* => new"
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:470
+#: apt-ftparchive.1.xml:471
#, no-wrap
msgid "new"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:467
+#: apt-ftparchive.1.xml:468
msgid ""
"The general form of the maintainer field is: <placeholder type="
"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -2624,12 +2625,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:478
+#: apt-ftparchive.1.xml:479
msgid "The Source Override File"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:480
+#: apt-ftparchive.1.xml:481
msgid ""
"The source override file is fully compatible with &dpkg-scansources;. It "
"contains 2 fields separated by spaces. The first fields is the source "
@@ -2637,12 +2638,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:485
+#: apt-ftparchive.1.xml:486
msgid "The Extra Override File"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:488
msgid ""
"The extra override file allows any arbitrary tag to be added or replaced in "
"the output. It has 3 columns, the first is the package, the second is the "
@@ -2650,12 +2651,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:496
+#: apt-ftparchive.1.xml:497
msgid "<option>--md5</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:498
+#: apt-ftparchive.1.xml:499
msgid ""
"Generate MD5 sums. This defaults to on, when turned off the generated index "
"files will not have MD5Sum fields where possible. Configuration Item: "
@@ -2663,19 +2664,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:503
+#: apt-ftparchive.1.xml:504
msgid "<option>--db</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:505
+#: apt-ftparchive.1.xml:506
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:512
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -2684,12 +2685,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:517
+#: apt-ftparchive.1.xml:518
msgid "<option>--delink</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:519
+#: apt-ftparchive.1.xml:520
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
"then this option actually enables delinking of the files. It defaults to on "
@@ -2698,12 +2699,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:525
+#: apt-ftparchive.1.xml:526
msgid "<option>--contents</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:527
+#: apt-ftparchive.1.xml:528
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -2713,12 +2714,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:535
+#: apt-ftparchive.1.xml:536
msgid "<option>--source-override</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:538
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
"command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -2726,26 +2727,40 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:541
+#: apt-ftparchive.1.xml:542
msgid "<option>--readonly</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:543
+#: apt-ftparchive.1.xml:544
msgid ""
"Make the caching databases read only. Configuration Item: <literal>APT::"
"FTPArchive::ReadOnlyDB</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:547
-msgid "<option>APT::FTPArchive::AlwaysStat</option>"
+#: apt-ftparchive.1.xml:548
+msgid "<option>--arch</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:549
msgid ""
-"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If "
+"Accept in the <literal>packages</literal> and <literal>contents</literal> "
+"commands only package files matching <literal>*_arch.deb</literal> or "
+"<literal>*_all.deb</literal> instead of all package files in the given "
+"path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:555
+msgid "<option>APT::FTPArchive::AlwaysStat</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:557
+msgid ""
+"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
"packages are recompiled and/or republished with the same version again, this "
"will lead to problems as the now outdated cached metadata like size and "
"checksums will be used. With this option enabled this will no longer happen "
@@ -2757,12 +2772,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:559
+#: apt-ftparchive.1.xml:567
msgid "<option>APT::FTPArchive::LongDescription</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:569
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -2772,26 +2787,26 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469
+#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477
#: sources.list.5.xml:193
msgid "Examples"
msgstr ""
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:579
+#: apt-ftparchive.1.xml:587
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:575
+#: apt-ftparchive.1.xml:583
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:589
+#: apt-ftparchive.1.xml:597
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -5844,7 +5859,8 @@ msgstr ""
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt_preferences.5.xml:13
-msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>"
+msgid ""
+"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
@@ -5892,6 +5908,17 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:56
msgid ""
+"Preferences are a strong power in the hands of a system administrator but "
+"they can become also their biggest nightmare if used without care! APT will "
+"not questioning the preferences so wrong settings will therefore lead to "
+"uninstallable packages or wrong decisions while upgrading packages. Even "
+"more problems will arise if multiply distribution releases are mixed without "
+"a good understanding of the following paragraphs. You have been warned."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_preferences.5.xml:64
+msgid ""
"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
"directory are parsed in alphanumeric ascending order and need to obey the "
"following naming convention: The files have no or \"<literal>pref</literal>"
@@ -5901,24 +5928,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:63
+#: apt_preferences.5.xml:71
msgid "APT's Default Priority Assignments"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:78
+#: apt_preferences.5.xml:86
#, no-wrap
msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml:89
#, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:65
+#: apt_preferences.5.xml:73
msgid ""
"If there is no preferences file or if there is no entry in the file that "
"applies to a particular version then the priority assigned to that version "
@@ -5934,40 +5961,40 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:90
+#: apt_preferences.5.xml:98
msgid "priority 100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:91
+#: apt_preferences.5.xml:99
msgid "to the version that is already installed (if any)."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:95
+#: apt_preferences.5.xml:103
msgid "priority 500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:96
+#: apt_preferences.5.xml:104
msgid ""
"to the versions that are not installed and do not belong to the target "
"release."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:100
+#: apt_preferences.5.xml:108
msgid "priority 990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:101
+#: apt_preferences.5.xml:109
msgid ""
"to the versions that are not installed and belong to the target release."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:85
+#: apt_preferences.5.xml:93
msgid ""
"If the target release has been specified then APT uses the following "
"algorithm to set the priorities of the versions of a package. Assign: "
@@ -5975,7 +6002,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:114
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -5983,14 +6010,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:110
+#: apt_preferences.5.xml:118
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:113
+#: apt_preferences.5.xml:121
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -6000,19 +6027,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:119
+#: apt_preferences.5.xml:127
msgid "Install the highest priority version."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:120
+#: apt_preferences.5.xml:128
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:131
msgid ""
"If two or more versions have the same priority and version number but either "
"the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -6020,7 +6047,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:137
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
"is not as recent as one of the versions available from the sources listed in "
@@ -6030,7 +6057,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:136
+#: apt_preferences.5.xml:144
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
"recent than any of the other available versions. The package will not be "
@@ -6039,7 +6066,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml:149
msgid ""
"Sometimes the installed version of a package is more recent than the version "
"belonging to the target release, but not as recent as a version belonging to "
@@ -6051,12 +6078,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:150
+#: apt_preferences.5.xml:158
msgid "The Effect of APT Preferences"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:152
+#: apt_preferences.5.xml:160
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -6065,7 +6092,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:166
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
"specified packages and specified version or version range. For example, the "
@@ -6075,7 +6102,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:165
+#: apt_preferences.5.xml:173
#, no-wrap
msgid ""
"Package: perl\n"
@@ -6084,7 +6111,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:171
+#: apt_preferences.5.xml:179
msgid ""
"The general form assigns a priority to all of the package versions in a "
"given distribution (that is, to all the versions of packages that are listed "
@@ -6094,7 +6121,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:177
+#: apt_preferences.5.xml:185
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
"of packages. For example, the following record assigns a high priority to "
@@ -6102,7 +6129,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:182
+#: apt_preferences.5.xml:190
#, no-wrap
msgid ""
"Package: *\n"
@@ -6111,7 +6138,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:187
+#: apt_preferences.5.xml:195
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
"This should not be confused with the Origin of a distribution as specified "
@@ -6121,7 +6148,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:193
+#: apt_preferences.5.xml:201
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -6129,7 +6156,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:197
+#: apt_preferences.5.xml:205
#, no-wrap
msgid ""
"Package: *\n"
@@ -6138,7 +6165,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:210
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
@@ -6146,7 +6173,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:206
+#: apt_preferences.5.xml:214
#, no-wrap
msgid ""
"Package: *\n"
@@ -6155,7 +6182,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:211
+#: apt_preferences.5.xml:219
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -6163,7 +6190,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:216
+#: apt_preferences.5.xml:224
#, no-wrap
msgid ""
"Package: *\n"
@@ -6172,82 +6199,82 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:227
+#: apt_preferences.5.xml:235
msgid "How APT Interprets Priorities"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:243
msgid "P &gt; 1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:236
+#: apt_preferences.5.xml:244
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:248
msgid "990 &lt; P &lt;=1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:241
+#: apt_preferences.5.xml:249
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:246
+#: apt_preferences.5.xml:254
msgid "500 &lt; P &lt;=990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:247
+#: apt_preferences.5.xml:255
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:252
+#: apt_preferences.5.xml:260
msgid "100 &lt; P &lt;=500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:253
+#: apt_preferences.5.xml:261
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:258
+#: apt_preferences.5.xml:266
msgid "0 &lt; P &lt;=100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:259
+#: apt_preferences.5.xml:267
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:263
+#: apt_preferences.5.xml:271
msgid "P &lt; 0"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:272
msgid "prevents the version from being installed"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:230
+#: apt_preferences.5.xml:238
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -6255,7 +6282,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:269
+#: apt_preferences.5.xml:277
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -6264,14 +6291,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:283
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:279
+#: apt_preferences.5.xml:287
#, no-wrap
msgid ""
"Package: perl\n"
@@ -6288,12 +6315,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:292
+#: apt_preferences.5.xml:300
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:294
+#: apt_preferences.5.xml:302
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -6303,7 +6330,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:299
+#: apt_preferences.5.xml:307
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -6311,7 +6338,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:303
+#: apt_preferences.5.xml:311
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -6320,12 +6347,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:313
+#: apt_preferences.5.xml:321
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:323
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6333,27 +6360,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:327
+#: apt_preferences.5.xml:335
msgid "the <literal>Package:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:336
msgid "gives the package name"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:331 apt_preferences.5.xml:381
+#: apt_preferences.5.xml:339 apt_preferences.5.xml:389
msgid "the <literal>Version:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:332
+#: apt_preferences.5.xml:340
msgid "gives the version number for the named package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:319
+#: apt_preferences.5.xml:327
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6366,12 +6393,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:356
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:349
+#: apt_preferences.5.xml:357
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6382,18 +6409,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:367
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:365
+#: apt_preferences.5.xml:373
msgid "the <literal>Codename:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:366
+#: apt_preferences.5.xml:374
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: squeeze\" specifies that all of the "
@@ -6403,13 +6430,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:383
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:382
+#: apt_preferences.5.xml:390
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -6419,7 +6446,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:391
+#: apt_preferences.5.xml:399
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -6428,12 +6455,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:400
+#: apt_preferences.5.xml:408
msgid "the <literal>Component:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:409
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -6444,18 +6471,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:418
#, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:424
msgid "the <literal>Origin:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:417
+#: apt_preferences.5.xml:425
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6464,18 +6491,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:423
+#: apt_preferences.5.xml:431
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:429
+#: apt_preferences.5.xml:437
msgid "the <literal>Label:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:430
+#: apt_preferences.5.xml:438
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6484,13 +6511,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:444
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:345
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6503,7 +6530,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:443
+#: apt_preferences.5.xml:451
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -6518,12 +6545,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:456
+#: apt_preferences.5.xml:464
msgid "Optional Lines in an APT Preferences Record"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:458
+#: apt_preferences.5.xml:466
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -6531,7 +6558,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:462
+#: apt_preferences.5.xml:470
msgid ""
"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
"optional. If omitted, APT assigns a priority of 1 less than the last value "
@@ -6540,12 +6567,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:471
+#: apt_preferences.5.xml:479
msgid "Tracking Stable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:487
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6560,7 +6587,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:473
+#: apt_preferences.5.xml:481
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6570,8 +6597,8 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:496 apt_preferences.5.xml:542
-#: apt_preferences.5.xml:600
+#: apt_preferences.5.xml:504 apt_preferences.5.xml:550
+#: apt_preferences.5.xml:608
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -6580,7 +6607,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:491
+#: apt_preferences.5.xml:499
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6589,13 +6616,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:508
+#: apt_preferences.5.xml:516
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:510
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -6604,12 +6631,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:514
+#: apt_preferences.5.xml:522
msgid "Tracking Testing or Unstable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:523
+#: apt_preferences.5.xml:531
#, no-wrap
msgid ""
"Package: *\n"
@@ -6626,7 +6653,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:524
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -6637,7 +6664,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:545
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6646,13 +6673,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:565
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:556
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -6664,12 +6691,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:564
+#: apt_preferences.5.xml:572
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:578
+#: apt_preferences.5.xml:586
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6689,7 +6716,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:566
+#: apt_preferences.5.xml:574
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6704,7 +6731,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:595
+#: apt_preferences.5.xml:603
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -6713,13 +6740,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:615
+#: apt_preferences.5.xml:623
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:606
+#: apt_preferences.5.xml:614
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -6731,12 +6758,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:624
+#: apt_preferences.5.xml:632
msgid "&file-preferences;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:630
+#: apt_preferences.5.xml:638
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr ""
diff --git a/doc/po/ja.po b/doc/po/ja.po
index f1a766d97..80ff82081 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-01-20 12:18+0100\n"
+"POT-Creation-Date: 2010-02-18 20:53+0100\n"
"PO-Revision-Date: 2009-07-30 22:55+0900\n"
"Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1222,7 +1222,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47
-#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125
+#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125
#: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40
#: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
#: sources.list.5.xml:33
@@ -1786,7 +1786,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
-#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
+#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89
#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
msgid "options"
msgstr "オプション"
@@ -1814,7 +1814,7 @@ msgstr ""
"pkgcache</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376
+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376
#: apt-sortpkgs.1.xml:58
msgid "<option>-s</option>"
msgstr "<option>-s</option>"
@@ -1841,12 +1841,12 @@ msgstr ""
"<literal>Dir::Cache::srcpkgcache</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
msgid "<option>-q</option>"
msgstr "<option>-q</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
msgid "<option>--quiet</option>"
msgstr "<option>--quiet</option>"
@@ -1907,7 +1907,7 @@ msgstr ""
"ShowFull</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317 apt-cdrom.8.xml:131
+#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548
msgid "<option>-a</option>"
msgstr "<option>-a</option>"
@@ -2029,7 +2029,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:554
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
@@ -2037,7 +2037,7 @@ msgstr "&apt-commonoptions;"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1035 apt_preferences.5.xml:622
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:630
msgid "Files"
msgstr "ファイル"
@@ -2049,9 +2049,9 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569
#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637
#: sources.list.5.xml:233
msgid "See Also"
msgstr "関連項目"
@@ -2065,7 +2065,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:575
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr "診断メッセージ"
@@ -2151,9 +2151,16 @@ msgstr "add"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:66
+#, fuzzy
+#| msgid ""
+#| "<literal>add</literal> is used to add a new disc to the source list. It "
+#| "will unmount the CDROM device, prompt for a disk to be inserted and then "
+#| "procceed to scan it and copy the index files. If the disc does not have a "
+#| "proper <filename>disk</filename> directory you will be prompted for a "
+#| "descriptive title."
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
-"unmount the CDROM device, prompt for a disk to be inserted and then procceed "
+"unmount the CDROM device, prompt for a disk to be inserted and then proceed "
"to scan it and copy the index files. If the disc does not have a proper "
"<filename>disk</filename> directory you will be prompted for a descriptive "
"title."
@@ -2208,7 +2215,7 @@ msgid "Options"
msgstr "オプション"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328
+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328
msgid "<option>-d</option>"
msgstr "<option>-d</option>"
@@ -2395,7 +2402,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:53 apt-ftparchive.1.xml:71
+#: apt-config.8.xml:53 apt-ftparchive.1.xml:72
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given "
"one of the commands below must be present."
@@ -2466,7 +2473,7 @@ msgstr "設定箇所の内容を表示するだけです。"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593
#: apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr "&apt-conf;"
@@ -2638,6 +2645,7 @@ msgid ""
"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
"<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
+"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></"
"arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</"
"replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></"
"option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep="
@@ -2673,7 +2681,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:56
+#: apt-ftparchive.1.xml:57
msgid ""
"<command>apt-ftparchive</command> is the command line tool that generates "
"the index files that APT uses to access a distribution source. The index "
@@ -2686,7 +2694,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:60
+#: apt-ftparchive.1.xml:61
msgid ""
"<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
"program, incorporating its entire functionality via the <literal>packages</"
@@ -2701,7 +2709,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:66
+#: apt-ftparchive.1.xml:67
msgid ""
"Internally <command>apt-ftparchive</command> can make use of binary "
"databases to cache the contents of a .deb file and it does not rely on any "
@@ -2716,13 +2724,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:75
+#: apt-ftparchive.1.xml:76
msgid "packages"
msgstr "packages"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:77
+#: apt-ftparchive.1.xml:78
msgid ""
"The packages command generates a package file from a directory tree. It "
"takes the given directory and recursively searches it for .deb files, "
@@ -2736,20 +2744,20 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106
+#: apt-ftparchive.1.xml:83 apt-ftparchive.1.xml:107
msgid ""
"The option <option>--db</option> can be used to specify a binary caching DB."
msgstr "<option>--db</option> オプションで、キャッシュ DB を指定できます。"
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:85
+#: apt-ftparchive.1.xml:86
msgid "sources"
msgstr "sources"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:87
+#: apt-ftparchive.1.xml:88
msgid ""
"The <literal>sources</literal> command generates a source index file from a "
"directory tree. It takes the given directory and recursively searches it "
@@ -2763,7 +2771,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:92
+#: apt-ftparchive.1.xml:93
msgid ""
"If an override file is specified then a source override file will be looked "
"for with an extension of .src. The --source-override option can be used to "
@@ -2774,13 +2782,13 @@ msgstr ""
"override オプションを使用します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:97
+#: apt-ftparchive.1.xml:98
msgid "contents"
msgstr "contents"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:99
+#: apt-ftparchive.1.xml:100
msgid ""
"The <literal>contents</literal> command generates a contents file from a "
"directory tree. It takes the given directory and recursively searches it "
@@ -2797,13 +2805,13 @@ msgstr ""
"で出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:109
+#: apt-ftparchive.1.xml:110
msgid "release"
msgstr "release"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:111
+#: apt-ftparchive.1.xml:112
msgid ""
"The <literal>release</literal> command generates a Release file from a "
"directory tree. It recursively searches the given directory for Packages, "
@@ -2819,7 +2827,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:118
+#: apt-ftparchive.1.xml:119
msgid ""
"Values for the additional metadata fields in the Release file are taken from "
"the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -2838,13 +2846,13 @@ msgstr ""
"<literal>Description</literal> です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:128
+#: apt-ftparchive.1.xml:129
msgid "generate"
msgstr "generate"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:130
+#: apt-ftparchive.1.xml:131
msgid ""
"The <literal>generate</literal> command is designed to be runnable from a "
"cron script and builds indexes according to the given config file. The "
@@ -2858,13 +2866,13 @@ msgstr ""
"のディレクトリから作成するかを指定する、柔軟な方法を提供します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:137 apt-get.8.xml:292
+#: apt-ftparchive.1.xml:138 apt-get.8.xml:292
msgid "clean"
msgstr "clean"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:139
+#: apt-ftparchive.1.xml:140
msgid ""
"The <literal>clean</literal> command tidies the databases used by the given "
"configuration file by removing any records that are no longer necessary."
@@ -2874,13 +2882,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:145
+#: apt-ftparchive.1.xml:146
msgid "The Generate Configuration"
msgstr "Generate 設定"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:147
+#: apt-ftparchive.1.xml:148
msgid ""
"The <literal>generate</literal> command uses a configuration file to "
"describe the archives that are going to be generated. It follows the typical "
@@ -2898,7 +2906,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:156
msgid ""
"The generate configuration has 4 separate sections, each described below."
msgstr ""
@@ -2907,13 +2915,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:157
+#: apt-ftparchive.1.xml:158
msgid "Dir Section"
msgstr "Dir セクション"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:159
+#: apt-ftparchive.1.xml:160
#, fuzzy
#| msgid ""
#| "The <literal>Dir</literal> section defines the standard directories "
@@ -2932,13 +2940,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:164
+#: apt-ftparchive.1.xml:165
msgid "ArchiveDir"
msgstr "ArchiveDir"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:166
+#: apt-ftparchive.1.xml:167
msgid ""
"Specifies the root of the FTP archive, in a standard Debian configuration "
"this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -2948,36 +2956,36 @@ msgstr ""
"リには <filename>ls-LR</filename> と dist ノードがあります。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:171
+#: apt-ftparchive.1.xml:172
msgid "OverrideDir"
msgstr "OverrideDir"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:173
+#: apt-ftparchive.1.xml:174
msgid "Specifies the location of the override files."
msgstr "オーバーライドファイルの場所を指定します。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:176
+#: apt-ftparchive.1.xml:177
msgid "CacheDir"
msgstr "CacheDir"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:178
+#: apt-ftparchive.1.xml:179
msgid "Specifies the location of the cache files"
msgstr "キャッシュファイルの場所を指定します。"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:181
+#: apt-ftparchive.1.xml:182
msgid "FileListDir"
msgstr "FileListDir"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:183
+#: apt-ftparchive.1.xml:184
msgid ""
"Specifies the location of the file list files, if the <literal>FileList</"
"literal> setting is used below."
@@ -2987,13 +2995,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:189
+#: apt-ftparchive.1.xml:190
msgid "Default Section"
msgstr "Default セクション"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:191
+#: apt-ftparchive.1.xml:192
msgid ""
"The <literal>Default</literal> section specifies default values, and "
"settings that control the operation of the generator. Other sections may "
@@ -3005,13 +3013,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:195
+#: apt-ftparchive.1.xml:196
msgid "Packages::Compress"
msgstr "Packages::Compress"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:197
+#: apt-ftparchive.1.xml:198
msgid ""
"Sets the default compression schemes to use for the Package index files. It "
"is a string that contains a space separated list of at least one of: '.' (no "
@@ -3023,13 +3031,13 @@ msgstr ""
"法のデフォルトはすべて '. gzip' です。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:203
+#: apt-ftparchive.1.xml:204
msgid "Packages::Extensions"
msgstr "Packages::Extensions"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:205
+#: apt-ftparchive.1.xml:206
msgid ""
"Sets the default list of file extensions that are package files. This "
"defaults to '.deb'."
@@ -3038,13 +3046,13 @@ msgstr ""
"deb' です。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:209
+#: apt-ftparchive.1.xml:210
msgid "Sources::Compress"
msgstr "Sources::Compress"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:211
+#: apt-ftparchive.1.xml:212
msgid ""
"This is similar to <literal>Packages::Compress</literal> except that it "
"controls the compression for the Sources files."
@@ -3053,13 +3061,13 @@ msgstr ""
"指定します。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:215
+#: apt-ftparchive.1.xml:216
msgid "Sources::Extensions"
msgstr "Sources::Extensions"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:217
+#: apt-ftparchive.1.xml:218
msgid ""
"Sets the default list of file extensions that are source files. This "
"defaults to '.dsc'."
@@ -3068,13 +3076,13 @@ msgstr ""
"す。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:221
+#: apt-ftparchive.1.xml:222
msgid "Contents::Compress"
msgstr "Contents::Compress"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:223
+#: apt-ftparchive.1.xml:224
msgid ""
"This is similar to <literal>Packages::Compress</literal> except that it "
"controls the compression for the Contents files."
@@ -3083,13 +3091,13 @@ msgstr ""
"指定します。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:227
+#: apt-ftparchive.1.xml:228
msgid "DeLinkLimit"
msgstr "DeLinkLimit"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:229
+#: apt-ftparchive.1.xml:230
msgid ""
"Specifies the number of kilobytes to delink (and replace with hard links) "
"per run. This is used in conjunction with the per-section <literal>External-"
@@ -3101,13 +3109,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:234
+#: apt-ftparchive.1.xml:235
msgid "FileMode"
msgstr "FileMode"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:236
+#: apt-ftparchive.1.xml:237
msgid ""
"Specifies the mode of all created index files. It defaults to 0644. All "
"index files are set to this mode with no regard to the umask."
@@ -3117,13 +3125,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:243
+#: apt-ftparchive.1.xml:244
msgid "TreeDefault Section"
msgstr "TreeDefault セクション"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:245
+#: apt-ftparchive.1.xml:246
msgid ""
"Sets defaults specific to <literal>Tree</literal> sections. All of these "
"variables are substitution variables and have the strings $(DIST), "
@@ -3134,13 +3142,13 @@ msgstr ""
"に展開します。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:250
+#: apt-ftparchive.1.xml:251
msgid "MaxContentsChange"
msgstr "MaxContentsChange"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:252
+#: apt-ftparchive.1.xml:253
msgid ""
"Sets the number of kilobytes of contents files that are generated each day. "
"The contents files are round-robined so that over several days they will all "
@@ -3151,13 +3159,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:257
+#: apt-ftparchive.1.xml:258
msgid "ContentsAge"
msgstr "ContentsAge"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:259
+#: apt-ftparchive.1.xml:260
msgid ""
"Controls the number of days a contents file is allowed to be checked without "
"changing. If this limit is passed the mtime of the contents file is updated. "
@@ -3174,13 +3182,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:268
+#: apt-ftparchive.1.xml:269
msgid "Directory"
msgstr "Directory"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:270
+#: apt-ftparchive.1.xml:271
msgid ""
"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
"$(SECTION)/binary-$(ARCH)/</filename>"
@@ -3190,13 +3198,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:274
+#: apt-ftparchive.1.xml:275
msgid "SrcDirectory"
msgstr "SrcDirectory"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:276
+#: apt-ftparchive.1.xml:277
msgid ""
"Sets the top of the source package directory tree. Defaults to <filename>"
"$(DIST)/$(SECTION)/source/</filename>"
@@ -3206,13 +3214,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406
+#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407
msgid "Packages"
msgstr "Packages"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:282
+#: apt-ftparchive.1.xml:283
msgid ""
"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
"binary-$(ARCH)/Packages</filename>"
@@ -3222,13 +3230,13 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411
+#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412
msgid "Sources"
msgstr "Sources"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:288
+#: apt-ftparchive.1.xml:289
#, fuzzy
#| msgid ""
#| "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
@@ -3241,13 +3249,13 @@ msgstr ""
"$(SECTION)/source/Sources</filename> です。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:292
+#: apt-ftparchive.1.xml:293
msgid "InternalPrefix"
msgstr "InternalPrefix"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:294
+#: apt-ftparchive.1.xml:295
msgid ""
"Sets the path prefix that causes a symlink to be considered an internal link "
"instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -3258,13 +3266,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417
+#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418
msgid "Contents"
msgstr "Contents"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:301
+#: apt-ftparchive.1.xml:302
msgid ""
"Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
"</filename>. If this setting causes multiple Packages files to map onto a "
@@ -3277,24 +3285,24 @@ msgstr ""
"ftparchive</command> は自動でパッケージファイルをまとめます。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:308
+#: apt-ftparchive.1.xml:309
msgid "Contents::Header"
msgstr "Contents::Header"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:310
+#: apt-ftparchive.1.xml:311
msgid "Sets header file to prepend to the contents output."
msgstr "contents の出力に付けるヘッダファイルを設定します。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442
+#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443
msgid "BinCacheDB"
msgstr "BinCacheDB"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:315
+#: apt-ftparchive.1.xml:316
msgid ""
"Sets the binary cache database to use for this section. Multiple sections "
"can share the same database."
@@ -3304,13 +3312,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319
+#: apt-ftparchive.1.xml:320
msgid "FileList"
msgstr "FileList"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:322
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -3322,13 +3330,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:326
+#: apt-ftparchive.1.xml:327
msgid "SourceFileList"
msgstr "SourceFileList"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:328
+#: apt-ftparchive.1.xml:329
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -3341,13 +3349,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:336
+#: apt-ftparchive.1.xml:337
msgid "Tree Section"
msgstr "Tree セクション"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:338
+#: apt-ftparchive.1.xml:339
msgid ""
"The <literal>Tree</literal> section defines a standard Debian file tree "
"which consists of a base directory, then multiple sections in that base "
@@ -3362,7 +3370,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:343
+#: apt-ftparchive.1.xml:344
msgid ""
"The <literal>Tree</literal> section takes a scope tag which sets the "
"<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -3376,7 +3384,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:348
+#: apt-ftparchive.1.xml:349
msgid ""
"All of the settings defined in the <literal>TreeDefault</literal> section "
"can be use in a <literal>Tree</literal> section as well as three new "
@@ -3387,7 +3395,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:354
+#: apt-ftparchive.1.xml:355
#, fuzzy, no-wrap
#| msgid ""
#| "for i in Sections do \n"
@@ -3405,7 +3413,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><informalexample>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
+#: apt-ftparchive.1.xml:352
#, fuzzy
#| msgid ""
#| "When processing a <literal>Tree</literal> section <command>apt-"
@@ -3420,13 +3428,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:360
+#: apt-ftparchive.1.xml:361
msgid "Sections"
msgstr "Sections"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:362
+#: apt-ftparchive.1.xml:363
msgid ""
"This is a space separated list of sections which appear under the "
"distribution, typically this is something like <literal>main contrib non-"
@@ -3437,13 +3445,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:367
+#: apt-ftparchive.1.xml:368
msgid "Architectures"
msgstr "Architectures"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:369
+#: apt-ftparchive.1.xml:370
msgid ""
"This is a space separated list of all the architectures that appear under "
"search section. The special architecture 'source' is used to indicate that "
@@ -3455,13 +3463,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422
+#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423
msgid "BinOverride"
msgstr "BinOverride"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:376
+#: apt-ftparchive.1.xml:377
msgid ""
"Sets the binary override file. The override file contains section, priority "
"and maintainer address information."
@@ -3471,13 +3479,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427
+#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428
msgid "SrcOverride"
msgstr "SrcOverride"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:382
+#: apt-ftparchive.1.xml:383
msgid ""
"Sets the source override file. The override file contains section "
"information."
@@ -3487,37 +3495,37 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432
+#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433
msgid "ExtraOverride"
msgstr "ExtraOverride"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434
+#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435
msgid "Sets the binary extra override file."
msgstr "バイナリ特別オーバーライドファイルを設定します。"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437
+#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438
msgid "SrcExtraOverride"
msgstr "SrcExtraOverride"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439
+#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440
msgid "Sets the source extra override file."
msgstr "ソース特別オーバーライドファイルを設定します。"
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:398
+#: apt-ftparchive.1.xml:399
msgid "BinDirectory Section"
msgstr "BinDirectory セクション"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:400
+#: apt-ftparchive.1.xml:401
msgid ""
"The <literal>bindirectory</literal> section defines a binary directory tree "
"with no special structure. The scope tag specifies the location of the "
@@ -3532,13 +3540,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:408
+#: apt-ftparchive.1.xml:409
msgid "Sets the Packages file output."
msgstr "Packages ファイルの出力先を設定します。"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:413
+#: apt-ftparchive.1.xml:414
msgid ""
"Sets the Sources file output. At least one of <literal>Packages</literal> or "
"<literal>Sources</literal> is required."
@@ -3548,59 +3556,59 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:419
+#: apt-ftparchive.1.xml:420
msgid "Sets the Contents file output. (optional)"
msgstr "Contents ファイルの出力先を設定します。(オプション)"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:424
+#: apt-ftparchive.1.xml:425
msgid "Sets the binary override file."
msgstr "バイナリオーバーライドファイルを設定します。"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:429
+#: apt-ftparchive.1.xml:430
msgid "Sets the source override file."
msgstr "ソースオーバーライドファイルを設定します。"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:444
+#: apt-ftparchive.1.xml:445
msgid "Sets the cache DB."
msgstr "キャッシュ DB を設定します。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:447
+#: apt-ftparchive.1.xml:448
msgid "PathPrefix"
msgstr "PathPrefix"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:449
+#: apt-ftparchive.1.xml:450
msgid "Appends a path to all the output paths."
msgstr "全出力パスに付加するパス。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:452
+#: apt-ftparchive.1.xml:453
msgid "FileList, SourceFileList"
msgstr "FileList, SourceFileList"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:454
+#: apt-ftparchive.1.xml:455
msgid "Specifies the file list file."
msgstr "ファイル一覧ファイルを指定します。"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:461
+#: apt-ftparchive.1.xml:462
msgid "The Binary Override File"
msgstr "バイナリオーバーライドファイル"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:463
msgid ""
"The binary override file is fully compatible with &dpkg-scanpackages;. It "
"contains 4 fields separated by spaces. The first field is the package name, "
@@ -3615,20 +3623,20 @@ msgstr ""
"す。"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:469
#, no-wrap
msgid "old [// oldn]* => new"
msgstr "old [// oldn]* => new"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:470
+#: apt-ftparchive.1.xml:471
#, no-wrap
msgid "new"
msgstr "new"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:467
+#: apt-ftparchive.1.xml:468
msgid ""
"The general form of the maintainer field is: <placeholder type="
"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -3646,13 +3654,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:478
+#: apt-ftparchive.1.xml:479
msgid "The Source Override File"
msgstr "ソースオーバーライドファイル"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:480
+#: apt-ftparchive.1.xml:481
msgid ""
"The source override file is fully compatible with &dpkg-scansources;. It "
"contains 2 fields separated by spaces. The first fields is the source "
@@ -3664,13 +3672,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:485
+#: apt-ftparchive.1.xml:486
msgid "The Extra Override File"
msgstr "特別オーバーライドファイル"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:488
msgid ""
"The extra override file allows any arbitrary tag to be added or replaced in "
"the output. It has 3 columns, the first is the package, the second is the "
@@ -3680,13 +3688,13 @@ msgstr ""
"す。3 列からなり、先頭はパッケージ、2番目はタグ、残りは新しい値です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:496
+#: apt-ftparchive.1.xml:497
msgid "<option>--md5</option>"
msgstr "<option>--md5</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:498
+#: apt-ftparchive.1.xml:499
msgid ""
"Generate MD5 sums. This defaults to on, when turned off the generated index "
"files will not have MD5Sum fields where possible. Configuration Item: "
@@ -3697,13 +3705,13 @@ msgstr ""
"FTPArchive::MD5</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:503
+#: apt-ftparchive.1.xml:504
msgid "<option>--db</option>"
msgstr "<option>--db</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:505
+#: apt-ftparchive.1.xml:506
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3713,7 +3721,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:512
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3726,13 +3734,13 @@ msgstr ""
"<literal>quiet</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:517
+#: apt-ftparchive.1.xml:518
msgid "<option>--delink</option>"
msgstr "<option>--delink</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:519
+#: apt-ftparchive.1.xml:520
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
"then this option actually enables delinking of the files. It defaults to on "
@@ -3745,13 +3753,13 @@ msgstr ""
"<literal>APT::FTPArchive::DeLinkAct</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:525
+#: apt-ftparchive.1.xml:526
msgid "<option>--contents</option>"
msgstr "<option>--contents</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:527
+#: apt-ftparchive.1.xml:528
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -3766,13 +3774,13 @@ msgstr ""
"<literal>APT::FTPArchive::Contents</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:535
+#: apt-ftparchive.1.xml:536
msgid "<option>--source-override</option>"
msgstr "<option>--source-override</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:538
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
"command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3782,13 +3790,13 @@ msgstr ""
"選択します。設定項目 - <literal>APT::FTPArchive::SourceOverride</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:541
+#: apt-ftparchive.1.xml:542
msgid "<option>--readonly</option>"
msgstr "<option>--readonly</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:543
+#: apt-ftparchive.1.xml:544
msgid ""
"Make the caching databases read only. Configuration Item: <literal>APT::"
"FTPArchive::ReadOnlyDB</literal>."
@@ -3797,16 +3805,43 @@ msgstr ""
"FTPArchive::ReadOnlyDB</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:547
+#: apt-ftparchive.1.xml:548
+#, fuzzy
+#| msgid "<option>-a</option>"
+msgid "<option>--arch</option>"
+msgstr "<option>-a</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:549
+#, fuzzy
+#| msgid ""
+#| "If the command is either <literal>install</literal> or <literal>remove</"
+#| "literal>, then this option acts like running <literal>autoremove</"
+#| "literal> command, removing the unused dependency packages. Configuration "
+#| "Item: <literal>APT::Get::AutomaticRemove</literal>."
+msgid ""
+"Accept in the <literal>packages</literal> and <literal>contents</literal> "
+"commands only package files matching <literal>*_arch.deb</literal> or "
+"<literal>*_all.deb</literal> instead of all package files in the given "
+"path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>."
+msgstr ""
+"コマンドが <literal>install</literal> か <literal>remove</literal> である場"
+"合、このオプションは使用していないパッケージを削除し、<literal>autoremove</"
+"literal> のように動作します。設定項目 - <literal>APT::Get::AutomaticRemove</"
+"literal>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:555
#, fuzzy
#| msgid "<option>--version</option>"
msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr "<option>--version</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:549
+#: apt-ftparchive.1.xml:557
msgid ""
-"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If "
+"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
"packages are recompiled and/or republished with the same version again, this "
"will lead to problems as the now outdated cached metadata like size and "
"checksums will be used. With this option enabled this will no longer happen "
@@ -3818,14 +3853,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:559
+#: apt-ftparchive.1.xml:567
#, fuzzy
#| msgid "<option>--version</option>"
msgid "<option>APT::FTPArchive::LongDescription</option>"
msgstr "<option>--version</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:569
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -3836,21 +3871,21 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469
+#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477
#: sources.list.5.xml:193
msgid "Examples"
msgstr "サンプル"
# type: Content of: <refentry><refsect1><para><programlisting>
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:579
+#: apt-ftparchive.1.xml:587
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:575
+#: apt-ftparchive.1.xml:583
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3860,7 +3895,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:589
+#: apt-ftparchive.1.xml:597
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -7952,7 +7987,10 @@ msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt_preferences.5.xml:13
-msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>"
+#, fuzzy
+#| msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>"
+msgid ""
+"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
msgstr "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>"
# type: Content of: <refentry><refnamediv><refname>
@@ -8025,6 +8063,17 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:56
msgid ""
+"Preferences are a strong power in the hands of a system administrator but "
+"they can become also their biggest nightmare if used without care! APT will "
+"not questioning the preferences so wrong settings will therefore lead to "
+"uninstallable packages or wrong decisions while upgrading packages. Even "
+"more problems will arise if multiply distribution releases are mixed without "
+"a good understanding of the following paragraphs. You have been warned."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_preferences.5.xml:64
+msgid ""
"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
"directory are parsed in alphanumeric ascending order and need to obey the "
"following naming convention: The files have no or \"<literal>pref</literal>"
@@ -8035,27 +8084,27 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:63
+#: apt_preferences.5.xml:71
msgid "APT's Default Priority Assignments"
msgstr "APT のデフォルト優先度の割り当て"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:78
+#: apt_preferences.5.xml:86
#, no-wrap
msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
msgstr "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml:89
#, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr "APT::Default-Release \"stable\";\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:65
+#: apt_preferences.5.xml:73
msgid ""
"If there is no preferences file or if there is no entry in the file that "
"applies to a particular version then the priority assigned to that version "
@@ -8080,25 +8129,25 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:90
+#: apt_preferences.5.xml:98
msgid "priority 100"
msgstr "priority 100"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:91
+#: apt_preferences.5.xml:99
msgid "to the version that is already installed (if any)."
msgstr "(あるならば) 既にインストールされているバージョン。"
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:95
+#: apt_preferences.5.xml:103
msgid "priority 500"
msgstr "priority 500"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:96
+#: apt_preferences.5.xml:104
msgid ""
"to the versions that are not installed and do not belong to the target "
"release."
@@ -8106,20 +8155,20 @@ msgstr "インストールされておらず、ターゲットリリースに含
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:100
+#: apt_preferences.5.xml:108
msgid "priority 990"
msgstr "priority 990"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:101
+#: apt_preferences.5.xml:109
msgid ""
"to the versions that are not installed and belong to the target release."
msgstr "インストールされておらず、ターゲットリリースに含まれるバージョン。"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:85
+#: apt_preferences.5.xml:93
msgid ""
"If the target release has been specified then APT uses the following "
"algorithm to set the priorities of the versions of a package. Assign: "
@@ -8131,7 +8180,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:114
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -8143,7 +8192,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:110
+#: apt_preferences.5.xml:118
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
@@ -8153,7 +8202,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:113
+#: apt_preferences.5.xml:121
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -8169,13 +8218,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:119
+#: apt_preferences.5.xml:127
msgid "Install the highest priority version."
msgstr "最も高い優先度のバージョンをインストールします。"
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:120
+#: apt_preferences.5.xml:128
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
@@ -8185,7 +8234,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:131
msgid ""
"If two or more versions have the same priority and version number but either "
"the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -8197,7 +8246,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:137
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
"is not as recent as one of the versions available from the sources listed in "
@@ -8213,7 +8262,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:136
+#: apt_preferences.5.xml:144
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
"recent than any of the other available versions. The package will not be "
@@ -8227,7 +8276,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml:149
msgid ""
"Sometimes the installed version of a package is more recent than the version "
"belonging to the target release, but not as recent as a version belonging to "
@@ -8247,13 +8296,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:150
+#: apt_preferences.5.xml:158
msgid "The Effect of APT Preferences"
msgstr "APT 設定の効果"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:152
+#: apt_preferences.5.xml:160
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -8266,7 +8315,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:166
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
"specified packages and specified version or version range. For example, the "
@@ -8281,7 +8330,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:165
+#: apt_preferences.5.xml:173
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8294,7 +8343,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:171
+#: apt_preferences.5.xml:179
msgid ""
"The general form assigns a priority to all of the package versions in a "
"given distribution (that is, to all the versions of packages that are listed "
@@ -8309,7 +8358,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:177
+#: apt_preferences.5.xml:185
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
"of packages. For example, the following record assigns a high priority to "
@@ -8321,7 +8370,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:182
+#: apt_preferences.5.xml:190
#, no-wrap
msgid ""
"Package: *\n"
@@ -8334,7 +8383,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:187
+#: apt_preferences.5.xml:195
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
"This should not be confused with the Origin of a distribution as specified "
@@ -8350,7 +8399,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:193
+#: apt_preferences.5.xml:201
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -8361,7 +8410,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:197
+#: apt_preferences.5.xml:205
#, no-wrap
msgid ""
"Package: *\n"
@@ -8374,7 +8423,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:210
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
@@ -8385,7 +8434,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:206
+#: apt_preferences.5.xml:214
#, no-wrap
msgid ""
"Package: *\n"
@@ -8398,7 +8447,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:211
+#: apt_preferences.5.xml:219
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -8410,7 +8459,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:216
+#: apt_preferences.5.xml:224
#, no-wrap
msgid ""
"Package: *\n"
@@ -8423,18 +8472,18 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:227
+#: apt_preferences.5.xml:235
msgid "How APT Interprets Priorities"
msgstr "APT が優先度に割り込む方法"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:243
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:236
+#: apt_preferences.5.xml:244
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -8442,13 +8491,13 @@ msgstr ""
"パッケージがダウングレードしても、このバージョンのパッケージをインストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:248
msgid "990 &lt; P &lt;=1000"
msgstr "990 &lt; P &lt;=1000"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:241
+#: apt_preferences.5.xml:249
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -8457,13 +8506,13 @@ msgstr ""
"含まれなくても、このバージョンのパッケージをインストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:246
+#: apt_preferences.5.xml:254
msgid "500 &lt; P &lt;=990"
msgstr "500 &lt; P &lt;=990"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:247
+#: apt_preferences.5.xml:255
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
@@ -8472,13 +8521,13 @@ msgstr ""
"ジョンの方が新しいのでなければ、このバージョンのパッケージをインストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:252
+#: apt_preferences.5.xml:260
msgid "100 &lt; P &lt;=500"
msgstr "100 &lt; P &lt;=500"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:253
+#: apt_preferences.5.xml:261
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
@@ -8488,13 +8537,13 @@ msgstr ""
"ル"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:258
+#: apt_preferences.5.xml:266
msgid "0 &lt; P &lt;=100"
msgstr "0 &lt; P &lt;=100"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:259
+#: apt_preferences.5.xml:267
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
@@ -8503,19 +8552,19 @@ msgstr ""
"ンストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:263
+#: apt_preferences.5.xml:271
msgid "P &lt; 0"
msgstr "P &lt; 0"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:272
msgid "prevents the version from being installed"
msgstr "このバージョンのインストール禁止"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:230
+#: apt_preferences.5.xml:238
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -8527,7 +8576,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:269
+#: apt_preferences.5.xml:277
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -8541,7 +8590,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:283
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -8551,7 +8600,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:279
+#: apt_preferences.5.xml:287
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8580,13 +8629,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:292
+#: apt_preferences.5.xml:300
msgid "Then:"
msgstr "すると、以下のように動作します。"
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:294
+#: apt_preferences.5.xml:302
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -8601,7 +8650,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:299
+#: apt_preferences.5.xml:307
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -8613,7 +8662,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:303
+#: apt_preferences.5.xml:311
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -8627,13 +8676,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:313
+#: apt_preferences.5.xml:321
msgid "Determination of Package Version and Distribution Properties"
msgstr "パッケージのバージョンとディストリビューションプロパティの決定"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:323
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8644,30 +8693,30 @@ msgstr ""
"filename> ファイルを提供します。"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:327
+#: apt_preferences.5.xml:335
msgid "the <literal>Package:</literal> line"
msgstr "<literal>Package:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:336
msgid "gives the package name"
msgstr "パッケージ名"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:331 apt_preferences.5.xml:381
+#: apt_preferences.5.xml:339 apt_preferences.5.xml:389
msgid "the <literal>Version:</literal> line"
msgstr "<literal>Version:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:332
+#: apt_preferences.5.xml:340
msgid "gives the version number for the named package"
msgstr "その名前のパッケージのバージョン番号"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:319
+#: apt_preferences.5.xml:327
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8687,13 +8736,13 @@ msgstr ""
"type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:356
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "<literal>Archive:</literal> 行や <literal>Suite:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:349
+#: apt_preferences.5.xml:357
#, fuzzy
msgid ""
"names the archive to which all the packages in the directory tree belong. "
@@ -8711,19 +8760,19 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:367
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:365
+#: apt_preferences.5.xml:373
msgid "the <literal>Codename:</literal> line"
msgstr "<literal>Codename:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:366
+#: apt_preferences.5.xml:374
#, fuzzy
msgid ""
"names the codename to which all the packages in the directory tree belong. "
@@ -8740,14 +8789,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:383
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr "Pin: release n=squeeze\n"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:382
+#: apt_preferences.5.xml:390
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -8763,7 +8812,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:391
+#: apt_preferences.5.xml:399
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -8775,13 +8824,13 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:400
+#: apt_preferences.5.xml:408
msgid "the <literal>Component:</literal> line"
msgstr "<literal>Component:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:409
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -8799,19 +8848,19 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:418
#, no-wrap
msgid "Pin: release c=main\n"
msgstr "Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:424
msgid "the <literal>Origin:</literal> line"
msgstr "<literal>Origin:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:417
+#: apt_preferences.5.xml:425
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8824,19 +8873,19 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:423
+#: apt_preferences.5.xml:431
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr "Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:429
+#: apt_preferences.5.xml:437
msgid "the <literal>Label:</literal> line"
msgstr "<literal>Label:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:430
+#: apt_preferences.5.xml:438
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8849,14 +8898,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:444
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:345
#, fuzzy
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
@@ -8878,7 +8927,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:443
+#: apt_preferences.5.xml:451
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -8904,13 +8953,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:456
+#: apt_preferences.5.xml:464
msgid "Optional Lines in an APT Preferences Record"
msgstr "APT 設定レコードのオプション行"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:458
+#: apt_preferences.5.xml:466
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -8921,7 +8970,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:462
+#: apt_preferences.5.xml:470
#, fuzzy
msgid ""
"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
@@ -8935,13 +8984,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:471
+#: apt_preferences.5.xml:479
msgid "Tracking Stable"
msgstr "安定版の追跡"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:487
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8966,7 +9015,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:473
+#: apt_preferences.5.xml:481
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a priority "
@@ -8982,8 +9031,8 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:496 apt_preferences.5.xml:542
-#: apt_preferences.5.xml:600
+#: apt_preferences.5.xml:504 apt_preferences.5.xml:550
+#: apt_preferences.5.xml:608
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -8996,7 +9045,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:491
+#: apt_preferences.5.xml:499
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -9009,14 +9058,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:508
+#: apt_preferences.5.xml:516
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>package</replaceable>/testing\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:510
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -9030,13 +9079,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:514
+#: apt_preferences.5.xml:522
msgid "Tracking Testing or Unstable"
msgstr "テスト版や不安定版の追跡"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:523
+#: apt_preferences.5.xml:531
#, no-wrap
msgid ""
"Package: *\n"
@@ -9065,7 +9114,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:524
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
@@ -9083,7 +9132,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:545
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -9096,14 +9145,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:565
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>package</replaceable>/unstable\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:556
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -9122,13 +9171,13 @@ msgstr ""
"の最新版にアップグレードします。"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:564
+#: apt_preferences.5.xml:572
msgid "Tracking the evolution of a codename release"
msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:578
+#: apt_preferences.5.xml:586
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -9162,7 +9211,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:566
+#: apt_preferences.5.xml:574
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -9178,7 +9227,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:595
+#: apt_preferences.5.xml:603
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -9191,14 +9240,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:615
+#: apt_preferences.5.xml:623
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>package</replaceable>/sid\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:606
+#: apt_preferences.5.xml:614
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -9218,7 +9267,7 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:624
+#: apt_preferences.5.xml:632
#, fuzzy
#| msgid "apt_preferences"
msgid "&file-preferences;"
@@ -9226,7 +9275,7 @@ msgstr "apt_preferences"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:630
+#: apt_preferences.5.xml:638
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
diff --git a/doc/po/pl.po b/doc/po/pl.po
index a3936cff2..bb70ccfd9 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
-"POT-Creation-Date: 2010-01-20 12:18+0100\n"
+"POT-Creation-Date: 2010-02-18 20:53+0100\n"
"PO-Revision-Date: 2004-02-12 15:06+0100\n"
"Last-Translator: Krzysztof Fiertek <akfedux@megapolis.pl>\n"
"Language-Team: <debian-l10n-polish@lists.debian.org>\n"
@@ -865,7 +865,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47
-#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125
+#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125
#: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40
#: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
#: sources.list.5.xml:33
@@ -1257,7 +1257,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
-#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
+#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89
#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
#, fuzzy
msgid "options"
@@ -1282,7 +1282,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376
+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376
#: apt-sortpkgs.1.xml:58
msgid "<option>-s</option>"
msgstr ""
@@ -1303,12 +1303,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
msgid "<option>-q</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
msgid "<option>--quiet</option>"
msgstr ""
@@ -1357,7 +1357,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317 apt-cdrom.8.xml:131
+#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548
msgid "<option>-a</option>"
msgstr ""
@@ -1453,14 +1453,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:554
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1035 apt_preferences.5.xml:622
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:630
msgid "Files"
msgstr ""
@@ -1471,9 +1471,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569
#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637
#: sources.list.5.xml:233
msgid "See Also"
msgstr ""
@@ -1485,7 +1485,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:575
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr ""
@@ -1550,7 +1550,7 @@ msgstr ""
#: apt-cdrom.8.xml:66
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
-"unmount the CDROM device, prompt for a disk to be inserted and then procceed "
+"unmount the CDROM device, prompt for a disk to be inserted and then proceed "
"to scan it and copy the index files. If the disc does not have a proper "
"<filename>disk</filename> directory you will be prompted for a descriptive "
"title."
@@ -1591,7 +1591,7 @@ msgid "Options"
msgstr "Kolejne kroki"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328
+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328
msgid "<option>-d</option>"
msgstr ""
@@ -1736,7 +1736,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:53 apt-ftparchive.1.xml:71
+#: apt-config.8.xml:53 apt-ftparchive.1.xml:72
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given "
"one of the commands below must be present."
@@ -1787,7 +1787,7 @@ msgid "Just show the contents of the configuration space."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593
#: apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr ""
@@ -1896,6 +1896,7 @@ msgid ""
"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
"<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
+"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></"
"arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</"
"replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></"
"option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep="
@@ -1913,7 +1914,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:56
+#: apt-ftparchive.1.xml:57
msgid ""
"<command>apt-ftparchive</command> is the command line tool that generates "
"the index files that APT uses to access a distribution source. The index "
@@ -1922,7 +1923,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:60
+#: apt-ftparchive.1.xml:61
msgid ""
"<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
"program, incorporating its entire functionality via the <literal>packages</"
@@ -1932,7 +1933,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:66
+#: apt-ftparchive.1.xml:67
msgid ""
"Internally <command>apt-ftparchive</command> can make use of binary "
"databases to cache the contents of a .deb file and it does not rely on any "
@@ -1942,12 +1943,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:75
+#: apt-ftparchive.1.xml:76
msgid "packages"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:77
+#: apt-ftparchive.1.xml:78
msgid ""
"The packages command generates a package file from a directory tree. It "
"takes the given directory and recursively searches it for .deb files, "
@@ -1956,18 +1957,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106
+#: apt-ftparchive.1.xml:83 apt-ftparchive.1.xml:107
msgid ""
"The option <option>--db</option> can be used to specify a binary caching DB."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:85
+#: apt-ftparchive.1.xml:86
msgid "sources"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:87
+#: apt-ftparchive.1.xml:88
msgid ""
"The <literal>sources</literal> command generates a source index file from a "
"directory tree. It takes the given directory and recursively searches it "
@@ -1976,7 +1977,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:92
+#: apt-ftparchive.1.xml:93
msgid ""
"If an override file is specified then a source override file will be looked "
"for with an extension of .src. The --source-override option can be used to "
@@ -1984,12 +1985,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:97
+#: apt-ftparchive.1.xml:98
msgid "contents"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:99
+#: apt-ftparchive.1.xml:100
msgid ""
"The <literal>contents</literal> command generates a contents file from a "
"directory tree. It takes the given directory and recursively searches it "
@@ -2000,12 +2001,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:109
+#: apt-ftparchive.1.xml:110
msgid "release"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:111
+#: apt-ftparchive.1.xml:112
msgid ""
"The <literal>release</literal> command generates a Release file from a "
"directory tree. It recursively searches the given directory for Packages, "
@@ -2015,7 +2016,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:118
+#: apt-ftparchive.1.xml:119
msgid ""
"Values for the additional metadata fields in the Release file are taken from "
"the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -2027,12 +2028,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:128
+#: apt-ftparchive.1.xml:129
msgid "generate"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:130
+#: apt-ftparchive.1.xml:131
msgid ""
"The <literal>generate</literal> command is designed to be runnable from a "
"cron script and builds indexes according to the given config file. The "
@@ -2042,25 +2043,25 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:137 apt-get.8.xml:292
+#: apt-ftparchive.1.xml:138 apt-get.8.xml:292
msgid "clean"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:139
+#: apt-ftparchive.1.xml:140
msgid ""
"The <literal>clean</literal> command tidies the databases used by the given "
"configuration file by removing any records that are no longer necessary."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:145
+#: apt-ftparchive.1.xml:146
#, fuzzy
msgid "The Generate Configuration"
msgstr "Plik konfiguracyjny"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:147
+#: apt-ftparchive.1.xml:148
msgid ""
"The <literal>generate</literal> command uses a configuration file to "
"describe the archives that are going to be generated. It follows the typical "
@@ -2071,18 +2072,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:156
msgid ""
"The generate configuration has 4 separate sections, each described below."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:157
+#: apt-ftparchive.1.xml:158
msgid "Dir Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:159
+#: apt-ftparchive.1.xml:160
msgid ""
"The <literal>Dir</literal> section defines the standard directories needed "
"to locate the files required during the generation process. These "
@@ -2091,12 +2092,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:164
+#: apt-ftparchive.1.xml:165
msgid "ArchiveDir"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:166
+#: apt-ftparchive.1.xml:167
msgid ""
"Specifies the root of the FTP archive, in a standard Debian configuration "
"this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -2104,45 +2105,45 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:171
+#: apt-ftparchive.1.xml:172
#, fuzzy
msgid "OverrideDir"
msgstr "Wprowadzenie"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:173
+#: apt-ftparchive.1.xml:174
msgid "Specifies the location of the override files."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:176
+#: apt-ftparchive.1.xml:177
msgid "CacheDir"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:178
+#: apt-ftparchive.1.xml:179
msgid "Specifies the location of the cache files"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:181
+#: apt-ftparchive.1.xml:182
msgid "FileListDir"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:183
+#: apt-ftparchive.1.xml:184
msgid ""
"Specifies the location of the file list files, if the <literal>FileList</"
"literal> setting is used below."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:189
+#: apt-ftparchive.1.xml:190
msgid "Default Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:191
+#: apt-ftparchive.1.xml:192
msgid ""
"The <literal>Default</literal> section specifies default values, and "
"settings that control the operation of the generator. Other sections may "
@@ -2150,12 +2151,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:195
+#: apt-ftparchive.1.xml:196
msgid "Packages::Compress"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:197
+#: apt-ftparchive.1.xml:198
msgid ""
"Sets the default compression schemes to use for the Package index files. It "
"is a string that contains a space separated list of at least one of: '.' (no "
@@ -2164,60 +2165,60 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:203
+#: apt-ftparchive.1.xml:204
msgid "Packages::Extensions"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:205
+#: apt-ftparchive.1.xml:206
msgid ""
"Sets the default list of file extensions that are package files. This "
"defaults to '.deb'."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:209
+#: apt-ftparchive.1.xml:210
msgid "Sources::Compress"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:211
+#: apt-ftparchive.1.xml:212
msgid ""
"This is similar to <literal>Packages::Compress</literal> except that it "
"controls the compression for the Sources files."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:215
+#: apt-ftparchive.1.xml:216
msgid "Sources::Extensions"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:217
+#: apt-ftparchive.1.xml:218
msgid ""
"Sets the default list of file extensions that are source files. This "
"defaults to '.dsc'."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:221
+#: apt-ftparchive.1.xml:222
msgid "Contents::Compress"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:223
+#: apt-ftparchive.1.xml:224
msgid ""
"This is similar to <literal>Packages::Compress</literal> except that it "
"controls the compression for the Contents files."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:227
+#: apt-ftparchive.1.xml:228
msgid "DeLinkLimit"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:229
+#: apt-ftparchive.1.xml:230
msgid ""
"Specifies the number of kilobytes to delink (and replace with hard links) "
"per run. This is used in conjunction with the per-section <literal>External-"
@@ -2225,24 +2226,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:234
+#: apt-ftparchive.1.xml:235
msgid "FileMode"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:236
+#: apt-ftparchive.1.xml:237
msgid ""
"Specifies the mode of all created index files. It defaults to 0644. All "
"index files are set to this mode with no regard to the umask."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:243
+#: apt-ftparchive.1.xml:244
msgid "TreeDefault Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:245
+#: apt-ftparchive.1.xml:246
msgid ""
"Sets defaults specific to <literal>Tree</literal> sections. All of these "
"variables are substitution variables and have the strings $(DIST), "
@@ -2250,12 +2251,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:250
+#: apt-ftparchive.1.xml:251
msgid "MaxContentsChange"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:252
+#: apt-ftparchive.1.xml:253
msgid ""
"Sets the number of kilobytes of contents files that are generated each day. "
"The contents files are round-robined so that over several days they will all "
@@ -2263,12 +2264,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:257
+#: apt-ftparchive.1.xml:258
msgid "ContentsAge"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:259
+#: apt-ftparchive.1.xml:260
msgid ""
"Controls the number of days a contents file is allowed to be checked without "
"changing. If this limit is passed the mtime of the contents file is updated. "
@@ -2279,60 +2280,60 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:268
+#: apt-ftparchive.1.xml:269
msgid "Directory"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:270
+#: apt-ftparchive.1.xml:271
msgid ""
"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
"$(SECTION)/binary-$(ARCH)/</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:274
+#: apt-ftparchive.1.xml:275
msgid "SrcDirectory"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:276
+#: apt-ftparchive.1.xml:277
msgid ""
"Sets the top of the source package directory tree. Defaults to <filename>"
"$(DIST)/$(SECTION)/source/</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406
+#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407
msgid "Packages"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:282
+#: apt-ftparchive.1.xml:283
msgid ""
"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
"binary-$(ARCH)/Packages</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411
+#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412
msgid "Sources"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:288
+#: apt-ftparchive.1.xml:289
msgid ""
"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
"source/Sources</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:292
+#: apt-ftparchive.1.xml:293
msgid "InternalPrefix"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:294
+#: apt-ftparchive.1.xml:295
msgid ""
"Sets the path prefix that causes a symlink to be considered an internal link "
"instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -2340,12 +2341,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417
+#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418
msgid "Contents"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:301
+#: apt-ftparchive.1.xml:302
msgid ""
"Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
"</filename>. If this setting causes multiple Packages files to map onto a "
@@ -2354,34 +2355,34 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:308
+#: apt-ftparchive.1.xml:309
msgid "Contents::Header"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:310
+#: apt-ftparchive.1.xml:311
msgid "Sets header file to prepend to the contents output."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442
+#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443
msgid "BinCacheDB"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:315
+#: apt-ftparchive.1.xml:316
msgid ""
"Sets the binary cache database to use for this section. Multiple sections "
"can share the same database."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319
+#: apt-ftparchive.1.xml:320
msgid "FileList"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:322
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -2389,12 +2390,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:326
+#: apt-ftparchive.1.xml:327
msgid "SourceFileList"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:328
+#: apt-ftparchive.1.xml:329
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -2403,12 +2404,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:336
+#: apt-ftparchive.1.xml:337
msgid "Tree Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:338
+#: apt-ftparchive.1.xml:339
msgid ""
"The <literal>Tree</literal> section defines a standard Debian file tree "
"which consists of a base directory, then multiple sections in that base "
@@ -2418,7 +2419,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:343
+#: apt-ftparchive.1.xml:344
msgid ""
"The <literal>Tree</literal> section takes a scope tag which sets the "
"<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -2427,7 +2428,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:348
+#: apt-ftparchive.1.xml:349
msgid ""
"All of the settings defined in the <literal>TreeDefault</literal> section "
"can be use in a <literal>Tree</literal> section as well as three new "
@@ -2435,7 +2436,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:354
+#: apt-ftparchive.1.xml:355
#, no-wrap
msgid ""
"for i in Sections do \n"
@@ -2445,7 +2446,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
+#: apt-ftparchive.1.xml:352
msgid ""
"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
"command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -2453,12 +2454,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:360
+#: apt-ftparchive.1.xml:361
msgid "Sections"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:362
+#: apt-ftparchive.1.xml:363
msgid ""
"This is a space separated list of sections which appear under the "
"distribution, typically this is something like <literal>main contrib non-"
@@ -2466,12 +2467,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:367
+#: apt-ftparchive.1.xml:368
msgid "Architectures"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:369
+#: apt-ftparchive.1.xml:370
msgid ""
"This is a space separated list of all the architectures that appear under "
"search section. The special architecture 'source' is used to indicate that "
@@ -2479,58 +2480,58 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422
+#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423
#, fuzzy
msgid "BinOverride"
msgstr "Wprowadzenie"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:376
+#: apt-ftparchive.1.xml:377
msgid ""
"Sets the binary override file. The override file contains section, priority "
"and maintainer address information."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427
+#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428
#, fuzzy
msgid "SrcOverride"
msgstr "Wprowadzenie"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:382
+#: apt-ftparchive.1.xml:383
msgid ""
"Sets the source override file. The override file contains section "
"information."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432
+#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433
msgid "ExtraOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434
+#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435
msgid "Sets the binary extra override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437
+#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438
msgid "SrcExtraOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439
+#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440
msgid "Sets the source extra override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:398
+#: apt-ftparchive.1.xml:399
msgid "BinDirectory Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:400
+#: apt-ftparchive.1.xml:401
msgid ""
"The <literal>bindirectory</literal> section defines a binary directory tree "
"with no special structure. The scope tag specifies the location of the "
@@ -2540,64 +2541,64 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:408
+#: apt-ftparchive.1.xml:409
msgid "Sets the Packages file output."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:413
+#: apt-ftparchive.1.xml:414
msgid ""
"Sets the Sources file output. At least one of <literal>Packages</literal> or "
"<literal>Sources</literal> is required."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:419
+#: apt-ftparchive.1.xml:420
msgid "Sets the Contents file output. (optional)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:424
+#: apt-ftparchive.1.xml:425
msgid "Sets the binary override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:429
+#: apt-ftparchive.1.xml:430
msgid "Sets the source override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:444
+#: apt-ftparchive.1.xml:445
msgid "Sets the cache DB."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:447
+#: apt-ftparchive.1.xml:448
msgid "PathPrefix"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:449
+#: apt-ftparchive.1.xml:450
msgid "Appends a path to all the output paths."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:452
+#: apt-ftparchive.1.xml:453
msgid "FileList, SourceFileList"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:454
+#: apt-ftparchive.1.xml:455
msgid "Specifies the file list file."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:461
+#: apt-ftparchive.1.xml:462
msgid "The Binary Override File"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:463
msgid ""
"The binary override file is fully compatible with &dpkg-scanpackages;. It "
"contains 4 fields separated by spaces. The first field is the package name, "
@@ -2607,19 +2608,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:469
#, no-wrap
msgid "old [// oldn]* => new"
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:470
+#: apt-ftparchive.1.xml:471
#, no-wrap
msgid "new"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:467
+#: apt-ftparchive.1.xml:468
msgid ""
"The general form of the maintainer field is: <placeholder type="
"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -2630,12 +2631,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:478
+#: apt-ftparchive.1.xml:479
msgid "The Source Override File"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:480
+#: apt-ftparchive.1.xml:481
msgid ""
"The source override file is fully compatible with &dpkg-scansources;. It "
"contains 2 fields separated by spaces. The first fields is the source "
@@ -2643,12 +2644,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:485
+#: apt-ftparchive.1.xml:486
msgid "The Extra Override File"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:488
msgid ""
"The extra override file allows any arbitrary tag to be added or replaced in "
"the output. It has 3 columns, the first is the package, the second is the "
@@ -2656,12 +2657,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:496
+#: apt-ftparchive.1.xml:497
msgid "<option>--md5</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:498
+#: apt-ftparchive.1.xml:499
msgid ""
"Generate MD5 sums. This defaults to on, when turned off the generated index "
"files will not have MD5Sum fields where possible. Configuration Item: "
@@ -2669,19 +2670,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:503
+#: apt-ftparchive.1.xml:504
msgid "<option>--db</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:505
+#: apt-ftparchive.1.xml:506
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:512
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -2690,12 +2691,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:517
+#: apt-ftparchive.1.xml:518
msgid "<option>--delink</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:519
+#: apt-ftparchive.1.xml:520
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
"then this option actually enables delinking of the files. It defaults to on "
@@ -2704,12 +2705,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:525
+#: apt-ftparchive.1.xml:526
msgid "<option>--contents</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:527
+#: apt-ftparchive.1.xml:528
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -2719,12 +2720,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:535
+#: apt-ftparchive.1.xml:536
msgid "<option>--source-override</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:538
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
"command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -2732,26 +2733,40 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:541
+#: apt-ftparchive.1.xml:542
msgid "<option>--readonly</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:543
+#: apt-ftparchive.1.xml:544
msgid ""
"Make the caching databases read only. Configuration Item: <literal>APT::"
"FTPArchive::ReadOnlyDB</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:547
-msgid "<option>APT::FTPArchive::AlwaysStat</option>"
+#: apt-ftparchive.1.xml:548
+msgid "<option>--arch</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:549
msgid ""
-"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If "
+"Accept in the <literal>packages</literal> and <literal>contents</literal> "
+"commands only package files matching <literal>*_arch.deb</literal> or "
+"<literal>*_all.deb</literal> instead of all package files in the given "
+"path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:555
+msgid "<option>APT::FTPArchive::AlwaysStat</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:557
+msgid ""
+"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
"packages are recompiled and/or republished with the same version again, this "
"will lead to problems as the now outdated cached metadata like size and "
"checksums will be used. With this option enabled this will no longer happen "
@@ -2763,12 +2778,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:559
+#: apt-ftparchive.1.xml:567
msgid "<option>APT::FTPArchive::LongDescription</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:569
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -2778,26 +2793,26 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469
+#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477
#: sources.list.5.xml:193
msgid "Examples"
msgstr ""
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:579
+#: apt-ftparchive.1.xml:587
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:575
+#: apt-ftparchive.1.xml:583
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:589
+#: apt-ftparchive.1.xml:597
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -5845,7 +5860,8 @@ msgstr ""
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt_preferences.5.xml:13
-msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>"
+msgid ""
+"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
@@ -5893,6 +5909,17 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:56
msgid ""
+"Preferences are a strong power in the hands of a system administrator but "
+"they can become also their biggest nightmare if used without care! APT will "
+"not questioning the preferences so wrong settings will therefore lead to "
+"uninstallable packages or wrong decisions while upgrading packages. Even "
+"more problems will arise if multiply distribution releases are mixed without "
+"a good understanding of the following paragraphs. You have been warned."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_preferences.5.xml:64
+msgid ""
"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
"directory are parsed in alphanumeric ascending order and need to obey the "
"following naming convention: The files have no or \"<literal>pref</literal>"
@@ -5902,24 +5929,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:63
+#: apt_preferences.5.xml:71
msgid "APT's Default Priority Assignments"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:78
+#: apt_preferences.5.xml:86
#, no-wrap
msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml:89
#, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:65
+#: apt_preferences.5.xml:73
msgid ""
"If there is no preferences file or if there is no entry in the file that "
"applies to a particular version then the priority assigned to that version "
@@ -5935,40 +5962,40 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:90
+#: apt_preferences.5.xml:98
msgid "priority 100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:91
+#: apt_preferences.5.xml:99
msgid "to the version that is already installed (if any)."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:95
+#: apt_preferences.5.xml:103
msgid "priority 500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:96
+#: apt_preferences.5.xml:104
msgid ""
"to the versions that are not installed and do not belong to the target "
"release."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:100
+#: apt_preferences.5.xml:108
msgid "priority 990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:101
+#: apt_preferences.5.xml:109
msgid ""
"to the versions that are not installed and belong to the target release."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:85
+#: apt_preferences.5.xml:93
msgid ""
"If the target release has been specified then APT uses the following "
"algorithm to set the priorities of the versions of a package. Assign: "
@@ -5976,7 +6003,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:114
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -5984,14 +6011,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:110
+#: apt_preferences.5.xml:118
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:113
+#: apt_preferences.5.xml:121
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -6001,19 +6028,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:119
+#: apt_preferences.5.xml:127
msgid "Install the highest priority version."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:120
+#: apt_preferences.5.xml:128
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:131
msgid ""
"If two or more versions have the same priority and version number but either "
"the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -6021,7 +6048,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:137
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
"is not as recent as one of the versions available from the sources listed in "
@@ -6031,7 +6058,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:136
+#: apt_preferences.5.xml:144
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
"recent than any of the other available versions. The package will not be "
@@ -6040,7 +6067,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml:149
msgid ""
"Sometimes the installed version of a package is more recent than the version "
"belonging to the target release, but not as recent as a version belonging to "
@@ -6052,12 +6079,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:150
+#: apt_preferences.5.xml:158
msgid "The Effect of APT Preferences"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:152
+#: apt_preferences.5.xml:160
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -6066,7 +6093,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:166
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
"specified packages and specified version or version range. For example, the "
@@ -6076,7 +6103,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:165
+#: apt_preferences.5.xml:173
#, no-wrap
msgid ""
"Package: perl\n"
@@ -6085,7 +6112,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:171
+#: apt_preferences.5.xml:179
msgid ""
"The general form assigns a priority to all of the package versions in a "
"given distribution (that is, to all the versions of packages that are listed "
@@ -6095,7 +6122,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:177
+#: apt_preferences.5.xml:185
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
"of packages. For example, the following record assigns a high priority to "
@@ -6103,7 +6130,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:182
+#: apt_preferences.5.xml:190
#, no-wrap
msgid ""
"Package: *\n"
@@ -6112,7 +6139,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:187
+#: apt_preferences.5.xml:195
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
"This should not be confused with the Origin of a distribution as specified "
@@ -6122,7 +6149,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:193
+#: apt_preferences.5.xml:201
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -6130,7 +6157,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:197
+#: apt_preferences.5.xml:205
#, no-wrap
msgid ""
"Package: *\n"
@@ -6139,7 +6166,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:210
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
@@ -6147,7 +6174,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:206
+#: apt_preferences.5.xml:214
#, no-wrap
msgid ""
"Package: *\n"
@@ -6156,7 +6183,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:211
+#: apt_preferences.5.xml:219
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -6164,7 +6191,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:216
+#: apt_preferences.5.xml:224
#, no-wrap
msgid ""
"Package: *\n"
@@ -6173,82 +6200,82 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:227
+#: apt_preferences.5.xml:235
msgid "How APT Interprets Priorities"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:243
msgid "P &gt; 1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:236
+#: apt_preferences.5.xml:244
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:248
msgid "990 &lt; P &lt;=1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:241
+#: apt_preferences.5.xml:249
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:246
+#: apt_preferences.5.xml:254
msgid "500 &lt; P &lt;=990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:247
+#: apt_preferences.5.xml:255
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:252
+#: apt_preferences.5.xml:260
msgid "100 &lt; P &lt;=500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:253
+#: apt_preferences.5.xml:261
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:258
+#: apt_preferences.5.xml:266
msgid "0 &lt; P &lt;=100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:259
+#: apt_preferences.5.xml:267
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:263
+#: apt_preferences.5.xml:271
msgid "P &lt; 0"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:272
msgid "prevents the version from being installed"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:230
+#: apt_preferences.5.xml:238
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -6256,7 +6283,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:269
+#: apt_preferences.5.xml:277
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -6265,14 +6292,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:283
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:279
+#: apt_preferences.5.xml:287
#, no-wrap
msgid ""
"Package: perl\n"
@@ -6289,12 +6316,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:292
+#: apt_preferences.5.xml:300
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:294
+#: apt_preferences.5.xml:302
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -6304,7 +6331,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:299
+#: apt_preferences.5.xml:307
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -6312,7 +6339,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:303
+#: apt_preferences.5.xml:311
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -6321,12 +6348,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:313
+#: apt_preferences.5.xml:321
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:323
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6334,27 +6361,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:327
+#: apt_preferences.5.xml:335
msgid "the <literal>Package:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:336
msgid "gives the package name"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:331 apt_preferences.5.xml:381
+#: apt_preferences.5.xml:339 apt_preferences.5.xml:389
msgid "the <literal>Version:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:332
+#: apt_preferences.5.xml:340
msgid "gives the version number for the named package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:319
+#: apt_preferences.5.xml:327
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6367,12 +6394,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:356
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:349
+#: apt_preferences.5.xml:357
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6383,18 +6410,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:367
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:365
+#: apt_preferences.5.xml:373
msgid "the <literal>Codename:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:366
+#: apt_preferences.5.xml:374
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: squeeze\" specifies that all of the "
@@ -6404,13 +6431,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:383
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:382
+#: apt_preferences.5.xml:390
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -6420,7 +6447,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:391
+#: apt_preferences.5.xml:399
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -6429,12 +6456,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:400
+#: apt_preferences.5.xml:408
msgid "the <literal>Component:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:409
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -6445,18 +6472,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:418
#, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:424
msgid "the <literal>Origin:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:417
+#: apt_preferences.5.xml:425
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6465,18 +6492,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:423
+#: apt_preferences.5.xml:431
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:429
+#: apt_preferences.5.xml:437
msgid "the <literal>Label:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:430
+#: apt_preferences.5.xml:438
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6485,13 +6512,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:444
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:345
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6504,7 +6531,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:443
+#: apt_preferences.5.xml:451
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -6519,12 +6546,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:456
+#: apt_preferences.5.xml:464
msgid "Optional Lines in an APT Preferences Record"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:458
+#: apt_preferences.5.xml:466
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -6532,7 +6559,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:462
+#: apt_preferences.5.xml:470
msgid ""
"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
"optional. If omitted, APT assigns a priority of 1 less than the last value "
@@ -6541,12 +6568,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:471
+#: apt_preferences.5.xml:479
msgid "Tracking Stable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:487
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6561,7 +6588,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:473
+#: apt_preferences.5.xml:481
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6571,8 +6598,8 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:496 apt_preferences.5.xml:542
-#: apt_preferences.5.xml:600
+#: apt_preferences.5.xml:504 apt_preferences.5.xml:550
+#: apt_preferences.5.xml:608
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -6581,7 +6608,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:491
+#: apt_preferences.5.xml:499
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6590,13 +6617,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:508
+#: apt_preferences.5.xml:516
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:510
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -6605,12 +6632,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:514
+#: apt_preferences.5.xml:522
msgid "Tracking Testing or Unstable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:523
+#: apt_preferences.5.xml:531
#, no-wrap
msgid ""
"Package: *\n"
@@ -6627,7 +6654,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:524
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -6638,7 +6665,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:545
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6647,13 +6674,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:565
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:556
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -6665,12 +6692,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:564
+#: apt_preferences.5.xml:572
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:578
+#: apt_preferences.5.xml:586
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6690,7 +6717,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:566
+#: apt_preferences.5.xml:574
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6705,7 +6732,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:595
+#: apt_preferences.5.xml:603
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -6714,13 +6741,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:615
+#: apt_preferences.5.xml:623
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:606
+#: apt_preferences.5.xml:614
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -6732,12 +6759,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:624
+#: apt_preferences.5.xml:632
msgid "&file-preferences;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:630
+#: apt_preferences.5.xml:638
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr ""
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index e6225eb67..4e1eeb33a 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
-"POT-Creation-Date: 2010-01-20 12:18+0100\n"
+"POT-Creation-Date: 2010-02-18 20:53+0100\n"
"PO-Revision-Date: 2004-09-20 17:02+0000\n"
"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
"Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -823,7 +823,7 @@ msgstr "<!ENTITY translation-title \"Tradução\">"
#. type: Plain text
#: apt.ent:380
-#, no-wrap, fuzzy
+#, fuzzy, no-wrap
msgid ""
"<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed\n"
" to the translation in the past, who is responsible now and maybe further information\n"
@@ -913,7 +913,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47
-#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125
+#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125
#: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40
#: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
#: sources.list.5.xml:33
@@ -1308,7 +1308,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
-#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
+#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89
#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
msgid "options"
msgstr ""
@@ -1332,7 +1332,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376
+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376
#: apt-sortpkgs.1.xml:58
msgid "<option>-s</option>"
msgstr ""
@@ -1353,12 +1353,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
msgid "<option>-q</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
msgid "<option>--quiet</option>"
msgstr ""
@@ -1407,7 +1407,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317 apt-cdrom.8.xml:131
+#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548
msgid "<option>-a</option>"
msgstr ""
@@ -1503,14 +1503,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:554
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1035 apt_preferences.5.xml:622
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:630
msgid "Files"
msgstr ""
@@ -1521,9 +1521,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569
#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637
#: sources.list.5.xml:233
#, fuzzy
msgid "See Also"
@@ -1536,7 +1536,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:575
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr ""
@@ -1601,7 +1601,7 @@ msgstr ""
#: apt-cdrom.8.xml:66
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
-"unmount the CDROM device, prompt for a disk to be inserted and then procceed "
+"unmount the CDROM device, prompt for a disk to be inserted and then proceed "
"to scan it and copy the index files. If the disc does not have a proper "
"<filename>disk</filename> directory you will be prompted for a descriptive "
"title."
@@ -1641,7 +1641,7 @@ msgid "Options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328
+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328
msgid "<option>-d</option>"
msgstr ""
@@ -1786,7 +1786,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:53 apt-ftparchive.1.xml:71
+#: apt-config.8.xml:53 apt-ftparchive.1.xml:72
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given "
"one of the commands below must be present."
@@ -1837,7 +1837,7 @@ msgid "Just show the contents of the configuration space."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593
#: apt-sortpkgs.1.xml:70
#, fuzzy
msgid "&apt-conf;"
@@ -1950,6 +1950,7 @@ msgid ""
"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
"<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
+"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></"
"arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</"
"replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></"
"option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep="
@@ -1967,7 +1968,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:56
+#: apt-ftparchive.1.xml:57
msgid ""
"<command>apt-ftparchive</command> is the command line tool that generates "
"the index files that APT uses to access a distribution source. The index "
@@ -1976,7 +1977,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:60
+#: apt-ftparchive.1.xml:61
msgid ""
"<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
"program, incorporating its entire functionality via the <literal>packages</"
@@ -1986,7 +1987,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:66
+#: apt-ftparchive.1.xml:67
msgid ""
"Internally <command>apt-ftparchive</command> can make use of binary "
"databases to cache the contents of a .deb file and it does not rely on any "
@@ -1996,12 +1997,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:75
+#: apt-ftparchive.1.xml:76
msgid "packages"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:77
+#: apt-ftparchive.1.xml:78
msgid ""
"The packages command generates a package file from a directory tree. It "
"takes the given directory and recursively searches it for .deb files, "
@@ -2010,18 +2011,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106
+#: apt-ftparchive.1.xml:83 apt-ftparchive.1.xml:107
msgid ""
"The option <option>--db</option> can be used to specify a binary caching DB."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:85
+#: apt-ftparchive.1.xml:86
msgid "sources"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:87
+#: apt-ftparchive.1.xml:88
msgid ""
"The <literal>sources</literal> command generates a source index file from a "
"directory tree. It takes the given directory and recursively searches it "
@@ -2030,7 +2031,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:92
+#: apt-ftparchive.1.xml:93
msgid ""
"If an override file is specified then a source override file will be looked "
"for with an extension of .src. The --source-override option can be used to "
@@ -2038,12 +2039,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:97
+#: apt-ftparchive.1.xml:98
msgid "contents"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:99
+#: apt-ftparchive.1.xml:100
msgid ""
"The <literal>contents</literal> command generates a contents file from a "
"directory tree. It takes the given directory and recursively searches it "
@@ -2054,12 +2055,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:109
+#: apt-ftparchive.1.xml:110
msgid "release"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:111
+#: apt-ftparchive.1.xml:112
msgid ""
"The <literal>release</literal> command generates a Release file from a "
"directory tree. It recursively searches the given directory for Packages, "
@@ -2069,7 +2070,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:118
+#: apt-ftparchive.1.xml:119
msgid ""
"Values for the additional metadata fields in the Release file are taken from "
"the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -2081,12 +2082,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:128
+#: apt-ftparchive.1.xml:129
msgid "generate"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:130
+#: apt-ftparchive.1.xml:131
msgid ""
"The <literal>generate</literal> command is designed to be runnable from a "
"cron script and builds indexes according to the given config file. The "
@@ -2096,24 +2097,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:137 apt-get.8.xml:292
+#: apt-ftparchive.1.xml:138 apt-get.8.xml:292
msgid "clean"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:139
+#: apt-ftparchive.1.xml:140
msgid ""
"The <literal>clean</literal> command tidies the databases used by the given "
"configuration file by removing any records that are no longer necessary."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:145
+#: apt-ftparchive.1.xml:146
msgid "The Generate Configuration"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:147
+#: apt-ftparchive.1.xml:148
msgid ""
"The <literal>generate</literal> command uses a configuration file to "
"describe the archives that are going to be generated. It follows the typical "
@@ -2124,19 +2125,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:156
msgid ""
"The generate configuration has 4 separate sections, each described below."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:157
+#: apt-ftparchive.1.xml:158
#, fuzzy
msgid "Dir Section"
msgstr "Descrição"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:159
+#: apt-ftparchive.1.xml:160
msgid ""
"The <literal>Dir</literal> section defines the standard directories needed "
"to locate the files required during the generation process. These "
@@ -2145,12 +2146,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:164
+#: apt-ftparchive.1.xml:165
msgid "ArchiveDir"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:166
+#: apt-ftparchive.1.xml:167
msgid ""
"Specifies the root of the FTP archive, in a standard Debian configuration "
"this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -2158,44 +2159,44 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:171
+#: apt-ftparchive.1.xml:172
msgid "OverrideDir"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:173
+#: apt-ftparchive.1.xml:174
msgid "Specifies the location of the override files."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:176
+#: apt-ftparchive.1.xml:177
msgid "CacheDir"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:178
+#: apt-ftparchive.1.xml:179
msgid "Specifies the location of the cache files"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:181
+#: apt-ftparchive.1.xml:182
msgid "FileListDir"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:183
+#: apt-ftparchive.1.xml:184
msgid ""
"Specifies the location of the file list files, if the <literal>FileList</"
"literal> setting is used below."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:189
+#: apt-ftparchive.1.xml:190
msgid "Default Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:191
+#: apt-ftparchive.1.xml:192
msgid ""
"The <literal>Default</literal> section specifies default values, and "
"settings that control the operation of the generator. Other sections may "
@@ -2203,12 +2204,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:195
+#: apt-ftparchive.1.xml:196
msgid "Packages::Compress"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:197
+#: apt-ftparchive.1.xml:198
msgid ""
"Sets the default compression schemes to use for the Package index files. It "
"is a string that contains a space separated list of at least one of: '.' (no "
@@ -2217,60 +2218,60 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:203
+#: apt-ftparchive.1.xml:204
msgid "Packages::Extensions"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:205
+#: apt-ftparchive.1.xml:206
msgid ""
"Sets the default list of file extensions that are package files. This "
"defaults to '.deb'."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:209
+#: apt-ftparchive.1.xml:210
msgid "Sources::Compress"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:211
+#: apt-ftparchive.1.xml:212
msgid ""
"This is similar to <literal>Packages::Compress</literal> except that it "
"controls the compression for the Sources files."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:215
+#: apt-ftparchive.1.xml:216
msgid "Sources::Extensions"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:217
+#: apt-ftparchive.1.xml:218
msgid ""
"Sets the default list of file extensions that are source files. This "
"defaults to '.dsc'."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:221
+#: apt-ftparchive.1.xml:222
msgid "Contents::Compress"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:223
+#: apt-ftparchive.1.xml:224
msgid ""
"This is similar to <literal>Packages::Compress</literal> except that it "
"controls the compression for the Contents files."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:227
+#: apt-ftparchive.1.xml:228
msgid "DeLinkLimit"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:229
+#: apt-ftparchive.1.xml:230
msgid ""
"Specifies the number of kilobytes to delink (and replace with hard links) "
"per run. This is used in conjunction with the per-section <literal>External-"
@@ -2278,24 +2279,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:234
+#: apt-ftparchive.1.xml:235
msgid "FileMode"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:236
+#: apt-ftparchive.1.xml:237
msgid ""
"Specifies the mode of all created index files. It defaults to 0644. All "
"index files are set to this mode with no regard to the umask."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:243
+#: apt-ftparchive.1.xml:244
msgid "TreeDefault Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:245
+#: apt-ftparchive.1.xml:246
msgid ""
"Sets defaults specific to <literal>Tree</literal> sections. All of these "
"variables are substitution variables and have the strings $(DIST), "
@@ -2303,12 +2304,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:250
+#: apt-ftparchive.1.xml:251
msgid "MaxContentsChange"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:252
+#: apt-ftparchive.1.xml:253
msgid ""
"Sets the number of kilobytes of contents files that are generated each day. "
"The contents files are round-robined so that over several days they will all "
@@ -2316,12 +2317,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:257
+#: apt-ftparchive.1.xml:258
msgid "ContentsAge"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:259
+#: apt-ftparchive.1.xml:260
msgid ""
"Controls the number of days a contents file is allowed to be checked without "
"changing. If this limit is passed the mtime of the contents file is updated. "
@@ -2332,60 +2333,60 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:268
+#: apt-ftparchive.1.xml:269
msgid "Directory"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:270
+#: apt-ftparchive.1.xml:271
msgid ""
"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
"$(SECTION)/binary-$(ARCH)/</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:274
+#: apt-ftparchive.1.xml:275
msgid "SrcDirectory"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:276
+#: apt-ftparchive.1.xml:277
msgid ""
"Sets the top of the source package directory tree. Defaults to <filename>"
"$(DIST)/$(SECTION)/source/</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406
+#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407
msgid "Packages"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:282
+#: apt-ftparchive.1.xml:283
msgid ""
"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
"binary-$(ARCH)/Packages</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411
+#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412
msgid "Sources"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:288
+#: apt-ftparchive.1.xml:289
msgid ""
"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
"source/Sources</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:292
+#: apt-ftparchive.1.xml:293
msgid "InternalPrefix"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:294
+#: apt-ftparchive.1.xml:295
msgid ""
"Sets the path prefix that causes a symlink to be considered an internal link "
"instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -2393,12 +2394,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417
+#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418
msgid "Contents"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:301
+#: apt-ftparchive.1.xml:302
msgid ""
"Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
"</filename>. If this setting causes multiple Packages files to map onto a "
@@ -2407,34 +2408,34 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:308
+#: apt-ftparchive.1.xml:309
msgid "Contents::Header"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:310
+#: apt-ftparchive.1.xml:311
msgid "Sets header file to prepend to the contents output."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442
+#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443
msgid "BinCacheDB"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:315
+#: apt-ftparchive.1.xml:316
msgid ""
"Sets the binary cache database to use for this section. Multiple sections "
"can share the same database."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319
+#: apt-ftparchive.1.xml:320
msgid "FileList"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:322
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -2442,12 +2443,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:326
+#: apt-ftparchive.1.xml:327
msgid "SourceFileList"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:328
+#: apt-ftparchive.1.xml:329
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -2456,12 +2457,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:336
+#: apt-ftparchive.1.xml:337
msgid "Tree Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:338
+#: apt-ftparchive.1.xml:339
msgid ""
"The <literal>Tree</literal> section defines a standard Debian file tree "
"which consists of a base directory, then multiple sections in that base "
@@ -2471,7 +2472,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:343
+#: apt-ftparchive.1.xml:344
msgid ""
"The <literal>Tree</literal> section takes a scope tag which sets the "
"<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -2480,7 +2481,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:348
+#: apt-ftparchive.1.xml:349
msgid ""
"All of the settings defined in the <literal>TreeDefault</literal> section "
"can be use in a <literal>Tree</literal> section as well as three new "
@@ -2488,7 +2489,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:354
+#: apt-ftparchive.1.xml:355
#, no-wrap
msgid ""
"for i in Sections do \n"
@@ -2498,7 +2499,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
+#: apt-ftparchive.1.xml:352
msgid ""
"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
"command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -2506,13 +2507,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:360
+#: apt-ftparchive.1.xml:361
#, fuzzy
msgid "Sections"
msgstr "Descrição"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:362
+#: apt-ftparchive.1.xml:363
msgid ""
"This is a space separated list of sections which appear under the "
"distribution, typically this is something like <literal>main contrib non-"
@@ -2520,12 +2521,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:367
+#: apt-ftparchive.1.xml:368
msgid "Architectures"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:369
+#: apt-ftparchive.1.xml:370
msgid ""
"This is a space separated list of all the architectures that appear under "
"search section. The special architecture 'source' is used to indicate that "
@@ -2533,56 +2534,56 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422
+#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423
msgid "BinOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:376
+#: apt-ftparchive.1.xml:377
msgid ""
"Sets the binary override file. The override file contains section, priority "
"and maintainer address information."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427
+#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428
msgid "SrcOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:382
+#: apt-ftparchive.1.xml:383
msgid ""
"Sets the source override file. The override file contains section "
"information."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432
+#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433
msgid "ExtraOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434
+#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435
msgid "Sets the binary extra override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437
+#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438
msgid "SrcExtraOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439
+#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440
msgid "Sets the source extra override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:398
+#: apt-ftparchive.1.xml:399
msgid "BinDirectory Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:400
+#: apt-ftparchive.1.xml:401
msgid ""
"The <literal>bindirectory</literal> section defines a binary directory tree "
"with no special structure. The scope tag specifies the location of the "
@@ -2592,64 +2593,64 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:408
+#: apt-ftparchive.1.xml:409
msgid "Sets the Packages file output."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:413
+#: apt-ftparchive.1.xml:414
msgid ""
"Sets the Sources file output. At least one of <literal>Packages</literal> or "
"<literal>Sources</literal> is required."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:419
+#: apt-ftparchive.1.xml:420
msgid "Sets the Contents file output. (optional)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:424
+#: apt-ftparchive.1.xml:425
msgid "Sets the binary override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:429
+#: apt-ftparchive.1.xml:430
msgid "Sets the source override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:444
+#: apt-ftparchive.1.xml:445
msgid "Sets the cache DB."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:447
+#: apt-ftparchive.1.xml:448
msgid "PathPrefix"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:449
+#: apt-ftparchive.1.xml:450
msgid "Appends a path to all the output paths."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:452
+#: apt-ftparchive.1.xml:453
msgid "FileList, SourceFileList"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:454
+#: apt-ftparchive.1.xml:455
msgid "Specifies the file list file."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:461
+#: apt-ftparchive.1.xml:462
msgid "The Binary Override File"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:463
msgid ""
"The binary override file is fully compatible with &dpkg-scanpackages;. It "
"contains 4 fields separated by spaces. The first field is the package name, "
@@ -2659,19 +2660,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:469
#, no-wrap
msgid "old [// oldn]* => new"
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:470
+#: apt-ftparchive.1.xml:471
#, no-wrap
msgid "new"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:467
+#: apt-ftparchive.1.xml:468
msgid ""
"The general form of the maintainer field is: <placeholder type="
"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -2682,12 +2683,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:478
+#: apt-ftparchive.1.xml:479
msgid "The Source Override File"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:480
+#: apt-ftparchive.1.xml:481
msgid ""
"The source override file is fully compatible with &dpkg-scansources;. It "
"contains 2 fields separated by spaces. The first fields is the source "
@@ -2695,12 +2696,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:485
+#: apt-ftparchive.1.xml:486
msgid "The Extra Override File"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:488
msgid ""
"The extra override file allows any arbitrary tag to be added or replaced in "
"the output. It has 3 columns, the first is the package, the second is the "
@@ -2708,12 +2709,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:496
+#: apt-ftparchive.1.xml:497
msgid "<option>--md5</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:498
+#: apt-ftparchive.1.xml:499
msgid ""
"Generate MD5 sums. This defaults to on, when turned off the generated index "
"files will not have MD5Sum fields where possible. Configuration Item: "
@@ -2721,19 +2722,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:503
+#: apt-ftparchive.1.xml:504
msgid "<option>--db</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:505
+#: apt-ftparchive.1.xml:506
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:512
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -2742,12 +2743,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:517
+#: apt-ftparchive.1.xml:518
msgid "<option>--delink</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:519
+#: apt-ftparchive.1.xml:520
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
"then this option actually enables delinking of the files. It defaults to on "
@@ -2756,12 +2757,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:525
+#: apt-ftparchive.1.xml:526
msgid "<option>--contents</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:527
+#: apt-ftparchive.1.xml:528
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -2771,12 +2772,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:535
+#: apt-ftparchive.1.xml:536
msgid "<option>--source-override</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:538
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
"command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -2784,26 +2785,40 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:541
+#: apt-ftparchive.1.xml:542
msgid "<option>--readonly</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:543
+#: apt-ftparchive.1.xml:544
msgid ""
"Make the caching databases read only. Configuration Item: <literal>APT::"
"FTPArchive::ReadOnlyDB</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:547
-msgid "<option>APT::FTPArchive::AlwaysStat</option>"
+#: apt-ftparchive.1.xml:548
+msgid "<option>--arch</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:549
msgid ""
-"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If "
+"Accept in the <literal>packages</literal> and <literal>contents</literal> "
+"commands only package files matching <literal>*_arch.deb</literal> or "
+"<literal>*_all.deb</literal> instead of all package files in the given "
+"path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:555
+msgid "<option>APT::FTPArchive::AlwaysStat</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:557
+msgid ""
+"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
"packages are recompiled and/or republished with the same version again, this "
"will lead to problems as the now outdated cached metadata like size and "
"checksums will be used. With this option enabled this will no longer happen "
@@ -2815,12 +2830,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:559
+#: apt-ftparchive.1.xml:567
msgid "<option>APT::FTPArchive::LongDescription</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:569
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -2830,27 +2845,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469
+#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477
#: sources.list.5.xml:193
#, fuzzy
msgid "Examples"
msgstr "Exemplos"
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:579
+#: apt-ftparchive.1.xml:587
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:575
+#: apt-ftparchive.1.xml:583
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:589
+#: apt-ftparchive.1.xml:597
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -5923,7 +5938,8 @@ msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt_preferences.5.xml:13
-msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>"
+msgid ""
+"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
@@ -5993,6 +6009,17 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:56
msgid ""
+"Preferences are a strong power in the hands of a system administrator but "
+"they can become also their biggest nightmare if used without care! APT will "
+"not questioning the preferences so wrong settings will therefore lead to "
+"uninstallable packages or wrong decisions while upgrading packages. Even "
+"more problems will arise if multiply distribution releases are mixed without "
+"a good understanding of the following paragraphs. You have been warned."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_preferences.5.xml:64
+msgid ""
"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
"directory are parsed in alphanumeric ascending order and need to obey the "
"following naming convention: The files have no or \"<literal>pref</literal>"
@@ -6002,13 +6029,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:63
+#: apt_preferences.5.xml:71
#, fuzzy
msgid "APT's Default Priority Assignments"
msgstr "Atribuições de Prioridade Padrão do APT"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:78
+#: apt_preferences.5.xml:86
#, fuzzy, no-wrap
msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
msgstr ""
@@ -6016,7 +6043,7 @@ msgstr ""
"<command>apt-get install -t testing <replaceable>algum-pacote</replaceable></command>\n"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml:89
#, fuzzy, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr ""
@@ -6024,7 +6051,7 @@ msgstr ""
"APT::Default-Release \"stable\";\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:65
+#: apt_preferences.5.xml:73
#, fuzzy
msgid ""
"If there is no preferences file or if there is no entry in the file that "
@@ -6049,25 +6076,25 @@ msgstr ""
"etc/apt/apt.conf</filename>. Por exemplo,"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:90
+#: apt_preferences.5.xml:98
#, fuzzy
msgid "priority 100"
msgstr "prioridade 100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:91
+#: apt_preferences.5.xml:99
#, fuzzy
msgid "to the version that is already installed (if any)."
msgstr "para a instância que já esteja instalada (caso exista)."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:95
+#: apt_preferences.5.xml:103
#, fuzzy
msgid "priority 500"
msgstr "prioridade 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:96
+#: apt_preferences.5.xml:104
#, fuzzy
msgid ""
"to the versions that are not installed and do not belong to the target "
@@ -6076,13 +6103,13 @@ msgstr ""
"para as instâncias que não estã instaladas e que não pertencem a versão alvo."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:100
+#: apt_preferences.5.xml:108
#, fuzzy
msgid "priority 990"
msgstr "prioridade 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:101
+#: apt_preferences.5.xml:109
#, fuzzy
msgid ""
"to the versions that are not installed and belong to the target release."
@@ -6090,7 +6117,7 @@ msgstr ""
"para as instâncias que não estejam instaladas e pertençam a versão alvo."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:85
+#: apt_preferences.5.xml:93
#, fuzzy
msgid ""
"If the target release has been specified then APT uses the following "
@@ -6102,7 +6129,7 @@ msgstr ""
"Atribuirá :"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:114
#, fuzzy
msgid ""
"If the target release has not been specified then APT simply assigns "
@@ -6114,7 +6141,7 @@ msgstr ""
"prioridade 500 para todas as instâncias de pacotes não instaladas."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:110
+#: apt_preferences.5.xml:118
#, fuzzy
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
@@ -6124,7 +6151,7 @@ msgstr ""
"determinar qual instância de um pacote instalar."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:113
+#: apt_preferences.5.xml:121
#, fuzzy
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
@@ -6141,13 +6168,13 @@ msgstr ""
"\"downgrade\" pode ser arriscado.)"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:119
+#: apt_preferences.5.xml:127
#, fuzzy
msgid "Install the highest priority version."
msgstr "Instala a instância de prioridade mais alta."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:120
+#: apt_preferences.5.xml:128
#, fuzzy
msgid ""
"If two or more versions have the same priority, install the most recent one "
@@ -6157,7 +6184,7 @@ msgstr ""
"mais recente (ou seja, aquela com o maior número de versão)."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:131
#, fuzzy
msgid ""
"If two or more versions have the same priority and version number but either "
@@ -6169,7 +6196,7 @@ msgstr ""
"<literal>--reinstall</literal> seja fornecida, instala aquela desinstalada."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:137
#, fuzzy
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
@@ -6186,7 +6213,7 @@ msgstr ""
"forem executados."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:136
+#: apt_preferences.5.xml:144
#, fuzzy
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
@@ -6201,7 +6228,7 @@ msgstr ""
"upgrade</command> forem executados."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml:149
#, fuzzy
msgid ""
"Sometimes the installed version of a package is more recent than the version "
@@ -6221,13 +6248,13 @@ msgstr ""
"disponíveis possuir uma prioridade maior do que a versão instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:150
+#: apt_preferences.5.xml:158
#, fuzzy
msgid "The Effect of APT Preferences"
msgstr "O Efeito das Preferências do APT"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:152
+#: apt_preferences.5.xml:160
#, fuzzy
msgid ""
"The APT preferences file allows the system administrator to control the "
@@ -6241,7 +6268,7 @@ msgstr ""
"das duas formas, uma forma específica e uma forma geral."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:166
#, fuzzy
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
@@ -6257,7 +6284,7 @@ msgstr ""
"com \"<literal>5.8</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:165
+#: apt_preferences.5.xml:173
#, fuzzy, no-wrap
msgid ""
"Package: perl\n"
@@ -6270,7 +6297,7 @@ msgstr ""
"Pin-Priority: 1001\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:171
+#: apt_preferences.5.xml:179
#, fuzzy
msgid ""
"The general form assigns a priority to all of the package versions in a "
@@ -6286,7 +6313,7 @@ msgstr ""
"identificado pelo nome de domínio totalmente qualificado do site Internet."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:177
+#: apt_preferences.5.xml:185
#, fuzzy
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
@@ -6299,7 +6326,7 @@ msgstr ""
"no site local."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:182
+#: apt_preferences.5.xml:190
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -6312,7 +6339,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:187
+#: apt_preferences.5.xml:195
#, fuzzy
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
@@ -6329,7 +6356,7 @@ msgstr ""
"como \"Debian\" ou \"Ximian\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:193
+#: apt_preferences.5.xml:201
#, fuzzy
msgid ""
"The following record assigns a low priority to all package versions "
@@ -6341,7 +6368,7 @@ msgstr ""
"\"<literal>unstable</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:197
+#: apt_preferences.5.xml:205
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -6354,7 +6381,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:210
#, fuzzy
msgid ""
"The following record assigns a high priority to all package versions "
@@ -6366,7 +6393,7 @@ msgstr ""
"\"<literal>unstable</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:206
+#: apt_preferences.5.xml:214
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -6379,7 +6406,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:211
+#: apt_preferences.5.xml:219
#, fuzzy
msgid ""
"The following record assigns a high priority to all package versions "
@@ -6392,7 +6419,7 @@ msgstr ""
"literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:216
+#: apt_preferences.5.xml:224
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -6405,19 +6432,19 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:227
+#: apt_preferences.5.xml:235
#, fuzzy
msgid "How APT Interprets Priorities"
msgstr "Como o APT Interpreta Prioridades"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:243
#, fuzzy
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:236
+#: apt_preferences.5.xml:244
#, fuzzy
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
@@ -6427,13 +6454,13 @@ msgstr ""
"dowgrade do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:248
#, fuzzy
msgid "990 &lt; P &lt;=1000"
msgstr "990 &lt; P &lt;=1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:241
+#: apt_preferences.5.xml:249
#, fuzzy
msgid ""
"causes a version to be installed even if it does not come from the target "
@@ -6443,13 +6470,13 @@ msgstr ""
"versão alvo, a menos que a versão instalada seja mais recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:246
+#: apt_preferences.5.xml:254
#, fuzzy
msgid "500 &lt; P &lt;=990"
msgstr "500 &lt; P &lt;=990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:247
+#: apt_preferences.5.xml:255
#, fuzzy
msgid ""
"causes a version to be installed unless there is a version available "
@@ -6459,13 +6486,13 @@ msgstr ""
"disponível pertencente a versão alvo ou a versão instalada seja mais recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:252
+#: apt_preferences.5.xml:260
#, fuzzy
msgid "100 &lt; P &lt;=500"
msgstr "100 &lt; P &lt;=500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:253
+#: apt_preferences.5.xml:261
#, fuzzy
msgid ""
"causes a version to be installed unless there is a version available "
@@ -6476,13 +6503,13 @@ msgstr ""
"seja mais recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:258
+#: apt_preferences.5.xml:266
#, fuzzy
msgid "0 &lt; P &lt;=100"
msgstr "0 &lt;= P &lt;=100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:259
+#: apt_preferences.5.xml:267
#, fuzzy
msgid ""
"causes a version to be installed only if there is no installed version of "
@@ -6492,19 +6519,19 @@ msgstr ""
"instalada do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:263
+#: apt_preferences.5.xml:271
#, fuzzy
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:272
#, fuzzy
msgid "prevents the version from being installed"
msgstr "impede a versão de ser instalada"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:230
+#: apt_preferences.5.xml:238
#, fuzzy
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
@@ -6516,7 +6543,7 @@ msgstr ""
"seguir (a grosso modo):"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:269
+#: apt_preferences.5.xml:277
#, fuzzy
msgid ""
"If any specific-form records match an available package version then the "
@@ -6532,7 +6559,7 @@ msgstr ""
"determinará a prioridade da versão do pacote."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:283
#, fuzzy
msgid ""
"For example, suppose the APT preferences file contains the three records "
@@ -6542,7 +6569,7 @@ msgstr ""
"registros apresentados anteriormente :"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:279
+#: apt_preferences.5.xml:287
#, fuzzy, no-wrap
msgid ""
"Package: perl\n"
@@ -6571,12 +6598,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:292
+#: apt_preferences.5.xml:300
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:294
+#: apt_preferences.5.xml:302
#, fuzzy
msgid ""
"The most recent available version of the <literal>perl</literal> package "
@@ -6592,7 +6619,7 @@ msgstr ""
"será feito um downgrade do <literal>perl</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:299
+#: apt_preferences.5.xml:307
#, fuzzy
msgid ""
"A version of any package other than <literal>perl</literal> that is "
@@ -6604,7 +6631,7 @@ msgstr ""
"mesmo versões pertencentes a versão alvo."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:303
+#: apt_preferences.5.xml:311
#, fuzzy
msgid ""
"A version of a package whose origin is not the local system but some other "
@@ -6619,13 +6646,13 @@ msgstr ""
"instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:313
+#: apt_preferences.5.xml:321
#, fuzzy
msgid "Determination of Package Version and Distribution Properties"
msgstr "Determinação da Versão do Pacote e Propriedades da Distribuição"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:323
#, fuzzy
msgid ""
"The locations listed in the &sources-list; file should provide "
@@ -6637,31 +6664,31 @@ msgstr ""
"os pacotes disponíveis nessas localidades."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:327
+#: apt_preferences.5.xml:335
#, fuzzy
msgid "the <literal>Package:</literal> line"
msgstr "a linha <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:336
#, fuzzy
msgid "gives the package name"
msgstr "informa o nome do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:331 apt_preferences.5.xml:381
+#: apt_preferences.5.xml:339 apt_preferences.5.xml:389
#, fuzzy
msgid "the <literal>Version:</literal> line"
msgstr "a linha <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:332
+#: apt_preferences.5.xml:340
#, fuzzy
msgid "gives the version number for the named package"
msgstr "informa o número de versão do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:319
+#: apt_preferences.5.xml:327
#, fuzzy
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
@@ -6683,13 +6710,13 @@ msgstr ""
"do APT :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:356
#, fuzzy
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:349
+#: apt_preferences.5.xml:357
#, fuzzy
msgid ""
"names the archive to which all the packages in the directory tree belong. "
@@ -6707,7 +6734,7 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:367
#, fuzzy, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
@@ -6715,13 +6742,13 @@ msgstr ""
"Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:365
+#: apt_preferences.5.xml:373
#, fuzzy
msgid "the <literal>Codename:</literal> line"
msgstr "a linha <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:366
+#: apt_preferences.5.xml:374
#, fuzzy
msgid ""
"names the codename to which all the packages in the directory tree belong. "
@@ -6738,13 +6765,13 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:383
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:382
+#: apt_preferences.5.xml:390
#, fuzzy
msgid ""
"names the release version. For example, the packages in the tree might "
@@ -6761,7 +6788,7 @@ msgstr ""
"das linhas a seguir."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:391
+#: apt_preferences.5.xml:399
#, fuzzy, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -6774,13 +6801,13 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:400
+#: apt_preferences.5.xml:408
#, fuzzy
msgid "the <literal>Component:</literal> line"
msgstr "a linha <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:409
#, fuzzy
msgid ""
"names the licensing component associated with the packages in the directory "
@@ -6799,7 +6826,7 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:418
#, fuzzy, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
@@ -6807,13 +6834,13 @@ msgstr ""
"Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:424
#, fuzzy
msgid "the <literal>Origin:</literal> line"
msgstr "a linha <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:417
+#: apt_preferences.5.xml:425
#, fuzzy
msgid ""
"names the originator of the packages in the directory tree of the "
@@ -6827,7 +6854,7 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:423
+#: apt_preferences.5.xml:431
#, fuzzy, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
@@ -6835,13 +6862,13 @@ msgstr ""
"Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:429
+#: apt_preferences.5.xml:437
#, fuzzy
msgid "the <literal>Label:</literal> line"
msgstr "a linha <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:430
+#: apt_preferences.5.xml:438
#, fuzzy
msgid ""
"names the label of the packages in the directory tree of the "
@@ -6854,7 +6881,7 @@ msgstr ""
"arquivo de preferências do APT iria requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:444
#, fuzzy, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
@@ -6862,7 +6889,7 @@ msgstr ""
"Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:345
#, fuzzy
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
@@ -6885,7 +6912,7 @@ msgstr ""
"do APT :"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:443
+#: apt_preferences.5.xml:451
#, fuzzy
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
@@ -6911,13 +6938,13 @@ msgstr ""
"<literal>unstable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:456
+#: apt_preferences.5.xml:464
#, fuzzy
msgid "Optional Lines in an APT Preferences Record"
msgstr "Linhas Opcionais em um Registro de Preferências do APT"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:458
+#: apt_preferences.5.xml:466
#, fuzzy
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
@@ -6929,7 +6956,7 @@ msgstr ""
"</literal>. Isto oferece um local para inserir comentários."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:462
+#: apt_preferences.5.xml:470
#, fuzzy
msgid ""
"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
@@ -6943,13 +6970,13 @@ msgstr ""
"release ...</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:471
+#: apt_preferences.5.xml:479
#, fuzzy
msgid "Tracking Stable"
msgstr "Acompanhando a Stable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:487
#, fuzzy, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6974,7 +7001,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:473
+#: apt_preferences.5.xml:481
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a priority "
@@ -6990,8 +7017,8 @@ msgstr ""
"outras distribuições <literal>Debian</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:496 apt_preferences.5.xml:542
-#: apt_preferences.5.xml:600
+#: apt_preferences.5.xml:504 apt_preferences.5.xml:550
+#: apt_preferences.5.xml:608
#, fuzzy, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -7004,7 +7031,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:491
+#: apt_preferences.5.xml:499
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -7017,7 +7044,7 @@ msgstr ""
"ulítma(s) versão(ôes) <literal>stable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:508
+#: apt_preferences.5.xml:516
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr ""
@@ -7025,7 +7052,7 @@ msgstr ""
"apt-get install <replaceable>pacote</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:510
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -7038,13 +7065,13 @@ msgstr ""
"atualizado novamente a menos que esse comando seja executado novamente."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:514
+#: apt_preferences.5.xml:522
#, fuzzy
msgid "Tracking Testing or Unstable"
msgstr "Acompanhando a Testing"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:523
+#: apt_preferences.5.xml:531
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -7073,7 +7100,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:524
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
@@ -7090,7 +7117,7 @@ msgstr ""
"versões de pacotes de outras distribuições <literal>Debian</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:545
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -7103,7 +7130,7 @@ msgstr ""
"(s) última(s) versão(ões) <literal>testing</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:565
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr ""
@@ -7111,7 +7138,7 @@ msgstr ""
"apt-get install <replaceable>pacote</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:556
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -7131,12 +7158,12 @@ msgstr ""
"recente que a versão instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:564
+#: apt_preferences.5.xml:572
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:578
+#: apt_preferences.5.xml:586
#, fuzzy, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -7166,7 +7193,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:566
+#: apt_preferences.5.xml:574
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -7181,7 +7208,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:595
+#: apt_preferences.5.xml:603
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -7194,7 +7221,7 @@ msgstr ""
"ulítma(s) versão(ôes) <literal>stable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:615
+#: apt_preferences.5.xml:623
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr ""
@@ -7202,7 +7229,7 @@ msgstr ""
"apt-get install <replaceable>pacote</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:606
+#: apt_preferences.5.xml:614
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -7222,13 +7249,13 @@ msgstr ""
"recente que a versão instalada."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:624
+#: apt_preferences.5.xml:632
#, fuzzy
msgid "&file-preferences;"
msgstr "apt_preferences"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:630
+#: apt_preferences.5.xml:638
#, fuzzy
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
diff --git a/po/ar.po b/po/ar.po
index c5fbe9077..15d5f7205 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2006-10-20 21:28+0300\n"
"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
"Language-Team: Arabic <support@arabeyes.org>\n"
@@ -151,7 +151,7 @@ msgstr " جدول النسخ:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s لـ%s %s مُجمّع على %s %s\n"
@@ -247,7 +247,7 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "تعذرت الكتابة إلى %s"
@@ -343,7 +343,7 @@ msgstr "قاعدة البيانات قديمة، محاولة ترقية %s"
#: ftparchive/cachedb.cc:72
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
@@ -358,11 +358,11 @@ msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
msgid "Failed to stat %s"
msgstr ""
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr ""
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr ""
@@ -427,26 +427,26 @@ msgstr "*** فشل ربط %s بـ%s"
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -550,7 +550,7 @@ msgstr "فشل تغيير اسم %s إلى %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -711,11 +711,11 @@ msgstr "حزم بحاجة للإزالة لكن الإزالة مُعطّلة."
msgid "Internal error, Ordering didn't finish"
msgstr "خطأ داخلي، لم تنته عملية الترتيب"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "تعذر قَفْل دليل التنزيل"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "تعذرت قراءة قائمة المصادر."
@@ -744,8 +744,8 @@ msgstr "بعد الاستخراج %sب من المساحة الإضافيّة س
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "تعذر حساب المساحة الحرة في %s"
@@ -782,7 +782,7 @@ msgstr "إجهاض."
msgid "Do you want to continue [Y/n]? "
msgstr "هل تريد الاستمرار [Y/n]؟"
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "فشل إحضار %s %s\n"
@@ -791,7 +791,7 @@ msgstr "فشل إحضار %s %s\n"
msgid "Some files failed to download"
msgstr "فشل تنزيل بعض الملفات"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "اكتمل التنزيل وفي وضع التنزيل فقط"
@@ -885,51 +885,51 @@ msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'"
msgid "Selected version %s (%s) for %s\n"
msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
+#: cmdline/apt-get.cc:1321
#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
+msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1352
#, c-format
-msgid "Ignore unavailable target release '%s' of package '%s'"
+msgid "Picking '%s' as source package instead of '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
+msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "لا يقبل الأمر update أية مُعطيات"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "تعذر قفل دليل القائمة"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "سيتم تثبيت الحزم الجديدة التالية:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "سيتم تثبيت الحزم الجديدة التالية:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -945,51 +945,51 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "قد تساعد المعلومات التالية في حل المشكلة:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "تعذر العثور على الحزمة %s"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "تعذر العثور على الحزمة %s"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "لاحظ، تحديد %s بسبب صيغة regex '%s'\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "إلا أنه سيتم تثبيت %s"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "قد ترغب بتشغيل `apt-get -f install' لتصحيح هذه:"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
"مُعتمدات غير مستوفاة. جرب 'apt-get -f install' بدون أسماء حزم (أو حدّد حلاً)."
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -997,152 +997,152 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "حزم معطوبة"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "سيتم تثبيت الحزم الإضافيّة التالية:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "الحزم المقترحة:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "الحزم المستحسنة:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "حساب الترقية..."
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "فشل"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "تمّ"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "تعذر العثور على مصدر الحزمة %s"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "تخطي الملف '%s' المنزل مسبقاً\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "ليس هناك مساحة كافية في %s"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "يجب جلب %sب/%sب من الأرشيفات المصدرية.\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "إحضار المصدر %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "فشل إحضار بعض الأرشيفات."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "أمر فك الحزمة '%s' فشل.\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "أمر البناء '%s' فشل.\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "الوحدات المدعومة:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1186,7 +1186,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1421,11 +1421,10 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "تعذرت قراءة %s"
@@ -1455,9 +1454,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr ""
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "قراءة قوائم الحزم"
@@ -1588,11 +1587,11 @@ msgid "File not found"
msgstr "لم يُعثر على الملف"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "فشيل تنفيذ stat"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "فشل تعيين وقت التعديل"
@@ -1654,7 +1653,7 @@ msgstr "انتهى وقت الاتصال"
msgid "Server closed the connection"
msgstr "أغلق الخادم الاتصال"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "خطأ في القراءة"
@@ -1666,7 +1665,7 @@ msgstr ""
msgid "Protocol corruption"
msgstr ""
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "خطأ في الكتابة"
@@ -1720,7 +1719,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr "تعذر قبول الاتصال"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@@ -1784,58 +1783,63 @@ msgstr "تعذر الاتصال بـ%s:%s (%s)."
msgid "Connecting to %s"
msgstr "الاتصال بـ%s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr ""
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr ""
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr ""
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "تعذر الاتصال بـ%s %s:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "إجهاض التثبيت."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr ""
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1884,48 +1888,48 @@ msgstr "خادم http له دعم مدى معطوب"
msgid "Unknown date format"
msgstr "نسق تاريخ مجهول"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "فشل التحديد"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "انتهى وقت الاتصال"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "خطأ في الكتابة إلى ملف المُخرجات"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "خطأ في الكتابة إلى الملف"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "خطأ في الكتابة إلى الملف"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "خطأ في القراءة من الخادم. أقفل الطرف الآخر الاتصال"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "خطأ في القراءة من الخادم"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
#, fuzzy
msgid "Failed to truncate file"
msgstr "فشلت كتابة الملف %s"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "بيانات ترويسة سيئة"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "فشل الاتصال"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "خطأ داخلي"
@@ -1933,18 +1937,25 @@ msgstr "خطأ داخلي"
msgid "Can't mmap an empty file"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -1974,52 +1985,52 @@ msgstr ""
msgid "Selection %s not found"
msgstr "تعذر العثور على التحديد %s"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "اختصار نوع مجهول: '%c'"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "فتح ملف التهيئة %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr ""
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr ""
@@ -2095,75 +2106,75 @@ msgstr ""
msgid "Failed to stat the cdrom"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, c-format
msgid "Sub-process %s received signal %u."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "مشكلة في إغلاق الملف"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "مشكلة في مزامنة الملف"
@@ -2281,52 +2292,52 @@ msgstr ""
msgid "Unable to parse package file %s (2)"
msgstr ""
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "فتح %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
@@ -2443,17 +2454,17 @@ msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr "قد يساعدك تنفيذ الأمر apt-get update في تصحيح هذه المشاكل"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr ""
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr ""
@@ -2537,16 +2548,16 @@ msgstr ""
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr ""
@@ -2555,40 +2566,40 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr "فشل إعادة التسمية ، %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "MD5Sum غير متطابقة"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "MD5Sum غير متطابقة"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "الحجم غير متطابق"
@@ -2720,7 +2731,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "فتح ملف التهيئة %s"
@@ -2751,7 +2761,6 @@ msgstr "إزالة %s"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "تمت إزالة %s بالكامل"
@@ -2835,8 +2844,18 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
msgstr ""
#: methods/rsh.cc:330
diff --git a/po/ast.po b/po/ast.po
index 5273037fa..7df0e8f06 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.18\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2009-07-01 18:09+0100\n"
"Last-Translator: Marcos Alvarez Costales <marcos.alvarez.costales@gmail."
"com>\n"
@@ -143,7 +143,7 @@ msgstr " Tabla de versiones:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s pa %s compilu en %s %s\n"
@@ -299,7 +299,7 @@ msgstr ""
"-o=? Afita una opcin de configuracin arbitraria, p. ej. -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "Nun se pue escribir en %s"
@@ -433,8 +433,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "La DB ye antigua, tentando actualizar %s"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"El formatu de la base de datos nun ye vlidu. Si anovaste dende una versin "
@@ -451,11 +452,11 @@ msgstr "Nun pudo abrise'l ficheru de BD %s: %s"
msgid "Failed to stat %s"
msgstr "Nun pudo lleese %s"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "L'archivu nun tien rexistru de control"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Nun pudo algamase un cursor"
@@ -520,26 +521,26 @@ msgstr "*** Fall enllazar enllazr %s a %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Alcanzose'l llmite of %sB de desenllaz.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "L'archivu nun tien el campu paquetes"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nun tien la entrada saltos\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " el curiador de %s ye %s y non %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nun tien la entrada saltos de fonte\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s tampoco nun tiene una entrada binaria de saltos\n"
@@ -643,7 +644,7 @@ msgstr "Nun pudo renomase %s como %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error de compilacin d'espresin regular - %s"
@@ -804,11 +805,11 @@ msgstr "Fai falta desaniciar los paquetes pero desaniciar ta torgu."
msgid "Internal error, Ordering didn't finish"
msgstr "Error internu, ordenar nun fin"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "Nun pue bloquiase'l direutoriu de descarga"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Nun pudo lleese la llista de fontes."
@@ -837,8 +838,8 @@ msgstr "Tres d'esta operacin, van usase %sB d'espaciu de discu adicional.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Tres d'esta operacin, van lliberase %sB d'espaciu de discu.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nun pue determinase l'espaciu llibre de %s"
@@ -875,7 +876,7 @@ msgstr "Encaboxar."
msgid "Do you want to continue [Y/n]? "
msgstr "Quies continuar [S/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Fall algamar %s %s\n"
@@ -884,7 +885,7 @@ msgstr "Fall algamar %s %s\n"
msgid "Some files failed to download"
msgstr "Dellos ficheros nun pudieron descargase"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "Descarga completa y en mou de slo descarga"
@@ -981,35 +982,35 @@ msgstr "Nun s'alcontr la versin '%s' pa '%s'"
msgid "Selected version %s (%s) for %s\n"
msgstr "Escoyida la versin %s (%s) pa %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Nun se puede lleer la llista de paquetes d'orxenes %s"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "La orde update nun lleva argumentos"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Nun pudo bloquiase'l direutoriu de llista"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Suponse que nun vamos esborrar coses; nun pue entamase AutoRemover"
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1017,18 +1018,18 @@ msgstr ""
"Los siguientes paquetes instalaronse de manera automtica y ya nun se "
"necesiten:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"Los siguientes paquetes instalaronse de manera automtica y ya nun se "
"necesiten:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Usa 'apt-get autoremove' pa desinstalalos."
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1046,43 +1047,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "La siguiente informacin pue aidar a resolver la situacin:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Error internu, AutoRemover rompi coses"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Error internu, AllUpgrade rompi coses"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "Nun pudo alcontrase la tarea %s"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "Nun pudo alcontrase'l paquete %s"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, escoyendo %s pa la espresin regular '%s'\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s axustu como instalu manualmente.\n"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Habres d'executar `apt-get -f install' para iguar estos:"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1090,7 +1091,7 @@ msgstr ""
"Dependencies ensin cubrir. Tenta 'apt-get -f install' ensin paquetes (o "
"consea una solucin)."
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1102,117 +1103,117 @@ msgstr ""
"inestable, que dellos paquetes necesarios nun se crearon o que\n"
"s'allugaron fuera d'Incoming."
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "Paquetes fraaos"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "Instalarnse los siguientes paquetes extra:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Paquetes afalaos:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Paquetes encamentaos"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "Calculando l'autualizacin... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Fall"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Fecho"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "Error internu, l'iguador de problemes fra coses"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr "Has de consear polo menos un paquete p'algamar so fonte"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nun pudo alcontrase un paquete fonte pa %s"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Saltando'l ficheru y descargu '%s'\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nun hai espaciu llibre bastante en %s"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Hai falta descargar %sB/%sB d'archivos fonte.\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Hai falta descargar %sB d'archivos fonte.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "Fonte descargada %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "Fall la descarga de dellos archivos."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Saltando'l desempaquetu de la fonte y desempaquetada en %s\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Fall la orde de desempaquetu '%s'.\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instalu.\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Fall la orde build '%s'.\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "Fall el procesu fu"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Hai que consear polo menos un paquete pa verificar les dependencies de "
"construccin"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nun pudo algamase informacin de dependencies de construccin pa %s"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nun tien dependencies de construccin.\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1221,7 +1222,7 @@ msgstr ""
"La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
"paquete %s"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1230,32 +1231,32 @@ msgstr ""
"La dependencia %s en %s nun puede satisfacese porque denguna versin "
"disponible del paquete %s satisfaz los requisitos de versin"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Nun se pudo satisfacer la dependencia %s pa %s: El paquete instalu %s ye "
"demasiao nuevu"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Fallu pa satisfacer la dependencia %s pa %s: %s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Les dependencies de construccin de %s nun pudieron satisfacese."
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "Fallu al procesar les dependencies de construccin"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "Mdulos sofitaos:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1341,7 +1342,7 @@ msgstr ""
"pa ms informacin y opciones.\n"
" Esti APT tien Poderes de Super Vaca.\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1595,11 +1596,10 @@ msgstr "El ficheru %s/%s sobreescribe al que ta nel paquete %s"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "Nun ye a lleer %s"
@@ -1630,9 +1630,9 @@ msgstr ""
"Los direutorios info y temp tienen de tar nel mesmu sistema de ficheros"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "Lleendo llista de paquetes"
@@ -1766,11 +1766,11 @@ msgid "File not found"
msgstr "Nun s'atopa'l ficheru."
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "Fall al lleer"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "Nun se pudo afitar la hora de modificacin"
@@ -1832,7 +1832,7 @@ msgstr "Gandi'l tiempu de conexn"
msgid "Server closed the connection"
msgstr "El sirvidor zarr la conexn"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Fallu de llectura"
@@ -1844,7 +1844,7 @@ msgstr "Una rempuesta revirti'l buffer."
msgid "Protocol corruption"
msgstr "Corrupcin del protocolu"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Fallu d'escritura"
@@ -1898,7 +1898,7 @@ msgstr "Gandi'l tiempu de conexn col zcalu de datos"
msgid "Unable to accept connection"
msgstr "Nun se pudo aceptar la conexn"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Hebo un problema al xenerar el hash del ficheru"
@@ -1962,60 +1962,65 @@ msgstr "Nun se pudo coneutar a %s:%s (%s)."
msgid "Connecting to %s"
msgstr "Coneutando a %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nun se pudo resolver '%s'"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Fallu temporal al resolver '%s'"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Daqu raru pas resolviendo '%s:%s' (%i)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Nun se pudo coneutar a %s %s:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "Nun se pudo acceder al aniellu de claves '%s'"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Encaboxando la instalacin."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"E: Llista d'argumentos d'Acquire::gpgv::Options demasiao llarga. Colando."
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Fallu internu: Robla bona, pero nun se pudo determinar la so gella dixital?!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "Atopse polo menos una robla mala."
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr "Nun se pudo executar '%s' pa verificar la robla (ta instalu gpgv?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "Fallu desconocu al executar gpgv"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "Les siguientes robles nun valieron:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2066,47 +2071,47 @@ msgstr "Esti sirvidor HTTP tien rotu'l soporte d'alcance"
msgid "Unknown date format"
msgstr "Formatu de data desconocu"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "Fall la escoyeta"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "Gandi'l tiempu de conexn"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "Fallu al escribir nel ficheru de salida"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "Fallu al escribir nel ficheru"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "Fallu al escribir nel ficheru"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "Fallu al lleer nel sirvidor. El llau remotu zarr la conexn."
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "Fallu al lleer nel sirvidor"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr "Fall al francer el ficheru"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "Datos de testera incorreutos"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "Fallo la conexn"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Fallu internu"
@@ -2114,12 +2119,12 @@ msgstr "Fallu internu"
msgid "Can't mmap an empty file"
msgstr "Nun se puede facer mmap d'un ficheru baleru"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nun se pudo facer mmap de %lu bytes"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2128,6 +2133,13 @@ msgstr ""
"Dynamic MMap escos l'espaciu. Por favor aumenta'l tamau de APT::Cache-"
"Limit. El valor actual ye : %lu. (man 5 apt.conf)"
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2157,53 +2169,53 @@ msgstr "%lis"
msgid "Selection %s not found"
msgstr "Escoyeta %s que nun s'atopa"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Triba d'abreviatura que nun se reconoz: %c"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "Abriendo ficheros de configuracin %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Fallu de sintaxis %s:%u: Nun hai un nome al entamu del bloque."
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Fallu de sintaxis %s:%u: Marca mal formada"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Fallu de sintaxis %s:%u: Puxarra extra dempus del valor"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Error de sintaxis %s:%u: Les directives pueden facese slo nel nivel cimeru"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Fallu de sintaxis %s:%u: Demasiaes inclusiones aeraes"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Fallu de sintaxis %s:%u: Incluyendo dende equ"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Error de sintaxis %s:%u: La directiva '%s' nun ta sofitada"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Fallu de sintaxis %s:%u: Puxarra extra al final del ficheru"
@@ -2279,75 +2291,75 @@ msgstr "Nun se pudo cambiar a %s"
msgid "Failed to stat the cdrom"
msgstr "Nun se pudo montar el CD-ROM"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "Nun ta usndose bloquu pal ficheru de bloquu de slo llectura %s"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "Nun puede abrise'l ficheru de bloquu %s"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "Nun ta usndose bloquu pal ficheru de bloquu %s montu per nfs"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "Nun se pudo torgar %s"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperaba %s pero nun taba ell"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "El subprocesu %s recibi un fallu de segmentacin."
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "El subprocesu %s recibi un fallu de segmentacin."
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "El subprocesu %s devolvi un cdigu d'error (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "El subprocesu %s termin de manera inesperada"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "Nun se pudo abrir el ficheru %s"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "lleos, ent tena de lleer %lu pero nun queda nada"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "escritos, ent tena d'escribir %lu pero nun pudo facerse"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Problemes zarrando'l ficheru"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "Hai problemes desvenceyando'l ficheru %s"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "Hai problemes al sincronizar el ficheru"
@@ -2464,52 +2476,52 @@ msgstr "Nun se pudo tratar el ficheru de paquetes %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Nun se pudo tratar el ficheru de paquetes %s (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Llinia %lu mal formada na llista d'orxenes %s (URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Llinia %lu mal formada na llista d'orxenes %s (dist)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Llinia %lu mal formada na llista d'orxenes %s (anals d'URI)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Llinia %lu mal formada na llista d'orxenes %s (dist absoluta)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Llinia %lu mal formada na llista d'orxenes %s (anals de dist)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "Abriendo %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Llinia %u demasiao llarga na llista d'orgenes %s."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Llinia %u mal formada na llista d'orxenes %s (triba)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Triba '%s' desconocida na llinia %u de la llista d'orxenes %s"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Llinia %u mal formada na llista d'orxenes %s (id del proveedor)"
@@ -2635,18 +2647,18 @@ msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr "Has d'executar apt-get update pa iguar estos problemes"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
"Rexistru invlidu nel ficheru de preferencies, nun hai cabecera Paquete"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "Nun s'entiende'l tipu de pin %s"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "Nun hai priorid (o ye cero) conseada pa pin"
@@ -2731,16 +2743,16 @@ msgstr "Hebo un error al procesar %s (CollectFileProvides)"
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Al procesar dependencies de ficheros nun s'alcontr el paquete %s %s"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Nun se puede lleer la llista de paquetes d'orxenes %s"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "Recoyendo ficheros qu'apurren"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "Fallu de E/S al grabar cach d'orxenes"
@@ -2749,19 +2761,19 @@ msgstr "Fallu de E/S al grabar cach d'orxenes"
msgid "rename failed, %s (%s -> %s)."
msgstr "fall'l cambiu de nome, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "La suma MD5 nun concasa"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "La suma hash nun concasa"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr "Nun hai clave pblica denguna disponible pa les IDs de clave darru:\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2770,7 +2782,7 @@ msgstr ""
"Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que "
"necesites iguar manualmente esti paquete (por faltar una arquitectura)"
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2779,7 +2791,7 @@ msgstr ""
"Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que "
"necesites iguar manualmente esti paquete"
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2787,7 +2799,7 @@ msgstr ""
"Los ficheros d'indiz de paquetes tan corrompos. Nun hai campu Filename: pal "
"paquete %s."
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "El tamau nun concasa"
@@ -2924,7 +2936,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "Abriendo ficheros de configuracin %s"
@@ -2935,7 +2946,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:542
#, fuzzy, c-format
-#| msgid "Hash Sum mismatch"
msgid "Hash mismatch for: %s"
msgstr "La suma hash nun concasa"
@@ -2956,7 +2966,6 @@ msgstr "Desinstalando %s"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "Desinstalse dafechu %s"
@@ -3042,14 +3051,30 @@ msgstr ""
msgid "Not locked"
msgstr "Non bloquiu"
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Nun fui quien a parchiar el ficheru"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Conexn encaboxada prematuramente"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Nun se pudo acceder al aniellu de claves '%s'"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Nun fui quien a parchiar el ficheru"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/bg.po b/po/bg.po
index 840007734..5c366b765 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.21\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2009-01-27 12:41+0200\n"
"Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -151,7 +151,7 @@ msgstr " Таблица с версиите:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s за %s компилиран на %s %s\n"
@@ -308,7 +308,7 @@ msgstr ""
" -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "Неуспех при записа на %s"
@@ -446,8 +446,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "БД е стара, опит за актуализиране на %s"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"Форматът на БД е невалиден. Ако сте обновили от стара версия на apt, "
@@ -464,11 +465,11 @@ msgstr "Неуспех при отварянето на файл %s от БД: %
msgid "Failed to stat %s"
msgstr "Грешка при получаването на атрибути за %s"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "В архива няма поле „control“"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Неуспех при получаването на курсор"
@@ -533,26 +534,26 @@ msgstr "*** Неуспех при създаването на връзка %s к
msgid " DeLink limit of %sB hit.\n"
msgstr "Превишен лимит на DeLink от %sB.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "Архивът няма поле „package“"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s няма запис „override“\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " поддържащия пакета %s е %s, а не %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s няма запис „source override“\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s няма също и запис „binary override“\n"
@@ -656,7 +657,7 @@ msgstr "Неуспех при преименуването на %s на %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "Грешка при компилирането на регулярния израз - %s"
@@ -819,11 +820,11 @@ msgstr "Трябва да бъдат премахнати пакети, но п
msgid "Internal error, Ordering didn't finish"
msgstr "Вътрешна грешка, „Ordering“ не завърши"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "Неуспех при заключването на директорията за изтегляне"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Списъкът с източници не можа да бъде прочетен."
@@ -855,8 +856,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "След тази операция ще бъде освободено %sB дисково пространство.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Неуспех при определянето на свободното пространство в %s"
@@ -893,7 +894,7 @@ msgstr "Прекъсване."
msgid "Do you want to continue [Y/n]? "
msgstr "Искате ли да продължите [Y/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Неуспех при изтеглянето на %s %s\n"
@@ -902,7 +903,7 @@ msgstr "Неуспех при изтеглянето на %s %s\n"
msgid "Some files failed to download"
msgstr "Някои файлове не можаха да бъдат изтеглени"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "Изтеглянето завърши в режим само на изтегляне"
@@ -999,53 +1000,53 @@ msgstr "Не е намерена версия „%s“ на „%s“"
msgid "Selected version %s (%s) for %s\n"
msgstr "Избрана е версия %s (%s) за %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr ""
"Неуспех при получаването на атрибути на списъка с пакети с изходен код %s"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "Командата „update“ не възприема аргументи"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Неуспех при заключването на директорията със списъка на пакетите"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Не би трябвало да се изтрива. AutoRemover няма да бъде стартиран"
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr ""
"Следните пакети са били инсталирани автоматично и вече не са необходими:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"Следните пакети са били инсталирани автоматично и вече не са необходими:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Използвайте „apt-get autoremove“ за да ги премахнете."
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1063,44 +1064,44 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr ""
"Следната информация може да помогне за намиране на изход от ситуацията:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Вътрешна грешка, AutoRemover счупи нещо в системата"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "Неуспех при намирането на задача %s"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "Неуспех при намирането на пакет %s"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Забележете, избиране на %s за регулярен израз „%s“\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s е отбелязан като ръчно инсталиран.\n"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1108,7 +1109,7 @@ msgstr ""
"Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или "
"укажете разрешение)."
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1120,118 +1121,118 @@ msgstr ""
"дистрибуция, че някои необходими пакети още не са създадени или пък\n"
"са били преместени от Incoming."
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "Счупени пакети"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "Следните допълнителни пакети ще бъдат инсталирани:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Предложени пакети:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Препоръчвани пакети:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "Изчисляване на актуализацията..."
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Неуспех"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Готово"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Неуспех при намирането на изходен код на пакет %s"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Пропускане на вече изтегления файл „%s“\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Нямате достатъчно свободно пространство в %s"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "Изтегляне на изходен код %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "Неуспех при изтеглянето на някои архиви."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Командата за разпакетиране „%s“ пропадна.\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Командата за компилиране „%s“ пропадна.\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "Процесът-потомък пропадна"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Трябва да укажете поне един пакет за проверка на зависимости за компилиране"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"Неуспех при получаването на информация за зависимостите за компилиране на %s"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s няма зависимости за компилиране.\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1240,7 +1241,7 @@ msgstr ""
"Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s "
"не може да бъде намерен"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1250,32 +1251,32 @@ msgstr ""
"налични версии на пакета %s, които могат да удовлетворят изискването за "
"версия"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният "
"пакет %s е твърде нов"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени."
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "Неуспех при обработката на зависимостите за компилиране"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "Поддържани модули:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1362,7 +1363,7 @@ msgstr ""
"информация и опции.\n"
" Това APT има Върховни Сили.\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1609,11 +1610,10 @@ msgstr "Файл %s/%s заменя този в пакет %s"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "Неуспех при четенето на %s"
@@ -1644,9 +1644,9 @@ msgstr ""
"Директориите info и temp трябва да бъдат на една и съща файлова система"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "Четене на списъците с пакети"
@@ -1780,11 +1780,11 @@ msgid "File not found"
msgstr "Файлът не е намерен"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "Неуспех при получаването на атрибути"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "Неуспех при задаването на време на промяна"
@@ -1846,7 +1846,7 @@ msgstr "Допустимото време за свързването изтеч
msgid "Server closed the connection"
msgstr "Сървърът разпадна връзката"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Грешка при четене"
@@ -1858,7 +1858,7 @@ msgstr "Отговорът препълни буфера."
msgid "Protocol corruption"
msgstr "Развален протокол"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Грешка при запис"
@@ -1914,7 +1914,7 @@ msgstr "Времето за установяване на връзка с гне
msgid "Unable to accept connection"
msgstr "Невъзможно е да се приеме свързването"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Проблем при хеширане на файла"
@@ -1978,64 +1978,69 @@ msgstr "Неуспех при свързване с %s:%s (%s)."
msgid "Connecting to %s"
msgstr "Свързване с %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "Неуспех при намирането на IP адреса на „%s“"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Временен неуспех при намирането на IP адреса на „%s“"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Нещо лошо се случи при намирането на IP адреса на „%s:%s“ (%i)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Неуспех при свързването с %s %s:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "Неуспех при достъпа до набор на ключове: „%s“"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Прекъсване на инсталирането."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"E: Списъкът с аргументи от Acquire::gpgv::Options е твърде дълъг. Завършване "
"на работа."
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Вътрешна грешка: Валиден подпис, но не може да се провери отпечатъка на "
"ключа?!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "Намерен е поне един невалиден подпис."
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Неуспех при изпълнението на „%s“ за проверка на подписа (инсталиран ли е "
"gpgv?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "Неизвестна грешка при изпълнението на gpgv"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "Следните подписи са невалидни:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2086,47 +2091,47 @@ msgstr "HTTP сървърът няма поддръжка за прехвърл
msgid "Unknown date format"
msgstr "Неизвестен формат на дата"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "Неуспех на избора"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "Допустимото време за свързване изтече"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "Грешка при записа на изходен файл"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "Грешка при записа на файл"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "Грешка при записа на файла"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "Грешка при четене от сървъра"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr "Неуспех при отрязване на края на файла"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "Невалидни данни на заглавната част"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "Неуспех при свързването"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Вътрешна грешка"
@@ -2134,18 +2139,25 @@ msgstr "Вътрешна грешка"
msgid "Can't mmap an empty file"
msgstr "Невъзможно е да се прехвърли в паметта празен файл"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Неуспех при прехвърлянето в паметта на %lu байта"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2175,54 +2187,54 @@ msgstr ""
msgid "Selection %s not found"
msgstr "Изборът %s не е намерен"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Неизвестен тип на абревиатура: „%c“"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "Отваряне на конфигурационен файл %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Синтактична грешка %s:%u: В началото на блока няма име."
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Синтактична грешка %s:%u: Лошо форматиран таг"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Синтактична грешка %s:%u: Излишни символи след стойността"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Синтактична грешка %s:%u: Директиви могат да се задават само в най-горното "
"ниво"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Синтактична грешка %s:%u: Твърде много вложени „include“"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Синтактична грешка %s:%u: Извикан „include“ оттук"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Синтактична грешка %s:%u: Неподдържана директива „%s“"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Синтактична грешка %s:%u: Излишни символи в края на файла"
@@ -2298,78 +2310,78 @@ msgstr "Неуспех при преминаването в %s"
msgid "Failed to stat the cdrom"
msgstr "Неуспех при намирането на атрибутите на cdrom"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr ""
"Не се използва заключване за файл за заключване %s, който е само за четене"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "Неуспех при отварянето на файл за заключване %s"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr ""
"Не се използва заключване за файл за заключване %s, който е монтиран по NFS"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "Неуспех при достъпа до заключване %s"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Изчака се завършването на %s, но той не беше пуснат"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Нарушение на защитата на паметта (segmentation fault) в подпроцеса %s."
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "Нарушение на защитата на паметта (segmentation fault) в подпроцеса %s."
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Подпроцесът %s върна код за грешка (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Подпроцесът %s завърши неочаквано"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "Неуспех при отварянето на файла %s"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr ""
"грешка при четене, все още има %lu за четене, но няма нито един останал"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "грешка при запис, все още име %lu за запис, но не успя"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Проблем при затварянето на файла"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "Проблем при премахването на връзка към файла"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "Проблем при синхронизиране на файла"
@@ -2486,54 +2498,54 @@ msgstr "Неуспех при анализирането на пакетен ф
msgid "Unable to parse package file %s (2)"
msgstr "Неуспех при анализирането на пакетен файл %s (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Лошо форматиран ред %lu в списъка с източници %s (адрес-URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Лошо форматиран ред %lu в списъка с източници %s (дистрибуция)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
"Лошо форматиран ред %lu в списъка с източници %s (неограничена дистрибуция)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
"Лошо форматиран ред %lu в списъка с източници %s (анализ на дистрибуция)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "Отваряне на %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Ред %u в списъка с източници %s е твърде дълъг."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Лошо форматиран ред %u в списъка с източници %s (тип)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен."
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
@@ -2666,17 +2678,17 @@ msgid "You may want to run apt-get update to correct these problems"
msgstr ""
"Може да искате да изпълните „apt-get update“, за да коригирате тези проблеми"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Невалиден запис във файла с настройки, няма заглавна част Package"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "Неизвестен тип за отбиване %s"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "Няма указан приоритет (или е нула) на отбиването"
@@ -2764,17 +2776,17 @@ msgstr "Възникна грешка при обработката на %s (Col
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Пакетът %s %s не беше открит при обработката на файла със зависимости"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
"Неуспех при получаването на атрибути на списъка с пакети с изходен код %s"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "Събиране на информация за „Осигурява“"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код"
@@ -2783,19 +2795,19 @@ msgstr "Входно/изходна грешка при запазването
msgid "rename failed, %s (%s -> %s)."
msgstr "преименуването се провали, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "Несъответствие на контролна сума MD5"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "Несъответствие на контролната сума"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2804,7 +2816,7 @@ msgstr ""
"Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
"ръчно да оправите този пакет (поради пропусната архитектура)."
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2813,14 +2825,14 @@ msgstr ""
"Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
"ръчно да оправите този пакет."
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s."
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "Несъответствие на размера"
@@ -2955,7 +2967,6 @@ msgstr "Записани са %i записа с %i липсващи и %i не
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "Отваряне на конфигурационен файл %s"
@@ -2966,7 +2977,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:542
#, fuzzy, c-format
-#| msgid "Hash Sum mismatch"
msgid "Hash mismatch for: %s"
msgstr "Несъответствие на контролната сума"
@@ -2987,7 +2997,6 @@ msgstr "Премахване на %s"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "%s е напълно премахнат"
@@ -3073,14 +3082,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Неуспех при закърпване на файла"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Връзката прекъсна преждевременно"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Неуспех при достъпа до набор на ключове: „%s“"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Неуспех при закърпване на файла"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/bs.po b/po/bs.po
index cab5ac4c7..7b2316bdb 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2004-05-06 15:25+0100\n"
"Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
"Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -147,7 +147,7 @@ msgstr ""
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr ""
@@ -254,7 +254,7 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "Ne mogu zapisati na %s"
@@ -351,7 +351,7 @@ msgstr "DB je stara, pokušavam nadogradnju %s"
#: ftparchive/cachedb.cc:72
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
@@ -366,11 +366,11 @@ msgstr "Ne mogu otvoriti DB datoteku %s"
msgid "Failed to stat %s"
msgstr ""
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Arhiva nema kontrolnog zapisa"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr ""
@@ -435,26 +435,26 @@ msgstr ""
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -558,7 +558,7 @@ msgstr ""
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -719,11 +719,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr ""
@@ -752,8 +752,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
@@ -788,7 +788,7 @@ msgstr "Odustani."
msgid "Do you want to continue [Y/n]? "
msgstr "Da li želite nastaviti? [Y/n]"
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
@@ -797,7 +797,7 @@ msgstr ""
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr ""
@@ -889,51 +889,51 @@ msgstr ""
msgid "Selected version %s (%s) for %s\n"
msgstr ""
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
+#: cmdline/apt-get.cc:1321
#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
+msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1352
#, c-format
-msgid "Ignore unavailable target release '%s' of package '%s'"
+msgid "Picking '%s' as source package instead of '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
+msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Slijedeći NOVI paketi će biti instalirani:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "Slijedeći NOVI paketi će biti instalirani:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -949,49 +949,49 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr ""
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "ali se %s treba instalirati"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -999,152 +999,152 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "Oštećeni paketi"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "Slijedeći dodatni paketi će biti instalirani:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Predloženi paketi:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Preporučeni paketi:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "Računam nadogradnju..."
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Neuspješno"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Urađeno"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "Podržani moduli:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1188,7 +1188,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1418,11 +1418,10 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "Ne mogu čitati %s"
@@ -1452,9 +1451,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr ""
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "Čitam spiskove paketa"
@@ -1585,11 +1584,11 @@ msgid "File not found"
msgstr "Datoteka nije pronađena"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr ""
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr ""
@@ -1649,7 +1648,7 @@ msgstr ""
msgid "Server closed the connection"
msgstr "Server je zatvorio vezu"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Greška pri čitanju"
@@ -1662,7 +1661,7 @@ msgstr ""
msgid "Protocol corruption"
msgstr "Oštećenje protokola"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Greška pri pisanju"
@@ -1716,7 +1715,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@@ -1780,59 +1779,64 @@ msgstr ""
msgid "Connecting to %s"
msgstr "Povezujem se sa %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr ""
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr ""
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr ""
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Ne mogu se povezati sa %s %s:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Odustajem od instalacije."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Slijedeći dodatni paketi će biti instalirani:"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1881,48 +1885,48 @@ msgstr ""
msgid "Unknown date format"
msgstr "Nepoznat oblik datuma"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr ""
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
#, fuzzy
msgid "Failed to truncate file"
msgstr "Ne mogu ukloniti %s"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "Povezivanje neuspješno"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Unutrašnja greška"
@@ -1930,18 +1934,25 @@ msgstr "Unutrašnja greška"
msgid "Can't mmap an empty file"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -1971,52 +1982,52 @@ msgstr ""
msgid "Selection %s not found"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr ""
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr ""
@@ -2092,75 +2103,75 @@ msgstr ""
msgid "Failed to stat the cdrom"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, c-format
msgid "Sub-process %s received signal %u."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr ""
@@ -2279,52 +2290,52 @@ msgstr ""
msgid "Unable to parse package file %s (2)"
msgstr ""
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "Otvaram %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
@@ -2441,17 +2452,17 @@ msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr ""
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr ""
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr ""
@@ -2535,16 +2546,16 @@ msgstr ""
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr ""
@@ -2553,39 +2564,39 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr ""
@@ -2830,8 +2841,18 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
msgstr ""
#: methods/rsh.cc:330
diff --git a/po/ca.po b/po/ca.po
index eb1a48a12..fa4c4a414 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.22\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2009-06-06 02:17+0200\n"
"Last-Translator: Jordi Mallach <jordi@debian.org>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -148,7 +148,7 @@ msgstr " Taula de versió:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s per a %s compilat el %s %s\n"
@@ -302,7 +302,7 @@ msgstr ""
" -c=? Llegeix aquest fitxer de configuració\n"
" -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "No es pot escriure en %s"
@@ -436,8 +436,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "La BD és vella, s'està intentant actualitzar %s"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"El format de la base de dades és invàlid. Si heu actualitzat des d'una "
@@ -454,11 +455,11 @@ msgstr "No es pot obrir el fitxer de DB %s: %s"
msgid "Failed to stat %s"
msgstr "No es pot determinar l'estat de %s"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Arxiu sense registre de control"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "No es pot aconseguir un cursor"
@@ -523,26 +524,26 @@ msgstr "*** No s'ha pogut enllaçar %s a %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink s'ha arribat al límit de %sB.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "Arxiu sense el camp paquet"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s no té una entrada dominant\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " el mantenidor de %s és %s, no %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s no té una entrada dominant de font\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s no té una entrada dominant de binari\n"
@@ -646,7 +647,7 @@ msgstr "No s'ha pogut canviar el nom de %s a %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "S'ha produït un error de compilació de l'expressió regular - %s"
@@ -810,11 +811,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr "S'ha produït un error intern, l'ordenació no ha acabat"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "No és possible blocar el directori de descàrrega"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "No s'ha pogut llegir la llista de les fonts."
@@ -845,8 +846,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Després d'aquesta operació s'alliberaran %sB d'espai en disc.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "No s'ha pogut determinar l'espai lliure en %s"
@@ -883,7 +884,7 @@ msgstr "Avortat."
msgid "Do you want to continue [Y/n]? "
msgstr "Voleu continuar [S/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "No s'ha pogut obtenir %s %s\n"
@@ -892,7 +893,7 @@ msgstr "No s'ha pogut obtenir %s %s\n"
msgid "Some files failed to download"
msgstr "Alguns fitxers no s'han pogut baixar"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "Descàrrega completa i en mode de només descàrrega"
@@ -990,54 +991,54 @@ msgstr "No s'ha trobat la versió «%s» per a «%s»"
msgid "Selected version %s (%s) for %s\n"
msgstr "Versió seleccionada %s (%s) per a %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "No s'ha pogut llegir la llista de paquets font %s"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "L'ordre update no pren arguments"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "No es pot blocar el directori de la llista"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"Es suposa que no hauriem de suprimir coses, no es pot iniciar el supressor "
"automàtic"
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr ""
"Els paquets següents s'instal·laren automàticament i ja no són necessaris:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"Els paquets següents s'instal·laren automàticament i ja no són necessaris:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Empreu «apt-get autoremove» per a suprimir-los."
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1055,43 +1056,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "La informació següent pot ajudar-vos a resoldre la situació:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr "S'ha produït un error intern, el supressor automàtic ha trencat coses"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Error intern, AllUpgrade ha trencat coses"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "No s'ha pogut trobar la tasca %s"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "No s'ha pogut trobar el paquet %s"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota: s'està seleccionant %s per a l'expressió regular '%s'\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr "S'ha marcat %s com instal·lat manualment.\n"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho:"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1099,7 +1100,7 @@ msgstr ""
"Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o "
"especifiqueu una solució)."
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1111,120 +1112,120 @@ msgstr ""
"unstable i alguns paquets requerits encara no han estat creats o bé\n"
"encara no els hi han afegit."
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "Paquets trencats"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "S'instal·laran els següents paquets extres:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Paquets suggerits:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Paquets recomanats:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "S'està calculant l'actualització... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Ha fallat"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Fet"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"S'ha produït un error intern, el solucionador de problemes ha trencat coses"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr "Haureu d'especificar un paquet de codi font per a baixar"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "No es pot trobar un paquet de fonts per a %s"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "S'està ometent el fitxer ja baixat «%s»\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "No teniu prou espai lliure en %s"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Es necessita baixar %sB/%sB d'arxius font.\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Es necessita baixar %sB d'arxius font.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "Obté el font %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "No s'ha pogut baixar alguns arxius."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "L'ordre de desempaquetar «%s» ha fallat.\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Comproveu si el paquet «dpkgdev» està instal·lat.\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "L'ordre de construir «%s» ha fallat.\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "Ha fallat el procés fill"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"S'ha d'especificar un paquet per a verificar les dependències de construcció "
"per a"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"No es pot obtenir informació sobre les dependències de construcció per a %s"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no té dependències de construcció.\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1233,7 +1234,7 @@ msgstr ""
"La dependència %s en %s no es pot satisfer per que no es pot trobar el "
"paquet %s"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1242,32 +1243,32 @@ msgstr ""
"La dependència %s per a %s no es pot satisfer per que cap versió del paquet %"
"s pot satisfer els requeriments de versions"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"No s'ha pogut satisfer la dependència %s per a %s: El paquet instal·lat %s "
"és massa nou"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "No s'han pogut satisfer les dependències de construcció per a %s"
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "No es poden processar les dependències de construcció"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "Mòduls suportats:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1353,7 +1354,7 @@ msgstr ""
"per a obtenir més informació i opcions.\n"
" Aquest APT té superpoders bovins\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1603,11 +1604,10 @@ msgstr "El fitxer %s/%s sobreescriu al que està en el paquet %s"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "No es pot llegir %s"
@@ -1639,9 +1639,9 @@ msgstr ""
"fitxers"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "S'està llegint la llista de paquets"
@@ -1775,11 +1775,11 @@ msgid "File not found"
msgstr "Fitxer no trobat"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "L'estat ha fallat"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "No s'ha pogut establir el temps de modificació"
@@ -1841,7 +1841,7 @@ msgstr "Temps de connexió finalitzat"
msgid "Server closed the connection"
msgstr "El servidor ha tancat la connexió"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Error de lectura"
@@ -1853,7 +1853,7 @@ msgstr "Una resposta ha desbordat la memòria temporal."
msgid "Protocol corruption"
msgstr "Protocol corromput"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Error d'escriptura"
@@ -1908,7 +1908,7 @@ msgstr "S'ha esgotat el temps de connexió al sòcol de dades"
msgid "Unable to accept connection"
msgstr "No es pot acceptar la connexió"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema escollint el fitxer"
@@ -1972,64 +1972,69 @@ msgstr "No s'ha pogut connectar amb %s:%s (%s)."
msgid "Connecting to %s"
msgstr "S'està connectant amb %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "No s'ha pogut resoldre '%s'"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "S'ha produït un error temporal en resoldre '%s'"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "No es pot connectar amb %s %s:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "No s'ha pogut accedir a l'anell de claus: «%s»"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "S'està avortant la instal·lació."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"E: La llista d'arguments d'Acquire::gpgv::Options és massa llarga. S'està "
"sortint."
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Error intern: La signatura és correcta, però no s'ha pogut determinar "
"l'emprempta digital de la clau!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "S'ha trobat almenys una signatura invàlida."
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"No s'ha pogut executar «%s» per a verificar la signatura (està instal·lat el "
"gpgv?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "S'ha produït un error desconegut en executar el gpgv"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "Les signatures següents són invàlides:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2080,48 +2085,48 @@ msgstr "Aquest servidor HTTP té el suport d'abast trencat"
msgid "Unknown date format"
msgstr "Format de la data desconegut"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "Ha fallat la selecció"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "Connexió finalitzada"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "S'ha produït un error en escriure al fitxer de sortida"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "S'ha produït un error en escriure al fitxer"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "S'ha produït un error en escriure al fitxer"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"S'ha produït un error en llegir, el servidor remot ha tancat la connexió"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "S'ha produït un error en llegir des del servidor"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr "No s'ha pogut truncar el fitxer %s"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "Capçalera de dades no vàlida"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "Ha fallat la connexió"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Error intern"
@@ -2129,12 +2134,12 @@ msgstr "Error intern"
msgid "Can't mmap an empty file"
msgstr "No es pot transferir un fitxer buit a memòria"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "No s'ha pogut crear un mapa de memòria de %lu octets"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2143,6 +2148,13 @@ msgstr ""
"No hi ha espai per al «Dynamic MMap». Incrementeu la mida d'APT::Cache-Limit. "
"Valor actual: %lu. (man 5 apt.conf)"
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2172,52 +2184,52 @@ msgstr "%lis"
msgid "Selection %s not found"
msgstr "No s'ha trobat la selecció %s"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Abreujament de tipus no reconegut: «%c»"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "S'està obrint el fitxer de configuració %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Error sintàctic %s:%u: No comença el camp amb un nom."
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Error sintàctic %s:%u: Etiqueta malformada"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Error sintàctic %s:%u Text extra després del valor"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "Error sintàctic %s:%u: Es permeten directrius només al nivell més alt"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Error sintàctic %s:%u: Hi ha masses fitxers include niats"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Error sintàctic %s:%u: Inclusió des d'aquí"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Error sintàctic %s:%u: Directriu no suportada «%s»"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Error sintàctic %s:%u: Text extra al final del fitxer"
@@ -2293,76 +2305,76 @@ msgstr "No es pot canviar a %s"
msgid "Failed to stat the cdrom"
msgstr "No s'ha pogut fer «stat» del cdrom"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr ""
"No s'empren blocats per a llegir el fitxer de blocat de sols lectura %s"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "No es pot resoldre el fitxer de blocat %s"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "No s'empren blocats per al fitxer de blocat %s de muntar nfs"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "No s'ha pogut blocar %s"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperava %s però no hi era"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Sub-procés %s ha rebut una violació de segment."
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "Sub-procés %s ha rebut una violació de segment."
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Sub-procés %s ha retornat un codi d'error (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "El sub-procés %s ha sortit inesperadament"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "No s'ha pogut obrir el fitxer %s"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "llegits, falten %lu per llegir, però no queda res"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "escrits, falten %lu per escriure però no s'ha pogut"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Ha hagut un problema en tancar el fitxer"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "Ha hagut un problema en desenllaçar el fitxer"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "Ha hagut un problema en sincronitzar el fitxer"
@@ -2479,52 +2491,52 @@ msgstr "No es pot analitzar el fitxer del paquet %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "No es pot analitzar el fitxer del paquet %s (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Línia %lu malformada en la llista de fonts %s (URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Línia %lu malformada en la llista de fonts %s (dist)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Línia %lu malformada en la llista de fonts %s (dist absoluta)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Línia %lu malformada en la llista de fonts %s (analitzant dist)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "S'està obrint %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "La línia %u és massa llarga en la llista de fonts %s."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "La línia %u és malformada en la llista de fonts %s (tipus)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "La línia %u és malformada en la llista de fonts %s (id del proveïdor)"
@@ -2654,17 +2666,17 @@ msgid "You may want to run apt-get update to correct these problems"
msgstr ""
"Potser voldreu executar apt-get update per a corregir aquests problemes"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Registre no vàlid al fitxer de preferències, paquet sense capçalera"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "No s'ha entès el pin de tipus %s"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "No hi ha prioritat especificada per al pin (o és zero)"
@@ -2756,16 +2768,16 @@ msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"No s'ha trobat el paquet %s %s en processar les dependències del fitxer"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "No s'ha pogut llegir la llista de paquets font %s"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "S'estan recollint els fitxers que proveeixen"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "Error d'E/S en desar la memòria cau de la font"
@@ -2774,19 +2786,19 @@ msgstr "Error d'E/S en desar la memòria cau de la font"
msgid "rename failed, %s (%s -> %s)."
msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "La suma MD5 no concorda"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "La suma resum no concorda"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2796,7 +2808,7 @@ msgstr ""
"significar que haureu d'arreglar aquest paquet manualment (segons "
"arquitectura)."
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2805,7 +2817,7 @@ msgstr ""
"No s'ha trobat un fitxer pel paquet %s. Això podria significar que haureu "
"d'arreglar aquest paquet manualment."
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2813,7 +2825,7 @@ msgstr ""
"L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp "
"per al paquet %s."
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "La mida no concorda"
@@ -2950,7 +2962,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "S'està obrint el fitxer de configuració %s"
@@ -2961,7 +2972,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:542
#, fuzzy, c-format
-#| msgid "Hash Sum mismatch"
msgid "Hash mismatch for: %s"
msgstr "La suma resum no concorda"
@@ -2982,7 +2992,6 @@ msgstr "S'està suprimint el paquet %s"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "S'ha suprimit completament el paquet %s"
@@ -3068,14 +3077,30 @@ msgstr ""
msgid "Not locked"
msgstr "No blocat"
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "No s'ha pogut aplicar el pedaç al fitxer"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "La connexió s'ha tancat prematurament"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "No s'ha pogut accedir a l'anell de claus: «%s»"
+
+#~ msgid "Could not patch file"
+#~ msgstr "No s'ha pogut aplicar el pedaç al fitxer"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/cs.po b/po/cs.po
index 3657a68ba..9b1eccdb8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2008-11-16 18:05+0100\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -146,7 +146,7 @@ msgstr " Tabulka verzí:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s pro %s zkompilován na %s %s\n"
@@ -298,7 +298,7 @@ msgstr ""
" -c=? Načte tento konfigurační soubor\n"
" -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "Nemohu zapsat do %s"
@@ -431,8 +431,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "DB je stará, zkouším aktualizovat %s"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"Formát databáze je neplatný. Pokud jste přešli ze starší verze apt, databázi "
@@ -449,11 +450,11 @@ msgstr "Nemohu otevřít DB soubor %s: %s"
msgid "Failed to stat %s"
msgstr "Nemohu vyhodnotit %s"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Archiv nemá kontrolní záznam"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Nemohu získat kurzor"
@@ -518,26 +519,26 @@ msgstr "*** Nezdařilo se slinkovat %s s %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Odlinkovací limit %sB dosažen.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "Archiv nemá pole Package"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nemá žádnou položku pro override\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " správce %s je %s, ne %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nemá žádnou zdrojovou položku pro override\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nemá ani žádnou binární položku pro override\n"
@@ -641,7 +642,7 @@ msgstr "Selhalo přejmenování %s na %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "Chyba při kompilaci regulárního výrazu - %s"
@@ -802,11 +803,11 @@ msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta."
msgid "Internal error, Ordering didn't finish"
msgstr "Vnitřní chyba, třídění nedoběhlo do konce"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "Nemohu zamknout adresář pro stahování"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Nelze přečíst seznam zdrojů."
@@ -836,8 +837,8 @@ msgstr "Po této operaci bude na disku použito dalších %sB.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Po této operaci bude na disku uvolněno %sB.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nemohu určit volné místo v %s"
@@ -874,7 +875,7 @@ msgstr "Přerušeno."
msgid "Do you want to continue [Y/n]? "
msgstr "Chcete pokračovat [Y/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Selhalo stažení %s %s\n"
@@ -883,7 +884,7 @@ msgstr "Selhalo stažení %s %s\n"
msgid "Some files failed to download"
msgstr "Některé soubory nemohly být staženy"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "Stahování dokončeno v režimu pouze stáhnout"
@@ -980,52 +981,52 @@ msgstr "Verze „%s“ pro „%s“ nebyla nalezena"
msgid "Selected version %s (%s) for %s\n"
msgstr "Vybraná verze %s (%s) pro %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "Příkaz update neakceptuje žádné argumenty"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Nemohu uzamknout list adresář"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Neměli bychom mazat věci, nemůžu spustit AutoRemover"
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr ""
"Následující balíky byly nainstalovány automaticky a již nejsou potřeba:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"Následující balíky byly nainstalovány automaticky a již nejsou potřeba:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Pro jejich odstranění použijte „apt-get autoremove“."
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1043,43 +1044,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Vnitřní chyba, AutoRemover pokazil věci"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Vnitřní chyba, AllUpgrade pokazil věci"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "Nemohu najít úlohu %s"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "Nemohu najít balík %s"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Pozn: vybírám %s pro regulární výraz „%s“\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s nastaven jako instalovaný ručně.\n"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Pro opravení následujících můžete spustit „apt-get -f install“:"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1087,7 +1088,7 @@ msgstr ""
"Nesplněné závislosti. Zkuste spustit „apt-get -f install“ bez balíků (nebo "
"navrhněte řešení)."
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1098,124 +1099,124 @@ msgstr ""
"nemožnou situaci, nebo, pokud používáte nestabilní distribuci, že\n"
"vyžadované balíky ještě nebyly vytvořeny nebo přesunuty z Příchozí fronty."
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "Poškozené balíky"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "Následující extra balíky budou instalovány:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Navrhované balíky:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Doporučované balíky:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "Propočítávám aktualizaci... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Selhalo"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Hotovo"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "Vnitřní chyba, řešitel problémů pokazil věci"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nemohu najít zdrojový balík pro %s"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Přeskakuji dříve stažený soubor „%s“\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Na %s nemáte dostatek volného místa"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Potřebuji stáhnout %sB zdrojových archivů.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "Stáhnout zdroj %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "Stažení některých archivů selhalo."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Příkaz pro rozbalení „%s“ selhal.\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Zkontrolujte, zda je nainstalován balíček „dpkg-dev“.\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Příkaz pro sestavení „%s“ selhal.\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "Synovský proces selhal"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Musíte zadat alespoň jeden balík, pro který budou kontrolovány závislosti "
"pro sestavení"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nemohu získat závislosti pro sestavení %s"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nemá žádné závislosti pro sestavení.\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1224,31 +1225,31 @@ msgstr ""
"%s závislost pro %s nemůže být splněna protože není k dispozici verze balíku "
"%s, která odpovídá požadavku na verzi"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Selhalo splnění %s závislosti pro %s: Instalovaný balík %s je příliš nový"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Selhalo splnění %s závislosti pro %s: %s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Závislosti pro sestavení %s nemohly být splněny."
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "Chyba při zpracování závislostí pro sestavení"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1332,7 +1333,7 @@ msgstr ""
"a apt.conf(5).\n"
" Tato APT má schopnosti svaté krávy.\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1577,11 +1578,10 @@ msgstr "Soubor %s/%s přepisuje ten z balíku %s"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "Nemohu číst %s"
@@ -1611,9 +1611,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Adresáře info a temp musí být na stejném souborovém systému"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "Čtu seznamy balíků"
@@ -1747,11 +1747,11 @@ msgid "File not found"
msgstr "Soubor nebyl nalezen"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "Selhalo vyhodnocení"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "Nelze nastavit čas modifikace"
@@ -1813,7 +1813,7 @@ msgstr "Čas spojení vypršel"
msgid "Server closed the connection"
msgstr "Server uzavřel spojení"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Chyba čtení"
@@ -1825,7 +1825,7 @@ msgstr "Odpověď přeplnila buffer."
msgid "Protocol corruption"
msgstr "Porušení protokolu"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Chyba zápisu"
@@ -1879,7 +1879,7 @@ msgstr "Spojení datového socketu vypršelo"
msgid "Unable to accept connection"
msgstr "Nemohu přijmout spojení"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problém s hashováním souboru"
@@ -1943,59 +1943,64 @@ msgstr "Nemohu se připojit k %s:%s (%s)."
msgid "Connecting to %s"
msgstr "Připojuji se k %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nemohu zjistit „%s“"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Dočasné selhání při zjišťování „%s“"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Něco hodně ošklivého se přihodilo při zjišťování „%s:%s“ (%i)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Nemohu se připojit k %s %s:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "Nemohu přistoupit ke klíčence: „%s“"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Přerušuji instalaci."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "E: Seznam argumentů Acquire::gpgv::Options je příliš dlouhý. Končím."
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "Vnitřní chyba: Dobrý podpis, ale nemohu zjistit otisk klíče?!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "Byl zaznamenán nejméně jeden neplatný podpis. "
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Nepodařilo se spustit „%s“ pro ověření podpisu (je gpgv nainstalováno?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "Neznámá chyba při spouštění gpgv"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "Následující podpisy jsou neplatné:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2046,47 +2051,47 @@ msgstr "Tento HTTP server má porouchanou podporu rozsahů"
msgid "Unknown date format"
msgstr "Neznámý formát data"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "Výběr selhal"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "Čas spojení vypršel"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "Chyba zápisu do výstupního souboru"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "Chyba zápisu do souboru"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "Chyba zápisu do souboru"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "Chyba čtení ze serveru"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr "Nelze zmenšit soubor"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "Špatné datové záhlaví"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "Spojení selhalo"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Vnitřní chyba"
@@ -2094,18 +2099,25 @@ msgstr "Vnitřní chyba"
msgid "Can't mmap an empty file"
msgstr "Nemohu provést mmap prázdného souboru"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nešlo mmapovat %lu bajtů"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2135,53 +2147,53 @@ msgstr ""
msgid "Selection %s not found"
msgstr "Výběr %s nenalezen"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Nerozpoznaná zkratka typu: „%c“"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "Otevírám konfigurační soubor %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Syntaktická chyba %s:%u: Blok nezačíná jménem."
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntaktická chyba %s:%u: Zkomolená značka"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Syntaktická chyba %s:%u: Za hodnotou následuje zbytečné smetí"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Syntaktická chyba %s:%u: Direktivy je možné provádět pouze na nejvyšší úrovni"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Syntaktická chyba %s:%u: Příliš mnoho vnořených propojení (include)"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntaktická chyba %s:%u: Zahrnuto odtud"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktiva „%s“"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaktická chyba %s:%u: Na konci souboru je zbytečné smetí"
@@ -2257,75 +2269,75 @@ msgstr "Nemohu přejít do %s"
msgid "Failed to stat the cdrom"
msgstr "Nezdařilo se vyhodnotit cdrom"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "Nepoužívám zamykání pro zámkový soubor %s, který je pouze pro čtení"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "Nešlo otevřít zámkový soubor %s"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "Nepoužívám zamykání pro zámkový soubor %s připojený přes nfs"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "Nemohu získat zámek %s"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Čekal jsem na %s, ale nebyl tam"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Podproces %s obdržel chybu segmentace."
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "Podproces %s obdržel chybu segmentace."
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Podproces %s vrátil chybový kód (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Podproces %s neočekávaně skončil"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "Nemohu otevřít soubor %s"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "čtení, stále mám k přečtení %lu, ale už nic nezbývá"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "zápis, stále mám %lu k zápisu, ale nejde to"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Problém při zavírání souboru"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "Problém při odstraňování souboru"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "Problém při synchronizování souboru"
@@ -2442,52 +2454,52 @@ msgstr "Nelze zpracovat soubor %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Nelze zpracovat soubor %s (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (dist)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (Absolutní dist)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování dist)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "Otevírám %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Řádek %u v seznamu zdrojů %s je příliš dlouhý."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Zkomolený řádek %u v seznamu zdrojů %s (id výrobce)"
@@ -2612,17 +2624,17 @@ msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr "Pro nápravu těchto problémů můžete zkusit spustit apt-get update"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Neplatný záznam v souboru preferencí, žádné záhlaví balíku"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "Nerozumím vypíchnutí typu %s"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "Pro vypíchnutí nebyla zadána žádná (nebo nulová) priorita"
@@ -2706,16 +2718,16 @@ msgstr "Při zpracování %s se objevila chyba (CollectFileProvides)"
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Při zpracování závislostí nebyl nalezen balík %s %s"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "Collecting File poskytuje"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "Chyba IO při ukládání zdrojové cache"
@@ -2724,19 +2736,19 @@ msgstr "Chyba IO při ukládání zdrojové cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "přejmenování selhalo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "Neshoda MD5 součtů"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "Neshoda kontrolních součtů"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr "K následujícím ID klíčů není dostupný veřejný klíč:\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2745,7 +2757,7 @@ msgstr ""
"Nebyl jsem schopen nalézt soubor s balíkem %s. To by mohlo znamenat, že "
"tento balík je třeba opravit ručně (kvůli chybějící architektuře)"
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2754,14 +2766,14 @@ msgstr ""
"Nebyl jsem schopen nalézt soubor s balíkem %s. Asi budete muset tento balík "
"opravit ručně."
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Indexové soubory balíku jsou narušeny. Chybí pole Filename: u balíku %s."
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "Velikosti nesouhlasí"
@@ -2897,7 +2909,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "Otevírám konfigurační soubor %s"
@@ -2908,7 +2919,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:542
#, fuzzy, c-format
-#| msgid "Hash Sum mismatch"
msgid "Hash mismatch for: %s"
msgstr "Neshoda kontrolních součtů"
@@ -2929,7 +2939,6 @@ msgstr "Odstraňuji %s"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "Kompletně odstraněn %s"
@@ -3013,14 +3022,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Nemohu záplatovat soubor"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Spojení bylo předčasně ukončeno"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Nemohu přistoupit ke klíčence: „%s“"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Nemohu záplatovat soubor"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/cy.po b/po/cy.po
index 8b8382a0c..09f9a8869 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: APT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2005-06-06 13:46+0100\n"
"Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
"Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
@@ -164,7 +164,7 @@ msgstr " Tabl Fersiynnau:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n"
@@ -324,7 +324,7 @@ msgstr ""
" -c=? Darllen y ffeil cyfluniad hwn\n"
" -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "Ni ellir ysgrifennu i %s"
@@ -461,7 +461,7 @@ msgstr "Hen gronfa data, yn ceisio uwchraddio %s"
#: ftparchive/cachedb.cc:72
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
@@ -476,11 +476,11 @@ msgstr "Ni ellir agor y ffeil DB2 %s: %s"
msgid "Failed to stat %s"
msgstr "Methodd stat() o %s"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Does dim cofnod rheoli gan yr archif"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Ni ellir cael cyrchydd"
@@ -546,26 +546,26 @@ msgstr "*** Methwyd cysylltu %s at %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Tarwyd y terfyn cyswllt %sB.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "Doedd dim maes pecyn gan yr archif"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " Cynaliwr %s yw %s nid %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, fuzzy, c-format
msgid " %s has no source override entry\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, fuzzy, c-format
msgid " %s has no binary override entry either\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
@@ -670,7 +670,7 @@ msgstr "Methwyd ailenwi %s at %s"
msgid "Y"
msgstr "I"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "Gwall crynhoi patrwm - %s"
@@ -840,11 +840,11 @@ msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
msgid "Internal error, Ordering didn't finish"
msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Methwyd darllen y rhestr ffynhonellau."
@@ -873,8 +873,8 @@ msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Does dim digon o le rhydd yn %s gennych"
@@ -912,7 +912,7 @@ msgstr "Erthylu."
msgid "Do you want to continue [Y/n]? "
msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Methwyd cyrchu %s %s\n"
@@ -921,7 +921,7 @@ msgstr "Methwyd cyrchu %s %s\n"
msgid "Some files failed to download"
msgstr "Methodd rhai ffeiliau lawrlwytho"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
@@ -1021,51 +1021,51 @@ msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
msgid "Selected version %s (%s) for %s\n"
msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1081,46 +1081,46 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
#, fuzzy
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain:"
# FIXME
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1129,7 +1129,7 @@ msgstr ""
"pecyn (neu penodwch ddatrys)"
# FIXME: needs commas
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1141,118 +1141,118 @@ msgstr ""
"ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n"
"heb gael eu symud allan o Incoming."
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "Pecynnau wedi torri"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Pecynnau a awgrymmir:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Pecynnau a argymhellir:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
#, fuzzy
msgid "Calculating upgrade... "
msgstr "Yn Cyfrifo'r Uwchraddiad... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Methwyd"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Wedi Gorffen"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Does dim digon o le rhydd yn %s gennych"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, fuzzy, c-format
msgid "Fetch source %s\n"
msgstr "Cyrchu Ffynhonell %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "Methwyd cyrchu rhai archifau."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "Methodd proses plentyn"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1261,7 +1261,7 @@ msgstr ""
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %"
"s"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1270,34 +1270,34 @@ msgstr ""
"Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd "
"ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy "
"newydd"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "Methwyd prosesu dibyniaethau adeiladu"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
#, fuzzy
msgid "Supported modules:"
msgstr "Modylau a Gynhelir:"
# FIXME: split
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1382,7 +1382,7 @@ msgstr ""
"\n"
" Mae gan yr APT hwn bŵerau buwch hudol.\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1636,11 +1636,10 @@ msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "Ni ellir darllen %s"
@@ -1670,9 +1669,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
#, fuzzy
msgid "Reading package lists"
msgstr "Yn Darllen Rhestrau Pecynnau"
@@ -1820,11 +1819,11 @@ msgid "File not found"
msgstr "Ffeil heb ei ganfod"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "Methwyd stat()"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "Methwyd gosod amser newid"
@@ -1887,7 +1886,7 @@ msgstr "Goramser cysylltu"
msgid "Server closed the connection"
msgstr "Caeodd y gweinydd y cysylltiad"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Gwall darllen"
@@ -1899,7 +1898,7 @@ msgstr "Gorlifodd ateb y byffer."
msgid "Protocol corruption"
msgstr "Llygr protocol"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Gwall ysgrifennu"
@@ -1955,7 +1954,7 @@ msgstr "Goramserodd cysylltiad y soced data"
msgid "Unable to accept connection"
msgstr "Methwyd derbyn cysylltiad"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem wrth stwnshio ffeil"
@@ -2020,59 +2019,64 @@ msgstr "Methwyd cysylltu i %s:%s (%s)."
msgid "Connecting to %s"
msgstr "Yn cysylltu i %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "Methwyd datrys '%s'"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Methiant dros dro yn datrys '%s'"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Methwyd cysylltu i %s %s:"
-#: methods/gpgv.cc:71
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
#, fuzzy, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "Methwyd datrys '%s'"
+msgid "No keyring installed in %s."
+msgstr "Yn Erthylu'r Sefydliad."
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
+
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2125,50 +2129,50 @@ msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
msgid "Unknown date format"
msgstr "Fformat dyddiad anhysbys"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "Methwyd dewis"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "Goramserodd y cysylltiad"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "Gwall wrth ysgrifennu at ffeil"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "Gwall wrth ysgrifennu at y ffeil"
-#: methods/http.cc:891
+#: methods/http.cc:892
#, fuzzy
msgid "Error reading from server. Remote end closed connection"
msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "Gwall wrth ddarllen o'r gweinydd"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
#, fuzzy
msgid "Failed to truncate file"
msgstr "Methwyd ysgrifennu ffeil %s"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
#, fuzzy
msgid "Bad header data"
msgstr "Data pennawd gwael"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "Methodd y cysylltiad"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Gwall mewnol"
@@ -2176,18 +2180,25 @@ msgstr "Gwall mewnol"
msgid "Can't mmap an empty file"
msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Methwyd gwneud mmap() efo %lu beit"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2217,54 +2228,54 @@ msgstr ""
msgid "Selection %s not found"
msgstr "Ni chanfuwyd y dewis %s"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Talgryniad math anhysbys: '%c'"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw."
# FIXME
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, fuzzy, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil"
@@ -2342,77 +2353,77 @@ msgstr "Ni ellir newid i %s"
msgid "Failed to stat the cdrom"
msgstr "Methwyd gwneud stat() o'r CD-ROM"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "Methwyd agor y ffeil clo %s"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "Ddim yn cloi'r ffeil clo ar NFS %s"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "Methwyd cael y clo %s"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, fuzzy, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Arhoswyd am %s ond nid oedd e yna"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Derbyniodd is-broses %s wall segmentu."
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "Derbyniodd is-broses %s wall segmentu."
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Dychwelodd is-broses %s gôd gwall (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Gorffenodd is-broses %s yn annisgwyl"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "Methwyd agor ffeil %s"
# FIXME
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "o hyd %lu i ddarllen ond dim ar ôl"
# FIXME
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "o hyd %lu i ysgrifennu ond methwyd"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Gwall wrth gau'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "Gwall wrth dadgysylltu'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "Gwall wrth gyfamseru'r ffeil"
@@ -2535,53 +2546,53 @@ msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "Yn agor %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, fuzzy, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, fuzzy, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
@@ -2715,18 +2726,18 @@ msgid "You may want to run apt-get update to correct these problems"
msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn."
# FIXME: literal
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'"
# FIXME: tense
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "Methwyd daeall y math pin %s"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"
@@ -2813,16 +2824,16 @@ msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)"
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "Yn Casglu Darpariaethau Ffeil"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
@@ -2831,21 +2842,21 @@ msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
msgid "rename failed, %s (%s -> %s)."
msgstr "methwyd ailenwi, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "Camgyfatebiaeth swm MD5"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "Camgyfatebiaeth swm MD5"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
# FIXME: case
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2854,7 +2865,7 @@ msgstr ""
"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
"drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)"
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2863,14 +2874,14 @@ msgstr ""
"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
"drwsio'r pecyn hyn a law."
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "Camgyfatebiaeth maint"
@@ -3004,7 +3015,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "Yn agor y ffeil cyfluniad %s"
@@ -3118,15 +3128,32 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-#, fuzzy
-msgid "Could not patch file"
-msgstr "Methwyd agor ffeil %s"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Caewyd y cysylltiad yn gynnar"
+#, fuzzy
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Methwyd datrys '%s'"
+
+#, fuzzy
+#~ msgid "Could not patch file"
+#~ msgstr "Methwyd agor ffeil %s"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/da.po b/po/da.po
index 9d2f234c4..ffac0e91f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-da\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2007-09-06 21:40+0200\n"
"Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
"Language-Team: Danish\n"
@@ -152,7 +152,7 @@ msgstr " Versionstabel:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s for %s oversat %s %s\n"
@@ -306,7 +306,7 @@ msgstr ""
" -c=? Ls denne opstningsfil\n"
" -o=? Angiv et opstningstilvalg. F.eks. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "Kunne ikke skrive til %s"
@@ -439,8 +439,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "DB er gammel, forsger at opgradere %s"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"Databaseformatet er ugyldigt. Hvis du har opgraderet fra en tidligere "
@@ -457,11 +458,11 @@ msgstr "Kunne ikke bne DB-filen %s: %s"
msgid "Failed to stat %s"
msgstr "Kunne ikke finde %s"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Arkivet har ingen kontrolindgang"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Kunne skaffe en markr"
@@ -526,26 +527,26 @@ msgstr "*** Kunne ikke lnke %s til %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Nede DeLink-begrnsningen p %sB.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "Arkivet havde intet package-felt"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har ingen tvangs-post\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " pakkeansvarlig for %s er %s, ikke %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s har ingen linje med tilsidesttelse af standard for kildefiler\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -650,7 +651,7 @@ msgstr "Kunne ikke omdbe %s til %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fejl ved tolkning af regulrt udtryk - %s"
@@ -811,11 +812,11 @@ msgstr "Pakker skal afinstalleres, men Remove er deaktiveret."
msgid "Internal error, Ordering didn't finish"
msgstr "Intern fejl. Sortering blev ikke fuldfrt"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "Kunne ikke lse nedhentningsmappen"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Listen med kilder kunne ikke lses."
@@ -844,8 +845,8 @@ msgstr "Efter udpakning vil %sB yderligere diskplads vre brugt.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Efter udpakning vil %sB diskplads blive frigjort.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kunne ikke bestemme ledig plads i %s"
@@ -882,7 +883,7 @@ msgstr "Afbryder."
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du fortstte [J/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Kunne ikke hente %s %s\n"
@@ -891,7 +892,7 @@ msgstr "Kunne ikke hente %s %s\n"
msgid "Some files failed to download"
msgstr "Nedhentningen af filer mislykkedes"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand"
@@ -990,52 +991,52 @@ msgstr "Versionen '%s' for '%s' blev ikke fundet"
msgid "Selected version %s (%s) for %s\n"
msgstr "Valgte version %s (%s) af %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Kunne ikke finde kildepakkelisten %s"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "'update'-kommandoen benytter ingen parametre"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Kunne ikke lse listemappen"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"Det er ikke meningen, at vi skal slette ting og sager, kan ikke starte "
"AutoRemover"
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Flgende pakker blev installeret automatisk, og behves ikke lngere:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "Flgende pakker blev installeret automatisk, og behves ikke lngere:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Brug 'apt-get autoremove' til at fjerne dem."
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1053,43 +1054,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "Flgende oplysninger kan hjlpe dig med at klare situationen:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Intern fejl. AutoRemover delagde noget"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Intern fejl, AllUpgrade delagde noget"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "Kunne ikke finde opgaven %s"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "Kunne ikke finde pakken %s"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Bemrk, vlger %s som regulrt udtryk '%s'\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "%s sat til manuelt installeret.\n"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Du kan muligvis rette det ved at kre 'apt-get -f install':"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1097,7 +1098,7 @@ msgstr ""
"Uopfyldte afhngigheder. Prv 'apt-get -f install' uden pakker (eller angiv "
"en lsning)."
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1108,115 +1109,115 @@ msgstr ""
"en umulig situation eller bruger den ustabile distribution, hvor enkelte\n"
"pakker endnu ikke er lavet eller gjort tilgngelige."
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "delagte pakker"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "Flgende yderligere pakker vil blive installeret:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Foreslede pakker:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Anbefalede pakker:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "Beregner opgraderingen... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Mislykkedes"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Frdig"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern fejl. Problemlseren delagde noget"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr "Du skal angive mindst n pakke at hente kildeteksten til"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kunne ikke finde kildetekstpakken for %s"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Overspringer allerede hentet fil '%s'\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har ikke nok ledig plads i %s"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB skal hentes fra kildetekst-arkiverne.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "Henter kildetekst %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "Nogle arkiver kunne ikke hentes."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Udpakningskommandoen '%s' fejlede.\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Tjek om pakken 'dpkg-dev' er installeret.\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Opbygningskommandoen '%s' fejlede.\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "Barneprocessen fejlede"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr "Skal angive mindst n pakke at tjekke opbygningsafhngigheder for"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kunne ikke hente oplysninger om opbygningsafhngigheder for %s"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen opbygningsafhngigheder.\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1224,7 +1225,7 @@ msgid ""
msgstr ""
"%s-afhngigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1233,32 +1234,32 @@ msgstr ""
"%s-afhngigheden for %s kan ikke opfyldes, da ingen af de tilgngelige "
"udgaver af pakken %s kan tilfredsstille versions-kravene"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Kunne ikke opfylde %s-afhngigheden for %s: Den installerede pakke %s er for "
"ny"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Kunne ikke opfylde %s-afhngigheden for %s: %s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Opbygningsafhngigheden for %s kunne ikke opfyldes."
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "Kunne ikke behandler opbygningsafhngighederne"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "Understttede moduler:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1342,7 +1343,7 @@ msgstr ""
"for flere oplysninger og tilvalg.\n"
" Denne APT har \"Super Cow Powers\".\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1592,11 +1593,10 @@ msgstr "File %s/%s overskriver filen i pakken %s"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "Kunne ikke lse %s"
@@ -1626,9 +1626,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Mapperne info og temp skal ligge i samme filsystem"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "Indlser pakkelisterne"
@@ -1764,11 +1764,11 @@ msgid "File not found"
msgstr "Fil blev ikke fundet"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "Kunne ikke finde"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "Kunne ikke angive ndringstidspunkt"
@@ -1830,7 +1830,7 @@ msgstr "Tidsudlb p forbindelsen"
msgid "Server closed the connection"
msgstr "Serveren lukkede forbindelsen"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Lsefejl"
@@ -1842,7 +1842,7 @@ msgstr "Mellemlageret blev overfyldt af et svar."
msgid "Protocol corruption"
msgstr "Protokolfejl"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Skrivefejl"
@@ -1896,7 +1896,7 @@ msgstr "Tidsudlb p datasokkel-forbindelse"
msgid "Unable to accept connection"
msgstr "Kunne ikke acceptere forbindelse"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem ved \"hashing\" af fil"
@@ -1960,60 +1960,65 @@ msgstr "Kunne ikke forbinde til %s:%s (%s)."
msgid "Connecting to %s"
msgstr "Forbinder til %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "Kunne ikke omstte navnet '%s'"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Midlertidig fejl ved omstning af navnet '%s'"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Der skete noget underligt under navneomstning af '%s:%s' (%i)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Kunne ikke forbinde til %s %s:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "Kunne ikke tilg ngleringent '%s'"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Afbryder installationen."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "F: Argumentlisten fra Acquire::gpgv::Options er for lang. Afslutter."
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Intern fejl: Gyldig signatur, men kunne ikke afgre ngle-fingeraftryk?!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "Stdte p mindst n ugyldig signatur."
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Kunne ikke kre '%s' for at verificere signaturen (er gpgv installeret?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "Ukendt fejl ved krsel af gpgv"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "Flgende signaturer var ugyldige:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2065,48 +2070,48 @@ msgstr ""
msgid "Unknown date format"
msgstr "Ukendt datoformat"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "Valg mislykkedes"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "Tidsudlb p forbindelsen"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "Fejl ved skrivning af uddatafil"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "Fejl ved skrivning til fil"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "Fejl ved skrivning til filen"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "Fejl ved lsning fra serveren. Den fjerne ende lukkede forbindelsen"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "Fejl ved lsning fra server"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
#, fuzzy
msgid "Failed to truncate file"
msgstr "Kunne ikke skrive filen %s"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "Ugyldige hoved-data"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "Forbindelsen mislykkedes"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Intern fejl"
@@ -2114,18 +2119,25 @@ msgstr "Intern fejl"
msgid "Can't mmap an empty file"
msgstr "Kan ikke udfre mmap for en tom fil"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Kunne ikke udfre mmap for %lu byte"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2155,52 +2167,52 @@ msgstr ""
msgid "Selection %s not found"
msgstr "Det valgte %s blev ikke fundet"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Ukendt type-forkortelse: '%c'"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "bner konfigurationsfilen %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Syntaksfejl %s:%u: Blokken starter uden navn."
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntaksfejl %s:%u: Forkert udformet mrke"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Syntaksfejl %s:%u: Overskydende affald efter vrdien"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "Syntaksfejl %s:%u: Direktiver kan kun angives i topniveauet"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Syntaksfejl %s:%u: For mange sammenkdede inkluderinger"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntaksfejl %s:%u: Inkluderet herfra"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Syntaksfejl %s:%u: Ikke-understttet direktiv '%s'"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaksfejl %s:%u: Overskydende affald i slutningen af filen"
@@ -2276,75 +2288,75 @@ msgstr "Kunne ikke skifte til %s"
msgid "Failed to stat the cdrom"
msgstr "Kunne ikke finde cdrommen"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "Benytter ikke lsning for skrivebeskyttet lsefil %s"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "Kunne ikke bne lsefilen %s"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "Benytter ikke lsning for nfs-monteret lsefil %s"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "Kunne ikke opn lsen %s"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Ventede p %s, men den var der ikke"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Underprocessen %s modtog en segmenteringsfejl."
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "Underprocessen %s modtog en segmenteringsfejl."
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Underprocessen %s returnerede en fejlkode (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Underprocessen %s afsluttedes uventet"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "Kunne ikke bne filen %s"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "ls, mangler stadig at lse %lu men der er ikke flere"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "skriv, mangler stadig at skrive %lu men kunne ikke"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Problem under lukning af fil"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "Fejl ved frigivelse af filen"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "Problem under synkronisering af fil"
@@ -2461,52 +2473,52 @@ msgstr "Kunne ikke tolke pakkefilen %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Kunne ikke tolke pakkefilen %s (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Ugyldig linje %lu i kildelisten %s (URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Ugyldig linje %lu i kildelisten %s (dist)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Ugyldig linje %lu i kildelisten %s (absolut dist)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "bner %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linjen %u er for lang i kildelisten %s."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Ugyldig linje %u i kildelisten %s (type)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typen '%s' er ukendt p linje %u i kildelisten %s"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Ugyldig linje %u i kildelisten %s (producent-id)"
@@ -2633,17 +2645,17 @@ msgstr "Pakkelisterne eller statusfilen kunne ikke tolkes eller bnes."
msgid "You may want to run apt-get update to correct these problems"
msgstr "Du kan muligvis rette problemet ved at kre 'apt-get update'"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Ugyldig indgang i indstillingsfilen. Pakkehovedet mangler"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "Kunne ikke forst pin-type %s"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "Ingen prioritet (eller prioritet nul) angivet ved pin"
@@ -2729,16 +2741,16 @@ msgstr "Der skete en fejl under behandlingen af %s (CollectfileProvides)"
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Pakken %s %s blev ikke fundet under behandlingen af filafhngigheder"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Kunne ikke finde kildepakkelisten %s"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "Samler filudbud"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "IO-fejl ved gemning af kilde-mellemlageret"
@@ -2747,21 +2759,21 @@ msgstr "IO-fejl ved gemning af kilde-mellemlageret"
msgid "rename failed, %s (%s -> %s)."
msgstr "omdbning mislykkedes, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "MD5Sum stemmer ikke"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "MD5Sum stemmer ikke"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Der er ingen tilgngelige offentlige ngler for flgende ngle-ID'er:\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2770,7 +2782,7 @@ msgstr ""
"Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
"ndt til manuelt at reparere denne pakke. (grundet manglende arch)"
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2779,13 +2791,13 @@ msgstr ""
"Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
"ndt til manuelt at reparere denne pakke."
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s."
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "Strrelsen stemmer ikke"
@@ -2921,7 +2933,6 @@ msgstr "Skrev %i poster med %i manglende filer og %i ikke-trufne filer\n"
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "bner konfigurationsfilen %s"
@@ -2952,7 +2963,6 @@ msgstr "Fjerner %s"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "Fjernede %s helt"
@@ -3036,14 +3046,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Kunne ikke pfre filen %s en lap"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Forbindelsen lukkedes for hurtigt"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Kunne ikke tilg ngleringent '%s'"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Kunne ikke pfre filen %s en lap"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/de.po b/po/de.po
index 982ba7f15..4ba47bceb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.21\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2009-10-20 21:55+0200\n"
"Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
"Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
@@ -150,7 +150,7 @@ msgstr " Versions-Tabelle:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s für %s, kompiliert am %s %s\n"
@@ -310,7 +310,7 @@ msgstr ""
" -o=? Eine beliebige Konfigurationsoption setzen, z. B. -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "Schreiben nach %s nicht möglich"
@@ -451,8 +451,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "Datenbank ist veraltet, versuche %s zu erneuern"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"Datenbank-Format ist ungültig. Wenn Sie ein Update basierend auf einer "
@@ -470,11 +471,11 @@ msgstr "Datenbank-Datei %s kann nicht geöffnet werden: %s"
msgid "Failed to stat %s"
msgstr "Ausführen von »stat« auf %s fehlgeschlagen."
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Archiv hat keinen Steuerungs-Datensatz"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Bekommen eines Cursors nicht möglich"
@@ -539,26 +540,26 @@ msgstr "*** Erzeugen einer Verknüpfung von %s zu %s fehlgeschlagen"
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-Limit von %sB erreicht.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "Archiv hatte kein Paket-Feld"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s hat keinen Eintrag in der Override-Liste.\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s-Betreuer ist %s und nicht %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s hat keinen Eintrag in der Source-Override-Liste.\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s hat keinen Eintrag in der Binary-Override-Liste.\n"
@@ -664,7 +665,7 @@ msgstr "%s konnte nicht in %s umbenannt werden"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fehler beim Kompilieren eines regulären Ausdrucks – %s"
@@ -826,11 +827,11 @@ msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet."
msgid "Internal error, Ordering didn't finish"
msgstr "Interner Fehler, Anordnung beendete nicht"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "Das Downloadverzeichnis konnte nicht gesperrt werden."
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Die Liste der Quellen konnte nicht gelesen werden."
@@ -861,8 +862,8 @@ msgstr "Nach dieser Operation werden %sB Plattenplatz zusätzlich benutzt.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Nach dieser Operation werden %sB Plattenplatz freigegeben.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Freier Platz in %s konnte nicht bestimmt werden"
@@ -899,7 +900,7 @@ msgstr "Abbruch."
msgid "Do you want to continue [Y/n]? "
msgstr "Möchten Sie fortfahren [J/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Fehlschlag beim Holen von %s %s\n"
@@ -908,7 +909,7 @@ msgstr "Fehlschlag beim Holen von %s %s\n"
msgid "Some files failed to download"
msgstr "Einige Dateien konnten nicht heruntergeladen werden"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv"
@@ -1009,36 +1010,36 @@ msgstr "Version »%s« für »%s« konnte nicht gefunden werden"
msgid "Selected version %s (%s) for %s\n"
msgstr "Gewählte Version %s (%s) für %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "»stat« konnte nicht auf die Liste %s der Quellpakete ausgeführt werden."
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "Der Befehl »update« akzeptiert keine Argumente"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Das Listenverzeichnis kann nicht gesperrt werden"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"Es soll nichts gelöscht werden, AutoRemover kann nicht gestartet werden"
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1046,17 +1047,17 @@ msgstr ""
"Die folgenden Pakete wurden automatisch installiert und werden nicht länger "
"benötigt:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"%lu Pakete wurden automatisch installiert und werden nicht mehr benötigt.\n"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Verwenden Sie »apt-get autoremove«, um sie zu entfernen."
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1075,44 +1076,44 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr ""
"Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Interner Fehler, AutoRemover hat was kaputt gemacht"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "Task %s konnte nicht gefunden werden"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "Paket %s konnte nicht gefunden werden"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Hinweis: %s wird für regulären Ausdruck »%s« gewählt\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s wurde als manuell installiert festgelegt.\n"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren:"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1120,7 +1121,7 @@ msgstr ""
"Nicht erfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne "
"jegliche Pakete (oder geben Sie eine Lösung an)."
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1132,120 +1133,120 @@ msgstr ""
"Unstable-Distribution verwenden, einige erforderliche Pakete noch nicht\n"
"erstellt wurden oder Incoming noch nicht verlassen haben."
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "Kaputte Pakete"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "Die folgenden zusätzlichen Pakete werden installiert:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Vorgeschlagene Pakete:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Empfohlene Pakete:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "Berechne Upgrade (Paketaktualisierung) ..."
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Fehlgeschlagen"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Fertig"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden "
"sollen"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Quellpaket für %s kann nicht gefunden werden"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Überspringe schon heruntergeladene Datei »%s«\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Sie haben nicht genug freien Platz in %s"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Es müssen noch %sB von %sB an Quellarchiven heruntergeladen werden.\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Es müssen %sB an Quellarchiven heruntergeladen werden.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "Quelle %s wird heruntergeladen\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "Einige Archive konnten nicht heruntergeladen werden."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Überprüfen Sie, ob das Paket »dpkg-dev« installiert ist.\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build-Befehl »%s« fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "Kindprozess fehlgeschlagen"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Es muss zumindest ein Paket angegeben werden, dessen Bau-Abhängigkeiten\n"
"überprüft werden sollen."
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"Informationen zu Bau-Abhängigkeiten für %s konnten nicht gefunden werden."
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s hat keine Bau-Abhängigkeiten.\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1254,7 +1255,7 @@ msgstr ""
"»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht "
"gefunden werden kann."
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1263,32 +1264,32 @@ msgstr ""
"»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da keine verfügbare "
"Version des Pakets %s die Versionsanforderungen erfüllen kann."
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Die »%s«-Abhängigkeit für %s kann nicht erfüllt werden: Installiertes Paket %"
"s ist zu neu."
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Die »%s«-Abhängigkeit für %s konnte nicht erfüllt werden: %s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Bau-Abhängigkeiten für %s konnten nicht erfüllt werden."
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "Verarbeitung der Bau-Abhängigkeiten fehlgeschlagen"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "Unterstützte Module:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1379,7 +1380,7 @@ msgstr ""
"weitergehende Informationen und Optionen.\n"
" Dieses APT hat Super-Kuh-Kräfte.\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1632,11 +1633,10 @@ msgstr "Durch die Datei %s/%s wird die Datei in Paket %s überschrieben"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "%s kann nicht gelesen werden"
@@ -1667,9 +1667,9 @@ msgstr ""
"Die »info«- und »temp«-Verzeichnisse müssen in demselben Dateisystem liegen"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "Paketlisten werden gelesen"
@@ -1807,11 +1807,11 @@ msgstr "Datei nicht gefunden"
# looks like someone hardcoded English grammar
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "»stat« konnte nicht ausgeführt werden."
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "Änderungszeitpunkt kann nicht gesetzt werden"
@@ -1873,7 +1873,7 @@ msgstr "Zeitüberschreitung der Verbindung"
msgid "Server closed the connection"
msgstr "Verbindung durch Server geschlossen"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Lesefehler"
@@ -1885,7 +1885,7 @@ msgstr "Durch eine Antwort wurde der Puffer zum Überlaufen gebracht."
msgid "Protocol corruption"
msgstr "Protokoll beschädigt"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Schreibfehler"
@@ -1941,7 +1941,7 @@ msgstr "Datenverbindungsaufbau erlitt Zeitüberschreitung"
msgid "Unable to accept connection"
msgstr "Verbindung konnte nicht angenommen werden"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf"
@@ -2007,62 +2007,67 @@ msgstr "Verbindung mit %s:%s nicht möglich (%s)."
msgid "Connecting to %s"
msgstr "Verbindung mit %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "»%s« konnte nicht aufgelöst werden"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Temporärer Fehlschlag beim Auflösen von »%s«"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Verbindung mit %s:%s nicht möglich:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "Zugriff auf Schlüsselring nicht möglich: »%s«"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Installation abgebrochen."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "F: Argumentliste von Acquire::gpgv::Options zu lang. Abbruch."
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Interner Fehler: Gültige Signatur, Fingerabdruck des Schlüssels konnte "
"jedoch nicht ermittelt werden?!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "Mindestens eine ungültige Signatur wurde entdeckt."
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"»%s« zur Überprüfung der Signatur konnte nicht ausgeführt werden (ist gpgv "
"installiert?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "Unbekannter Fehler beim Ausführen von gpgv"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "Die folgenden Signaturen waren ungültig:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2115,49 +2120,49 @@ msgstr ""
msgid "Unknown date format"
msgstr "Unbekanntes Datumsformat"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "Auswahl fehlgeschlagen"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "Verbindung erlitt Zeitüberschreitung"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "Fehler beim Schreiben der Ausgabedatei"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "Fehler beim Schreiben einer Datei"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "Fehler beim Schreiben der Datei"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Fehler beim Lesen vom Server: Verbindung wurde durch den Server auf der "
"anderen Seite geschlossen"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "Fehler beim Lesen vom Server"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr "Datei konnte nicht eingekürzt werden"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "Fehlerhafte Kopfzeilendaten"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "Verbindung fehlgeschlagen"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Interner Fehler"
@@ -2165,12 +2170,12 @@ msgstr "Interner Fehler"
msgid "Can't mmap an empty file"
msgstr "Eine leere Datei kann nicht mit mmap abgebildet werden"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "mmap von %lu Bytes konnte nicht durchgeführt werden"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2179,6 +2184,13 @@ msgstr ""
"Nicht genügend Platz für Dynamic MMap. Bitte erhöhen Sie den Wert von APT::"
"Cache-Limit. Aktueller Wert: %lu. (Siehe auch man 5 apt.conf.)"
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2208,53 +2220,53 @@ msgstr "%lis"
msgid "Selection %s not found"
msgstr "Auswahl %s nicht gefunden"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Nicht erkannte Typabkürzung: »%c«"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "Öffne Konfigurationsdatei %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Syntaxfehler %s:%u: Block beginnt ohne Namen."
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntaxfehler %s:%u: Missgestaltetes Tag"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Syntaxfehler %s:%u: Zusätzlicher Müll nach Wert"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Syntaxfehler %s:%u: Direktiven können nur auf oberster Ebene benutzt werden"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Syntaxfehler %s:%u: Zu viele verschachtelte Einbindungen (includes)"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntaxfehler %s:%u: Eingefügt von hier"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Syntaxfehler %s:%u: Nicht unterstützte Direktive »%s«"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaxfehler %s:%u: Zusätzlicher Müll am Dateiende"
@@ -2331,77 +2343,77 @@ msgstr "Es konnte nicht nach %s gewechselt werden"
msgid "Failed to stat the cdrom"
msgstr "»stat« konnte nicht auf die CD-ROM ausgeführt werden"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "Es wird keine Sperre für schreibgeschützte Lockdatei %s verwendet"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "Lockdatei %s konnte nicht geöffnet werden"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "Es wird keine Sperre für per NFS eingebundene Lockdatei %s verwendet"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "Konnte Lock %s nicht bekommen"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Es wurde auf %s gewartet, war jedoch nicht vorhanden"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Unterprozess %s hat einen Speicherzugriffsfehler empfangen."
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, c-format
msgid "Sub-process %s received signal %u."
msgstr "Unterprozess %s hat Signal %u empfangen."
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Unterprozess %s hat Fehlercode zurückgegeben (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Unterprozess %s unerwartet beendet"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "Datei %s konnte nicht geöffnet werden"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "Lesevorgang: es verbleiben noch %lu zu lesen, jedoch nichts mehr übrig"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr ""
"Schreibvorgang: es verbleiben noch %lu zu schreiben, jedoch Schreiben nicht "
"möglich"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Beim Schließen der Datei trat ein Problem auf"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "Beim Unlinking der Datei trat ein Problem auf"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "Beim Synchronisieren der Datei trat ein Problem auf"
@@ -2518,52 +2530,52 @@ msgstr "Paketdatei %s konnte nicht verarbeitet werden (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Paketdatei %s konnte nicht verarbeitet werden (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»absolute dist«)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist parse«)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "%s wird geöffnet"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Zeile %u zu lang in der Quellliste %s."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ »%s« ist unbekannt in Zeile %u der Quellliste %s"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Missgestaltete Zeile %u in Quellliste %s (»vendor id«)"
@@ -2697,17 +2709,17 @@ msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr "Probieren Sie »apt-get update«, um diese Probleme zu korrigieren."
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Ungültiger Eintrag in Einstellungsdatei %s, keine »Package«-Kopfzeilen"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "Pinning-Typ (pin type) %s nicht verständlich"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "Keine Priorität (oder Null) für Pin angegeben"
@@ -2800,16 +2812,16 @@ msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"Paket %s %s wurde nicht gefunden beim Verarbeiten der Dateiabhängigkeiten"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "»stat« konnte nicht auf die Liste %s der Quellpakete ausgeführt werden."
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "Sammle Datei-Provides"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "E/A-Fehler beim Speichern des Quell-Caches"
@@ -2818,20 +2830,20 @@ msgstr "E/A-Fehler beim Speichern des Quell-Caches"
msgid "rename failed, %s (%s -> %s)."
msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "MD5-Summe stimmt nicht überein"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "Hash-Summe stimmt nicht überein"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Es gibt keine öffentlichen Schlüssel für die folgenden Schlüssel-IDs:\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2841,7 +2853,7 @@ msgstr ""
"Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender "
"Architektur)."
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2850,14 +2862,14 @@ msgstr ""
"Es konnte keine Datei für Paket %s gefunden werden. Das könnte heißen, dass "
"Sie dieses Paket von Hand korrigieren müssen."
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Die Paketindexdateien sind beschädigt: Kein Filename:-Feld für Paket %s."
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "Größe stimmt nicht überein"
@@ -2996,7 +3008,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "Öffne Konfigurationsdatei %s"
@@ -3007,7 +3018,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:542
#, fuzzy, c-format
-#| msgid "Hash Sum mismatch"
msgid "Hash mismatch for: %s"
msgstr "Hash-Summe stimmt nicht überein"
@@ -3028,7 +3038,6 @@ msgstr "%s wird entfernt"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "%s vollständig entfernt"
@@ -3119,14 +3128,30 @@ msgstr ""
msgid "Not locked"
msgstr "Nicht gesperrt"
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Datei konnte nicht gepatcht werden"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Verbindung vorzeitig beendet"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Zugriff auf Schlüsselring nicht möglich: »%s«"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Datei konnte nicht gepatcht werden"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/dz.po b/po/dz.po
index aa75a0ddd..3d0644477 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po.pot\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2006-09-19 09:49+0530\n"
"Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n"
"Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -152,7 +152,7 @@ msgstr "ཐོན་རིམ་ཐིག་ཁྲམ།:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s་གི་དོན་ལུ་%s %sགུར་ཕྱོགས་སྒྲིག་འབད་ཡོད་པའི་%s %s\n"
@@ -308,7 +308,7 @@ msgstr ""
" -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་-o dir::cache=/tmp་"
"བཟུམ།\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr " %sལུ་འབྲི་མ་ཚུགས།"
@@ -445,8 +445,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "ཌི་བི་འདི་རྙིངམ་ཨིན་པས་ %s་ཡར་བསྐྱེད་འབད་ནིའི་དོན་ལུ་དཔའ་བཅམ་དོ།"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"ཌི་བི་རྩ་སྒྲིག་འདི་ ནུས་མེད་ཨིན་པས། ཁྱོད་ཀྱི་ apt་ གྱི་འཐོན་རིམ་རྙིངམ་ཅིག་ནང་ལས་ ཡར་བསྐྱེད་འབད་ཡོད་"
@@ -463,11 +464,11 @@ msgstr "%s: %s་ཌི་བི་ཡིག་སྣོད་འདི་ཁ་
msgid "Failed to stat %s"
msgstr "%s་སིཊེཊི་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "ཡིག་མཛོད་འདི་ལུ་ཚད་འཛིན་དྲན་ཐོ་མིན་འདུག"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "འོད་རྟགས་ལེན་མ་ཚུགས།"
@@ -532,26 +533,26 @@ msgstr "*** %s་ལས་%sལུ་འབྲེལ་འཐུད་འབད
msgid " DeLink limit of %sB hit.\n"
msgstr "%sB་ཧེང་བཀལ་བཀྲམ་ནིའི་འབྲེལ་མེད་བཅད་མཚམས།\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "ཡིག་མཛོད་ལུ་ཐུམ་སྒྲིལ་ཅི་ཡང་འཐུས་ཤོར་མ་བྱུང་།"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %sལུ་ཟུར་བཞག་ཐོ་བཀོད་མེད།\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s ་རྒྱུན་སྐྱོང་པ་འདི་ %s ཨིན་ %s མེན།\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s ལུ་འབྱུང་ཁུངས་མེདཔ་གཏང་ནིའི་ཐོ་བཀོད་འདི་མེད།\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %sལུ་ཟུང་ལྡན་མེདཔ་གཏང་ནིའི་་ཐོ་བཀོད་གང་རུང་ཡང་མིན་འདུག།\n"
@@ -655,7 +656,7 @@ msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི
msgid "Y"
msgstr "ཝའི།"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s"
@@ -818,11 +819,11 @@ msgstr "ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་བཏ
msgid "Internal error, Ordering didn't finish"
msgstr "ནང་འཁོད་འཛོལ་བ་ གོ་རིམ་བཟོ་ནི་ཚུ་མཇུག་མ་བསྡུ་བས།"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབས་མ་ཚུགས་པས།"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "འབྱུང་ཁུངས་ཚུ་ཀྱི་ཐོ་ཡིག་དེ་ལྷག་མི་ཚུགས་པས།"
@@ -853,8 +854,8 @@ msgstr "ཁ་སྐོང་གི་%sB་འདི་བཤུབ་པའི
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "%sB་འདི་ཤུབ་པའི་ཤུལ་ལས་ཀྱི་བར་སྟོང་དེ་དལཝ་སྦེ་ལུས་འོང་།\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s་ནང་བར་སྟོང་"
@@ -891,7 +892,7 @@ msgstr "བར་བཤོལ་འབད།"
msgid "Do you want to continue [Y/n]? "
msgstr "ཁྱོན་ཀྱི་འཕྲོ་མཐུད་ནི་འབད་ནི་ཨིན་ན་[Y/n]?"
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
@@ -900,7 +901,7 @@ msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བ
msgid "Some files failed to download"
msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "ཕབ་ལེན་ཐབས་ལམ་རྐྱངམ་གཅིག་ནང་མཇུག་བསྡུཝ་སྦེ་རང་ཕབ་ལེན་འབད།"
@@ -999,51 +1000,51 @@ msgstr "'%s'་གི་དོན་ལུ་འཐོན་རིམ་'%s'་
msgid "Selected version %s (%s) for %s\n"
msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1059,44 +1060,44 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "འོག་གི་བརྡ་དོན་དེ་གིས་དུས་སྐབས་འདི་མོས་མཐུན་བཟོ་ནི་ལུ་གྲོགས་རམ་འབད་འོང་:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "ནང་འགོད་འཛོལ་བ་ ཡར་བསྐྱེད་ཀྱི་ཅ་ཆས་ཆ་མཉམ་མེདཔ་ཐལ་ཡོད།"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "དྲན་འཛིན་ རི་ཇེགསི་'%s'གི་དོན་ལུ་%s་སེལ་འཐུ་འབད་དོ།\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "འདི་ཚུ་ནོར་བཅོས་འབད་ནིའི་དོན་ལུ་ཁྱོད་ཀྱི་`apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་:"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1104,7 +1105,7 @@ msgstr ""
"མ་ཚང་བའི་རྟེན་འབྲེལ་ ཐུས་སྒྲིལ་མེད་མི་ཚུ་དང་གཅིག་ཁར་ 'apt-get -f install'དེ་འབཐ་རྩོལ་བསྐྱེདཔ།"
"(ཡང་ན་ཐབས་ཤེས་ཅིག་གསལ་བཀོད་འབད།)"
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1115,122 +1116,122 @@ msgstr ""
"འབད་འབདཝ་འོང་ནི་མས་ ཡང་ན་ད་ལྟོ་ཡང་གསར་བསྐྲུན་མ་འབད་བར་ཡོད་པའི་ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་ཡང་ན་ནང་"
"འབྱོར་གྱི་ཕྱི་ཁར་རྩ་བསྐྲད་བཏང་ཡོད་པའི་རྩ་བརྟན་མེད་པའི་བགོ་འགྲེམ་ཚུ་ལག་ལེན་འཐབ་དོ་ཡོདཔ་འོང་ནི་ཨིན་པས།"
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ།"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཐེབས་ཚུ་གཞི་བཙུགས་འབད་འོང་:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "བསམ་འཆར་བཀོད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "འོས་སྦྱོར་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "འབད་ཚར་ཡི།"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s་གི་དོན་ལུ་འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་ཅིག་འཚོལ་མ་འཐོབ"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr " %s་ནང་ཁྱོད་ལུ་བར་སྟོང་ཚུ་ལངམ་སྦེ་མིན་འདུག་"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%sB་ལེན་དགོཔ་འདུག་ འབྱུང་ཁུངས་ཡིག་མཛོད་ཀྱི་%sB།\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "འབྱུང་ཁུངས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསས།\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "%s་འབྱུང་ཁུངས་ལེན།\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོ།\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འཐུས་ཤོར་བྱུང་ཡོད།\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འཐུས་ཤོར་བྱུང་ནུག"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགས།"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1239,32 +1240,32 @@ msgstr ""
"%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་སྐོང་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་ཐུམ་སྒརིལ་%s་གི་འཐོན་རིམ་"
"ཚུ་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་འཐོན་རིམ་དགོས་མཁོ་ཚུ་གི་རེ་བ་དོ་སྐོང་མ་ཚུགས་པས།"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%s:གི་དོན་ལུ་%s་རྟེན་འབྲེལ་དེ་གི་རེ་བ་སྐོང་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན་ གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་"
"སྒྲིལ་%s་དེ་གནམ་མེད་ས་མེད་གསརཔ་ཨིན་པས།"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འཐུས་ཤོར་བྱུང་ནུག"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས།"
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1351,7 +1352,7 @@ msgstr ""
"ཤོག་ལེབ་ཚུ་ལུ་བལྟ།\n"
" འ་ནི་ ཨེ་ཊི་པི་འདི་ལུ་ཡང་དག་ ཀའུ་ ནུས་ཤུགས་ཚུ་ཡོད།\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1602,11 +1603,10 @@ msgstr "ཐུམ་སྒྲིལ་%s་ནང་ལུ་་ཡིག་ས
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "%s་འདི་ལུ་ལྷག་མ་ཚུགས།"
@@ -1636,9 +1636,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "info ་དང་ temp་སྣོད་ཐོ་ཚུ་ཡིག་སྣོད་རིམ་ལུགས་གཅིག་གུར་ལུ་བཞག་དགོཔ་ཨིན།"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་ཚུ་ལྷག་དོ།"
@@ -1772,11 +1772,11 @@ msgid "File not found"
msgstr "ཡིག་སྣོད་འཚོལ་མ་ཐོབ།"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "ཆུ་ཚོད་ལེགས་བཅོས་གཞི་སྒྲིག་འབཐ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
@@ -1838,7 +1838,7 @@ msgstr "མཐུད་ལམ་ངལ་མཚམས"
msgid "Server closed the connection"
msgstr "སར་བར་གྱིས་མཐུད་ལམ་འདི་ཁ་བསྡམས་ཏེ་ཡོདཔ་ཨིན།"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "འཛོལ་བ་ལྷབ།"
@@ -1850,7 +1850,7 @@ msgstr "ལན་གྱིས་ གནད་ཁོངས་གུར་ལས
msgid "Protocol corruption"
msgstr "གནད་སྤེལ་ལམ་ལུགས་ ངན་ཅན།"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "འཛོལ་བ་འབྲི།"
@@ -1904,7 +1904,7 @@ msgstr "གནད་སྡུད་སོ་ཀེཊི་ མཐུད་ན
msgid "Unable to accept connection"
msgstr "མཐུད་ལམ་འདི་དང་ལེན་འབད་མ་ཚུགས།"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "ཡིག་སྣོད་ལུ་་དྲྭ་རྟགས་བཀལ་བའི་བསྒང་དཀའ་ངལ།"
@@ -1968,63 +1968,68 @@ msgstr " %s:%s (%s)ལུ་མཐུད་མ་ཚུགས།"
msgid "Connecting to %s"
msgstr "%s་ལུ་མཐུད་དོ།"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "'%s'མོས་མཐུན་འབད་མ་ཚུགས།"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "'%s'མོས་མཐུན་འབད་ནི་ལུ་གནས་སྐབས་ཀྱི་འཐུས་ཤོར།"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་པ་ཅིག་བྱུང་ཡི།"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "%s %s:ལུ་མཐུད་མ་ཚུགས།"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "'%s'ལྡེ་འཁོར་འདི་འཛུལ་སྤྱོད་འབད་མ་ཚུགས།"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།"
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"E: Acquire::gpgv::Options་ནང་ལས་ཀྱི་སྒྲུབ་རྟགས་ཀྱི་ཐོ་ཡིག་དེ་གནམ་མེད་ས་མེད་རིངམ་འདུག ཕྱིར་"
"འཐོན་དོ།"
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"ནང་འཁོད་འཛོལ་བ: མིང་རྟགས་འདི་ལེགས་ཤོམ་ཅིག་འདུག་ འདི་འབདཝ་ད་མཛུབ་རྗེས་ལྡེ་མིག་དེ་གཏན་འབེབས་བཟོ་"
"མ་ཚུགས?!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "ཉུང་མཐའ་རང་ནུས་མེད་ཀྱི་མིང་རྟགས་ཅིག་གདོང་ཐུག་བྱུང་སྟེ་ཡོདཔ་ཨིན།"
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་'%s'འདི་ལག་ལེན་འཐབ་མ་ཚུགས། (gpgv་དེ་ཁཞི་བཙུགས་འབད་ཡོདཔ་ཨིན་ན།?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "gpgv་ལག་ལེན་འཐབ་ནི་ལུ་མ་ཤེས་པའི་འཛོལ་བ་།"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "འོག་གི་མིང་རྟགས་ཚུ་ནུས་མེད་ཨིན་པས།:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2074,48 +2079,48 @@ msgstr "འ་ནི་ ཨེཆི་ཊི་ཊི་པི་ སར་བ
msgid "Unknown date format"
msgstr "མ་ཤེས་པའི་ཚེས་རྩ་སྒྲིག"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "སེལ་འཐུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "མཐུད་ལམ་ངལ་མཚམས་འབད་ཡོད།"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "ཨའུཊི་པུཊི་ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "ཡིག་སྣོད་འདི་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ། ཐག་རིང་མཇུག་གི་མཐུད་ལམ་དེ་ཁ་བསྡམས།"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ།"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
#, fuzzy
msgid "Failed to truncate file"
msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "མགོ་ཡིག་གནད་སྡུད་བྱང་ཉེས།"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "ནང་འཁོད་འཛོལ་བ།"
@@ -2123,18 +2128,25 @@ msgstr "ནང་འཁོད་འཛོལ་བ།"
msgid "Can't mmap an empty file"
msgstr "ཡིག་སྣོད་སྟོངམ་འདི་mmap་འབད་མ་ཚུགས།"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "%lu་བཱའིཊིསི་གི་mmap་བཟོ་མ་ཚུགས།"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2164,52 +2176,52 @@ msgstr ""
msgid "Selection %s not found"
msgstr "སེལ་འཐུ་%s ་མ་འཐོབ།"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "ངོ་མ་ཤེས་པའི་སྡུད་ཚིག་གི་དབྱེ་བ:'%c'"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་དོ།"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "་ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: སྡེབ་ཚན་གྱིས་མིང་མེད་མི་དང་གཅིག་ཁར་འགོ་བཙུགསཔ་ཨིན"
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཟོ་ཉེས་འགྱུར་བའི་ངོ་རྟགས།"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:གནས་གོང་གི་ཤུལ་ལས་མཁོ་མེད་ཐེབས།"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཀོད་རྒྱ་ཚུ་ཆེ་རིམ་ནང་རྐྱངམ་ཅིག་བྱིན་ཚུགས།"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:འདུ་འཛོམས་འབད་འབདཝ་ལེ་ཤཱ་གྲངས་སུ་བཙུགསཔ་ཨིན།"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: ནཱ་ལས་རང་འགོ་བཙུགས་གྲངས་སུ་བཙུགས་ཏེ་ཡོད།"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: རྒྱབ་སྐྱོར་མ་འབད་བར་ཡོད་པའི་'%s'བཀོད་རྒྱ།"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: ཡིག་སྣོད་ཀྱི་མཇུག་ལུ་མཁོ་མེད་ཐེབས།"
@@ -2285,76 +2297,76 @@ msgstr "%s་ལུ་བསྒྱུར་བཅོས་འབད་མ་ཚ
msgid "Failed to stat the cdrom"
msgstr "སི་ཌི་རོམ་འདི་ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "%s ལྷག་ནི་རྐྱངམ་ཅིག་འབད་མི་ལྡེ་མིག་ཡིག་སྣོད་འདི་གི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི་འཐབ་པས།"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "ལྡེ་མིག་རྐྱབས་ཡོད་པའི་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr ""
"ཨེན་ཨེཕ་ཨེསི་ %s སྦྱར་བརྩེགས་འབད་ཡོད་པའི་ལྡེ་མིག་ཡིག་སྣོད་ཀྱི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི་འཐབ་པས།"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "%sལྡེ་མིག་རྐྱབ་ནི་ལེན་མ་ཚུགས།"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།"
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།"
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "ཡན་ལག་ལས་སྦྱོར་%s་གིས་འཛོལ་བའི་ཨང་རྟགས་(%u)ཅིག་སླར་ལོག་འབད་ཡོདཔ་ཨིན།"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "ཡན་ལག་ལས་སྦྱོར་་%s་གིས་རེ་བ་མེད་པར་ཕྱིར་ཐོན་ཡོདཔ་ཨིན།"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "ལྷག་ ད་ལྟོ་ཡང་ལྷག་ནི་ལུ་%lu་ཡོད་འདི་འབདཝ་ད་ཅི་ཡང་ལྷག་ལུས་མིན་འདུག"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "འབྲི་ ད་ལྟོ་ཡང་འབྲི་ནི་ལུ་%lu་ཡོད་འདི་འདབཝ་ད་འབད་མ་ཚུགས།"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "ཡིག་སྣོད་འདི་འབྲེལལམ་མེདཔ་བཟོ་བའི་བསྒང་དཀའ་ངལ།"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།"
@@ -2472,52 +2484,52 @@ msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་
msgid "Unable to parse package file %s (2)"
msgstr "%s (༢་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu འབྱུང་ཁུངས་ཐོ་ཡིག་ %s (ཡུ་ཨར་ཨའི་)གི་ནང་ན།"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(ཡང་དག་ dist)གི་ནང་ན།"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "%s་ཁ་ཕྱེ་དོ།"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "གྲལ་ཐིག་%u་འདི་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་ནང་ལུ་གནམ་མེད་ས་མེད་རིངམོ་འདུག"
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (དབྱེ་བ)་ནང་ན།"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(སིལ་ཚོང་པ་ ཨའི་ཌི)གི་ནང་ན།"
@@ -2645,17 +2657,17 @@ msgstr "ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་ཡང་
msgid "You may want to run apt-get update to correct these problems"
msgstr "འ་ནི་དཀའ་ངལ་འདི་ཚུ་སེལ་ནིའི་ལུ་ ཁྱོད་ཀྱི་ apt-get update་དེ་གཡོག་བཀོལ་དགོཔ་འོང་།"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "དགའ་གདམ་ཡིག་སྣོད་ནང་ལུ་ནུས་མེད་ཀྱི་དྲན་ཐོ་ ཐུམ་སྒྲིལ་མགོ་ཡིག་མིན་འདུག"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "ངོ་རྟགས་ཨང་གི་དབྱེ་བ་ %s འདི་ཧ་གོ་མ་ཚུགས།"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "གོ་རྟགས་ཨང་གི་དོན་ལུ་ གཙོ་རིམ་(ཡང་ན་ ཀླད་ཀོར་)ཚུ་གསལ་བཀོད་མ་འབད་བས།"
@@ -2740,16 +2752,16 @@ msgstr "%s (CollectFileProvides)དེ་བཟོ་སྦྱོར་འབད
msgid "Package %s %s was not found while processing file dependencies"
msgstr "ཡིག་སྣོད་རྟེན་འབྲེལ་འདི་ཚུ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་ཐུམ་སྒྲིལ་ %s %s ་འདི་མ་ཐོབ་པས།"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "ཡིག་སྣོད་བྱིན་མི་ཚུ་བསྡུ་ལེན་འབད་དོ།"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མཛོད་སྲུང་བཞག་འབད་དོ།"
@@ -2758,20 +2770,20 @@ msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མ
msgid "rename failed, %s (%s -> %s)."
msgstr "%s (%s -> %s)བསྐྱར་མིང་བཏགས་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།"
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr "འོག་གི་ ཨའི་ཌི་་ ལྡེ་མིག་ཚུ་གི་དོན་ལུ་མི་དམང་གི་ལྡེ་མིག་འདི་འཐོབ་མི་ཚུགས་པས:\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2780,7 +2792,7 @@ msgstr ""
" %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ "
"འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན།)"
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2789,14 +2801,14 @@ msgstr ""
" %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ "
"འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག "
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"ཐུམ་སྒྲིལ་ ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་ངན་ཅན་འགྱོ་ནུག ཡིག་སྣོད་ཀྱི་མིང་མིན་འདུག: %s་ཐུམ་སྒྲིལ་གྱི་དོན་ལུ་ས་སྒོ།"
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "ཚད་མ་མཐུན།"
@@ -2932,7 +2944,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་དོ།"
@@ -2963,7 +2974,6 @@ msgstr "%s་རྩ་བསྐྲད་གཏང་དོ།"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།"
@@ -3047,15 +3057,31 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-#, fuzzy
-msgid "Could not patch file"
-msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "དུས་སུ་མ་འབབ་པ་རང་མཐུད་ལམ་འདི་ག་བསྡམས་ཡོད།"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "'%s'ལྡེ་འཁོར་འདི་འཛུལ་སྤྱོད་འབད་མ་ཚུགས།"
+
+#, fuzzy
+#~ msgid "Could not patch file"
+#~ msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
+
#~ msgid " %4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/el.po b/po/el.po
index b4800b8be..5c4ead054 100644
--- a/po/el.po
+++ b/po/el.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_el\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2008-08-26 18:25+0300\n"
"Last-Translator: quad-nrg.net <yodesy@quad-nrg.net>\n"
"Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -158,7 +158,7 @@ msgstr " Πίνακας Έκδοσης:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s για %s είναι μεταγλωττισμένο σε %s %s\n"
@@ -316,7 +316,7 @@ msgstr ""
" -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n"
" -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "Αδύνατη η εγγραφή στο %s"
@@ -453,8 +453,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "Η βάση δεν είναι ενημερωμένη, γίνεται προσπάθεια να αναβαθμιστεί το %s"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"Το φορμά της βάσης δεν είναι έγκυρο. Εάν αναβαθμίσατε το apt σε νεότερη "
@@ -471,11 +472,11 @@ msgstr "Το άνοιγμά του αρχείου της βάσης %s: %s απ
msgid "Failed to stat %s"
msgstr "Αποτυχία εύρεσης της κατάστασης του %s."
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Η αρχειοθήκη δεν περιέχει πεδίο ελέγχου"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Αδύνατη η πρόσβαση σε δείκτη"
@@ -540,26 +541,26 @@ msgstr " Αποτυχία σύνδεσης του %s με το %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Αποσύνδεση ορίου του %sB hit.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "Η αρχειοθήκη δεν περιέχει πεδίο πακέτων"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s δεν περιέχει εγγραφή παράκαμψης\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s συντηρητής είναι ο %s όχι ο %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s δεν έχει εγγραφή πηγαίας παράκαμψης\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s δεν έχει ούτε εγγραφή δυαδικής παράκαμψης\n"
@@ -663,7 +664,7 @@ msgstr "Αποτυχία μετονομασίας του %s σε %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "σφάλμα μεταγλωτισμου - %s"
@@ -827,11 +828,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr "Εσωτερικό Σφάλμα, η Ταξινόμηση δεν ολοκληρώθηκε"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Αδύνατη η ανάγνωση της λίστας πηγών."
@@ -863,8 +864,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Μετά από αυτή τη λειτουργία, θα ελευθερωθούν %sB χώρου από το δίσκο.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s"
@@ -901,7 +902,7 @@ msgstr "Εγκατάλειψη."
msgid "Do you want to continue [Y/n]? "
msgstr "Θέλετε να συνεχίσετε [Ν/ο]; "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Αποτυχία ανάκτησης του %s %s\n"
@@ -910,7 +911,7 @@ msgstr "Αποτυχία ανάκτησης του %s %s\n"
msgid "Some files failed to download"
msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο"
@@ -1012,51 +1013,51 @@ msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
msgid "Selected version %s (%s) for %s\n"
msgstr "Επιλέχθηκε η έκδοση %s (%s) για το%s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "Η εντολή update δεν παίρνει ορίσματα"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Αδύνατο το κλείδωμα του καταλόγου"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"Δεν επιτρέπεται οποιαδήποτε διαγραφή· αδυναμία εκκίνησης του AutoRemover"
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "Τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Χρησιμοποιήστε 'apt-get autoremove' για να τα διαγράψετε."
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1074,43 +1075,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Εσωτερικό Σφάλμα, το AutoRemover δημιούργησε κάποιο πρόβλημα"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Εσωτερικό Σφάλμα, η διαδικασία αναβάθμισης χάλασε"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "Αδύνατη η εύρεση του συνόλου πακέτων %s"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "Αδύνατη η εύρεση του πακέτου %s"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr "το %s έχει εγκατασταθεί με το χέρι\n"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Aν τρέξετε 'apt-get -f install' ίσως να διορθώσετε αυτά τα προβλήματα:"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1118,7 +1119,7 @@ msgstr ""
"Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε "
"πακέτο (ή καθορίστε μια λύση)."
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1130,120 +1131,120 @@ msgstr ""
"διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n"
"μετακινηθεί από τα εισερχόμενα."
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "Χαλασμένα πακέτα"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Προτεινόμενα πακέτα:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Συνιστώμενα πακέτα:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "Υπολογισμός της αναβάθμισης... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Απέτυχε"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Ετοιμο"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο "
"υλικό"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον "
"κωδικάτου"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "Μεταφόρτωση Κωδικα %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Απέτυχε η εντολή χτισίματος %s.\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "Η απογονική διεργασία απέτυχε"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1251,7 +1252,7 @@ msgid ""
msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1260,32 +1261,32 @@ msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες "
"εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s "
"είναι νεώτερο"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται."
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "Υποστηριζόμενοι Οδηγοί:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1368,7 +1369,7 @@ msgstr ""
"για περισσότερες πληροφορίες και επιλογές.\n"
" This APT has Super Cow Powers.\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1618,11 +1619,10 @@ msgstr "Το αρχείο %s/%s αντικαθιστά αυτό στο πακέ
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "Αδύνατη η ανάγνωση του %s"
@@ -1652,9 +1652,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Οι φάκελοι info και temp πρέπει να βρίσκονται στο ίδιο σύστημα αρχείων"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "Ανάγνωση Λιστών Πακέτων"
@@ -1789,11 +1789,11 @@ msgid "File not found"
msgstr "Το αρχείο Δε Βρέθηκε"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "Αποτυχία εύρεσης της κατάστασης"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "Αποτυχία ορισμού του χρόνου τροποποίησης"
@@ -1855,7 +1855,7 @@ msgstr "Λήξη χρόνου σύνδεσης"
msgid "Server closed the connection"
msgstr "Ο διακομιστής έκλεισε την σύνδεση"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Σφάλμα ανάγνωσης"
@@ -1867,7 +1867,7 @@ msgstr "Το μήνυμα απάντησης υπερχείλισε την εν
msgid "Protocol corruption"
msgstr "Αλλοίωση του πρωτοκόλλου"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Σφάλμα εγγραφής"
@@ -1921,7 +1921,7 @@ msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδο
msgid "Unable to accept connection"
msgstr "Αδύνατη η αποδοχή συνδέσεων"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Πρόβλημα κατά το hashing του αρχείου"
@@ -1985,62 +1985,67 @@ msgstr "Αδύνατη η σύνδεση στο %s:%s (%s)."
msgid "Connecting to %s"
msgstr "Σύνδεση στο %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "Αδύνατη η εύρεση του '%s'"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Προσωρινή αποτυχία στην εύρεση του '%s'"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Κάτι παράξενο συνέβη κατά την εύρεση του '%s:%s' (%i)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Αδύνατη η σύνδεση στο %s %s:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "Αδύνατη η εύρεση του συνόλου κλειδιών '%s'"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Εγκατάλειψη της εγκατάστασης."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "Ε: Λίστα Ορισμάτων από Acquire::gpgv::Options πολύ μεγάλη. Έξοδος."
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Εσωτερικό σφάλμα: Η υπογραφή είναι καλή, αλλά αδυναμία προσδιορισμού του "
"αποτυπώματος?!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "Βρέθηκε τουλάχιστον μια μη έγκυρη υπογραφή."
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Αδυναμία εκτέλεσης του '%s' για την επαλήθευση της υπογραφής (είναι "
"εγκατεστημένο το gpgv;)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "Άγνωστο σφάλμα κατά την εκτέλεση του gpgv"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "Οι παρακάτω υπογραφές ήταν μη έγκυρες:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2091,49 +2096,49 @@ msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρω
msgid "Unknown date format"
msgstr "Άγνωστη μορφή ημερομηνίας"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "Η επιλογή απέτυχε"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "Λήξη χρόνου σύνδεσης"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "Σφάλμα στην εγγραφή στο αρχείο"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "Σφάλμα στην εγγραφή στο αρχείο"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "Σφάλμα στην ανάγνωση από το διακομιστή"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
#, fuzzy
msgid "Failed to truncate file"
msgstr "Αποτυχία εγγραφής του αρχείου %s"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "Ελαττωματικά δεδομένα επικεφαλίδας"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "Η σύνδεση απέτυχε"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Εσωτερικό Σφάλμα"
@@ -2141,18 +2146,25 @@ msgstr "Εσωτερικό Σφάλμα"
msgid "Can't mmap an empty file"
msgstr "Αδύνατη η απεικόνιση mmap ενός άδειου αρχείου"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Αδύνατη η απεικόνιση μέσω mmap %lu bytes"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2182,53 +2194,53 @@ msgstr ""
msgid "Selection %s not found"
msgstr "Η επιλογή %s δε βρέθηκε"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Μη αναγνωρισμένος τύπος σύντμησης: '%c'"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Συντακτικό σφάλμα %s:%u: Το block αρχίζει χωρίς όνομα."
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Συντακτικό σφάλμα %s:%u: Λάθος μορφή Ετικέτας (Tag)"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες μετά την τιμή"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Συντακτικό σφάλμα %s:%u: Οι οδηγίες βρίσκονται μόνο στο ανώτατο επίπεδο"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Συντακτικό σφάλμα %s:%u: Υπερβολικός αριθμός συνδυασμένων includes"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Συντακτικό σφάλμα %s:%u: Συμπεριλαμβάνεται από εδώ"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Συντακτικό σφάλμα %s:%u: Μη υποστηριζόμενη εντολή '%s'"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες στο τέλος του αρχείου"
@@ -2305,78 +2317,78 @@ msgstr "Αδύνατη η αλλαγή σε %s"
msgid "Failed to stat the cdrom"
msgstr "Αδύνατη η εύρεση της κατάστασης του cdrom"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr ""
"Δε θα χρησιμοποιηθεί κλείδωμα για το ανάγνωσης μόνο αρχείο κλειδώματος %s"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "Αδύνατο το άνοιγμα του αρχείου κλειδώματος %s"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr ""
"Δε θα χρησιμοποιηθεί κλείδωμα για το συναρμοσμένο από nfs αρχείο κλειδώματος "
"%s"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "Αδύνατο το κλείδωμα %s"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)"
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)"
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Η υποδιεργασία %s επέστρεψε ένα κωδικός σφάλματος (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Η υποδιεργασία %s εγκατέλειψε απρόσμενα"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "αναγνώστηκαν, απομένουν ακόμη %lu για ανάγνωση αλλά δεν απομένουν άλλα"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "γράφτηκαν, απομένουν %lu για εγγραφή αλλά χωρίς επιτυχία"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "Πρόβλημα κατά την διαγραφή του αρχείου"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου"
@@ -2493,52 +2505,52 @@ msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s
msgid "Unable to parse package file %s (2)"
msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Απόλυτο dist)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "Άνοιγμα του %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος "
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (id κατασκευαστή)"
@@ -2669,17 +2681,17 @@ msgid "You may want to run apt-get update to correct these problems"
msgstr ""
"Ίσως να πρέπει να τρέξετε apt-get update για να διορθώσετε αυτά τα προβλήματα"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Μη έγκυρη εγγραφή στο αρχείο προτιμήσεων, καμία επικεφαλίδα Package"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "Αδύνατη η κατανόηση του τύπου καθήλωσης %s"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr ""
"Δεν έχει οριστεί προτεραιότητα (ή έχει οριστεί μηδενική) για την καθήλωση"
@@ -2768,16 +2780,16 @@ msgstr "Προέκυψε σφάλμα κατά την επεξεργασία τ
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Το πακέτο %s %s δε βρέθηκε κατά την επεξεργασία εξαρτήσεων του αρχείου"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "Συλλογή Παροχών Αρχείου"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών"
@@ -2786,19 +2798,19 @@ msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγ
msgid "rename failed, %s (%s -> %s)."
msgstr "απέτυχε η μετονομασία, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "Ανόμοιο MD5Sum"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "Ανόμοιο MD5Sum"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr "Δεν υπάρχει διαθέσιμο δημόσιο κλειδί για τα ακολουθα κλειδιά:\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2807,7 +2819,7 @@ msgstr ""
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)"
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2816,7 +2828,7 @@ msgstr ""
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο."
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2824,7 +2836,7 @@ msgstr ""
"Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο "
"πακέτο %s."
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "Ανόμοιο μέγεθος"
@@ -2959,7 +2971,6 @@ msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία κα
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s"
@@ -2970,7 +2981,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:542
#, fuzzy, c-format
-#| msgid "Hash Sum mismatch"
msgid "Hash mismatch for: %s"
msgstr "Ανόμοιο MD5Sum"
@@ -2991,7 +3001,6 @@ msgstr "Αφαιρώ το %s"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "Το %s διαγράφηκε πλήρως"
@@ -3077,14 +3086,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Αδύνατη η διόρθωση του αρχείου"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Η σύνδεση έκλεισε πρόωρα"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Αδύνατη η εύρεση του συνόλου κλειδιών '%s'"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Αδύνατη η διόρθωση του αρχείου"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/en_GB.po b/po/en_GB.po
index 3b73e344b..39163a47e 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.18\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2008-11-13 11:47+0000\n"
"Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
"Language-Team: en_GB <en_gb@li.org>\n"
@@ -146,7 +146,7 @@ msgstr " Version table:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s for %s compiled on %s %s\n"
@@ -299,7 +299,7 @@ msgstr ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "Unable to write to %s"
@@ -432,8 +432,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "DB is old, attempting to upgrade %s"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"DB format is invalid. If you upgraded from a older version of apt, please "
@@ -450,11 +451,11 @@ msgstr "Unable to open DB file %s: %s"
msgid "Failed to stat %s"
msgstr "Failed to stat %s"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Archive has no control record"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Unable to get a cursor"
@@ -519,26 +520,26 @@ msgstr "*** Failed to link %s to %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink limit of %sB hit.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "Archive had no package field"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s has no override entry\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s maintainer is %s not %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s has no source override entry\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s has no binary override entry either\n"
@@ -642,7 +643,7 @@ msgstr "Failed to rename %s to %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex compilation error - %s"
@@ -803,11 +804,11 @@ msgstr "Packages need to be removed but remove is disabled."
msgid "Internal error, Ordering didn't finish"
msgstr "Internal error, Ordering didn't finish"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "Unable to lock the download directory"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "The list of sources could not be read."
@@ -836,8 +837,8 @@ msgstr "After this operation, %sB of additional disk space will be used.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "After this operation, %sB disk space will be freed.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Couldn't determine free space in %s"
@@ -874,7 +875,7 @@ msgstr "Abort."
msgid "Do you want to continue [Y/n]? "
msgstr "Do you want to continue [Y/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Failed to fetch %s %s\n"
@@ -883,7 +884,7 @@ msgstr "Failed to fetch %s %s\n"
msgid "Some files failed to download"
msgstr "Some files failed to download"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "Download complete and in download only mode"
@@ -980,35 +981,35 @@ msgstr "Version ‘%s’ for ‘%s’ was not found"
msgid "Selected version %s (%s) for %s\n"
msgstr "Selected version %s (%s) for %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Couldn't stat source package list %s"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "The update command takes no arguments"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Unable to lock the list directory"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "We are not supposed to delete stuff, cannot start AutoRemover"
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1016,18 +1017,18 @@ msgstr ""
"The following packages were automatically installed and are no longer "
"required:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"The following packages were automatically installed and are no longer "
"required:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Use 'apt-get autoremove' to remove them."
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1045,43 +1046,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "The following information may help to resolve the situation:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Internal Error, AutoRemoved broke stuff"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Internal error, AllUpgrade broke stuff"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "Couldn't find task %s"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "Couldn't find package %s"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Note, selecting %s for regex ‘%s’\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s set to manually installed.\n"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "You might want to run 'apt-get -f install' to correct these:"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1089,7 +1090,7 @@ msgstr ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1101,116 +1102,116 @@ msgstr ""
"distribution that some required packages have not yet been created\n"
"or been moved out of Incoming."
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "Broken packages"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "The following extra packages will be installed:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Suggested packages:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Recommended packages:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "Calculating upgrade... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Failed"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Done"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "Internal error, problem resolver broke stuff"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr "Must specify at least one package for which to fetch source"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Unable to find a source package for %s"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Skipping already downloaded file '%s'\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "You don't have enough free space in %s"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Need to get %sB/%sB of source archives.\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Need to get %sB of source archives.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "Fetch source %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "Failed to fetch some archives."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Skipping unpack of already unpacked source in %s\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Unpack command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Check if the 'dpkg-dev' package is installed.\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "Child process failed"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Must specify at least one package for which you want to check builddeps"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Unable to get build-dependency information for %s"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s has no build depends.\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1219,7 +1220,7 @@ msgstr ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1228,31 +1229,31 @@ msgstr ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Failed to satisfy %s dependency for %s: Installed package %s is too new"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Failed to satisfy %s dependency for %s: %s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Build-dependencies for %s could not be satisfied."
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "Failed to process build dependencies"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "Supported modules:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1337,7 +1338,7 @@ msgstr ""
"pages for more information and options.\n"
" This APT has Super Cow Powers.\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1583,11 +1584,10 @@ msgstr "File %s/%s overwrites the one in the package %s"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "Unable to read %s"
@@ -1617,9 +1617,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "The info and temp directories need to be on the same filesystem"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "Reading package lists"
@@ -1753,11 +1753,11 @@ msgid "File not found"
msgstr "File not found"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "Failed to stat"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "Failed to set modification time"
@@ -1819,7 +1819,7 @@ msgstr "Connection timeout"
msgid "Server closed the connection"
msgstr "Server closed the connection"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Read error"
@@ -1831,7 +1831,7 @@ msgstr "A response overflowed the buffer."
msgid "Protocol corruption"
msgstr "Protocol corruption"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Write error"
@@ -1885,7 +1885,7 @@ msgstr "Data socket connect timed out"
msgid "Unable to accept connection"
msgstr "Unable to accept connection"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem hashing file"
@@ -1949,59 +1949,64 @@ msgstr "Could not connect to %s:%s (%s)."
msgid "Connecting to %s"
msgstr "Connecting to %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "Could not resolve ‘%s’"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Temporary failure resolving ‘%s’"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Something wicked happened resolving ‘%s:%s’ (%i)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Unable to connect to %s %s:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "Couldn't access keyring: '%s'"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Aborting install."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Internal error: Good signature, but could not determine key fingerprint?!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "At least one invalid signature was encountered."
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr "Could not execute '%s' to verify signature (is gpgv installed?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "Unknown error executing gpgv"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "The following signatures were invalid:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2052,47 +2057,47 @@ msgstr "This HTTP server has broken range support"
msgid "Unknown date format"
msgstr "Unknown date format"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "Select failed"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "Connection timed out"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "Error writing to output file"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "Error writing to file"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "Error writing to the file"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "Error reading from server. Remote end closed connection"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "Error reading from server"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr "Failed to truncate file"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "Bad header data"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "Connection failed"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Internal error"
@@ -2100,18 +2105,25 @@ msgstr "Internal error"
msgid "Can't mmap an empty file"
msgstr "Cannot mmap an empty file"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Couldn't make mmap of %lu bytes"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2141,52 +2153,52 @@ msgstr ""
msgid "Selection %s not found"
msgstr "Selection %s not found"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Unrecognized type abbreviation: ‘%c’"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "Opening configuration file %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Syntax error %s:%u: Block starts with no name."
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntax error %s:%u: Malformed tag"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Syntax error %s:%u: Extra junk after value"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "Syntax error %s:%u: Directives can only be done at the top level"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Syntax error %s:%u: Too many nested includes"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntax error %s:%u: Included from here"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Syntax error %s:%u: Unsupported directive ‘%s’"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntax error %s:%u: Extra junk at end of file"
@@ -2262,75 +2274,75 @@ msgstr "Unable to change to %s"
msgid "Failed to stat the cdrom"
msgstr "Failed to stat the cdrom"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "Not using locking for read only lock file %s"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "Could not open lock file %s"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "Not using locking for nfs mounted lock file %s"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "Could not get lock %s"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Waited for %s but it wasn't there"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Sub-process %s received a segmentation fault."
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "Sub-process %s received a segmentation fault."
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Sub-process %s returned an error code (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Sub-process %s exited unexpectedly"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "Could not open file %s"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "read, still have %lu to read but none left"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "write, still have %lu to write but couldn't"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Problem closing the file"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "Problem unlinking the file"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "Problem syncing the file"
@@ -2447,52 +2459,52 @@ msgstr "Unable to parse package file %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Unable to parse package file %s (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Malformed line %lu in source list %s (URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Malformed line %lu in source list %s (dist)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Malformed line %lu in source list %s (URI parse)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Malformed line %lu in source list %s (absolute dist)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Malformed line %lu in source list %s (dist parse)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "Opening %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Line %u too long in source list %s."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Malformed line %u in source list %s (type)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Type ‘%s’ is not known on line %u in source list %s"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Malformed line %u in source list %s (vendor id)"
@@ -2618,17 +2630,17 @@ msgstr "The package lists or status file could not be parsed or opened."
msgid "You may want to run apt-get update to correct these problems"
msgstr "You may want to run apt-get update to correct these problems"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Invalid record in the preferences file, no Package header"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "Did not understand pin type %s"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "No priority (or zero) specified for pin"
@@ -2712,16 +2724,16 @@ msgstr "Error occurred while processing %s (CollectFileProvides)"
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Package %s %s was not found while processing file dependencies"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Couldn't stat source package list %s"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "Collecting File Provides"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "IO Error saving source cache"
@@ -2730,19 +2742,19 @@ msgstr "IO Error saving source cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "rename failed, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "MD5Sum mismatch"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "Hash Sum mismatch"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr "There is no public key available for the following key IDs:\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2751,7 +2763,7 @@ msgstr ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2760,14 +2772,14 @@ msgstr ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"The package index files are corrupted. No Filename: field for package %s."
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "Size mismatch"
@@ -2902,7 +2914,6 @@ msgstr "Wrote %i records with %i missing files and %i mismatched files\n"
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "Opening configuration file %s"
@@ -2913,7 +2924,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:542
#, fuzzy, c-format
-#| msgid "Hash Sum mismatch"
msgid "Hash mismatch for: %s"
msgstr "Hash Sum mismatch"
@@ -2934,7 +2944,6 @@ msgstr "Removing %s"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "Completely removed %s"
@@ -3018,14 +3027,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Could not patch file"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Connection closed prematurely"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Couldn't access keyring: '%s'"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Could not patch file"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/es.po b/po/es.po
index de7730b05..f8d09b3f5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.18\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2008-11-15 21:52+0100\n"
"Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -150,7 +150,7 @@ msgstr " Tabla de versin:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s para %s compilado en %s %s\n"
@@ -309,7 +309,7 @@ msgstr ""
" -o=? Establece una opcin de configuracin arbitraria, p. ej. -o dir::"
"cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "No se puede escribir en %s"
@@ -447,8 +447,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "DB anticuada, intentando actualizar %s"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"El formato de la base de datos no es vlido. Debe eliminar y recrear la base "
@@ -465,11 +466,11 @@ msgstr "No se pudo abrir el archivo DB %s: %s"
msgid "Failed to stat %s"
msgstr "No pude leer %s"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "No hay registro de control del archivo"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "No se pudo obtener un cursor"
@@ -534,26 +535,26 @@ msgstr "*** No pude enlazar %s con %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink se ha llegado al lmite de %sB.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "Archivo no tiene campo de paquetes"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s no tiene entrada de predominio\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " el encargado de %s es %s y no %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s no tiene una entrada fuente predominante\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s tampoco tiene una entrada binaria predominante\n"
@@ -657,7 +658,7 @@ msgstr "Fall el renombre de %s a %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error de compilacin de expresiones regulares - %s"
@@ -818,11 +819,11 @@ msgstr "Los paquetes necesitan eliminarse pero Remove est deshabilitado."
msgid "Internal error, Ordering didn't finish"
msgstr "Error interno, no termin el ordenamiento"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "No se puede bloquear el directorio de descarga"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "No se pudieron leer las listas de fuentes."
@@ -854,8 +855,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Se liberarn %sB despus de esta operacin.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "No pude determinar el espacio libre en %s"
@@ -892,7 +893,7 @@ msgstr "Abortado."
msgid "Do you want to continue [Y/n]? "
msgstr "Desea continuar [S/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Imposible obtener %s %s\n"
@@ -901,7 +902,7 @@ msgstr "Imposible obtener %s %s\n"
msgid "Some files failed to download"
msgstr "Algunos archivos no pudieron descargarse"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "Descarga completa y en modo de slo descarga"
@@ -998,36 +999,36 @@ msgstr "No se encontr la versin '%s' para '%s'"
msgid "Selected version %s (%s) for %s\n"
msgstr "Versin seleccionada %s (%s) para %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "No se puede leer la lista de paquetes fuente %s"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "El comando de actualizacin no toma argumentos"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "No se pudo bloquear el directorio de listas"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"Se supone que no vamos a eliminar cosas, no se pudo iniciar AutoRemover"
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1035,18 +1036,18 @@ msgstr ""
"Se instalaron de forma automtica los siguientes paquetes y ya no son "
"necesarios."
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"Se instalaron de forma automtica los siguientes paquetes y ya no son "
"necesarios."
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Utilice apt-get autoremove para eliminarlos."
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1064,43 +1065,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "La siguiente informacin puede ayudar a resolver la situacin:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Error interno, AutoRemover rompi cosas"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Error Interno, AllUpgrade rompi cosas"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "No se pudo encontrar la tarea %s"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "No se pudo encontrar el paquete %s"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, seleccionando %s para la expresin regular '%s'\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr "fijado %s como instalado manualmente.\n"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo:"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1108,7 +1109,7 @@ msgstr ""
"Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o "
"especifique una solucin)."
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1120,119 +1121,119 @@ msgstr ""
"inestable, que algunos paquetes necesarios no han sido creados o han\n"
"sido movidos fuera de Incoming."
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "Paquetes rotos"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "Se instalarn los siguientes paquetes extras:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Paquetes sugeridos:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Paquetes recomendados"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "Calculando la actualizacin... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Fall"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Listo"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Error interno, el sistema de solucin de problemas rompi\n"
"algunas cosas"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr "Debe especificar al menos un paquete para obtener su cdigo fuente"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "No se pudo encontrar un paquete de fuentes para %s"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Ignorando fichero ya descargado '%s'\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "No tiene suficiente espacio libre en %s"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Necesito descargar %sB/%sB de archivos fuente.\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Necesito descargar %sB de archivos fuente.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "Fuente obtenida %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "No se pudieron obtener algunos archivos."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Fall la orden de desempaquetamiento '%s'.\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Compruebe que el paquete dpkg-dev est instalado.\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Fall la orden de construccin '%s'.\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "Fall el proceso hijo"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Debe especificar al menos un paquete para verificar sus\n"
"dependencias de construccin"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "No se pudo obtener informacin de dependencias de construccin para %s"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no tiene dependencias de construccin.\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1241,7 +1242,7 @@ msgstr ""
"La dependencia %s en %s no puede satisfacerse porque no se puede \n"
"encontrar el paquete %s"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1250,32 +1251,32 @@ msgstr ""
"La dependencia %s en %s no puede satisfacerse porque ninguna versin\n"
"disponible del paquete %s satisface los requisitos de versin"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es "
"demasiado nuevo"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "No se pudo satisfacer la dependencia %s para %s: %s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "No se pudieron satisfacer las dependencias de construccin de %s."
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "No se pudieron procesar las dependencias de construccin"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "Mdulos soportados:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1361,7 +1362,7 @@ msgstr ""
"para ms informacin y opciones.\n"
" Este APT tiene poderes de Super Vaca.\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1613,11 +1614,10 @@ msgstr "El archivo %s/%s sobreescribe al que est en el paquete %s"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "No pude leer %s"
@@ -1648,9 +1648,9 @@ msgstr ""
"Los directorios info y temp deben de estar en el mismo sistema de archivos"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "Leyendo lista de paquetes"
@@ -1784,11 +1784,11 @@ msgid "File not found"
msgstr "Fichero no encontrado"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "No pude leer"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "No pude poner el tiempo de modificacin"
@@ -1850,7 +1850,7 @@ msgstr "La conexin expir"
msgid "Server closed the connection"
msgstr "El servidor cerr la conexin"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Error de lectura"
@@ -1862,7 +1862,7 @@ msgstr "Una respuesta desbord el buffer."
msgid "Protocol corruption"
msgstr "Corrupcin del protocolo"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Error de escritura"
@@ -1916,7 +1916,7 @@ msgstr "Expir conexin a socket de datos"
msgid "Unable to accept connection"
msgstr "No pude aceptar la conexin"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Hay problemas enlazando fichero"
@@ -1980,61 +1980,66 @@ msgstr "No pude conectarme a %s:%s (%s)."
msgid "Connecting to %s"
msgstr "Conectando a %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "No pude resolver '%s'"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Fallo temporal al resolver '%s'"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Algo raro pas resolviendo '%s:%s' (%i)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "No pude conectarme a %s %s:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "No se pudo acceder al anillo de claves: '%s'"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Abortando la instalacin."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"E: Lista de argumentos de Acquire::gpgv::Options demasiado larga. Terminando."
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Error interno: Firma correcta, pero no se pudo determinar su huella digital?!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "Se encontr al menos una firma invlida."
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"No se pudo ejecutar '%s' para verificar la firma (est instalado gpgv?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "Error desconocido ejecutando gpgv"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "Las siguientes firms fueron invlidas:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2085,47 +2090,47 @@ msgstr "ste servidor de http tiene el soporte de alcance roto"
msgid "Unknown date format"
msgstr "Formato de fecha desconocido"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "Fall la seleccin"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "Expir la conexin"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "Error escribiendo al archivo de salida"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "Error escribiendo a archivo"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "Error escribiendo al archivo"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "Error leyendo del servidor, el lado remoto cerr la conexin."
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "Error leyendo del servidor"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr "Fall al truncar el archivo"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "Mala cabecera Data"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "Fallo la conexin"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Error interno"
@@ -2133,18 +2138,25 @@ msgstr "Error interno"
msgid "Can't mmap an empty file"
msgstr "No puedo hacer mmap de un fichero vaco"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "No pude hacer mmap de %lu bytes"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2174,54 +2186,54 @@ msgstr ""
msgid "Selection %s not found"
msgstr "Seleccin %s no encontrada"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Tipo de abreviacin no reconocida: '%c'"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "Abriendo fichero de configuracin %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Error de sintaxis %s:%u: No hay un nombre al comienzo del bloque."
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Error de sintaxis %s:%u: Marca mal formada"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Error de sintaxis %s:%u: Basura extra despus del valor"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Error de sintaxis %s:%u: Las directivas slo se pueden poner\n"
"en el primer nivel"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Error de sintaxis %s:%u: Demasiadas inclusiones anidadas"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Error de sintaxis %s:%u: Incluido desde aqu"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Error de sintaxis %s:%u: Directiva '%s' no soportada"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Error de sintaxis %s:%u: Basura extra al final del archivo"
@@ -2299,75 +2311,75 @@ msgstr "No se pudo cambiar a %s"
msgid "Failed to stat the cdrom"
msgstr "No pude montar el cdrom"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "No se utiliza bloqueos para el fichero de bloqueo de slo lectura %s"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "No se pudo abrir el fichero de bloqueo '%s'"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "No se utilizan bloqueos para el fichero de bloqueo de montaje nfs %s"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "No se pudo bloquear %s"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperaba %s pero no estaba all"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "El subproceso %s recibi un fallo de segmentacin."
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "El subproceso %s recibi un fallo de segmentacin."
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "El subproceso %s devolvi un cdigo de error (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "El subproceso %s termin de forma inesperada"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "No pude abrir el fichero %s"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "ledos, todava deba leer %lu pero no queda nada"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "escritos, todava tena que escribir %lu pero no pude hacerlo"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Problemas cerrando el archivo"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "Hay problemas desligando el fichero %s"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "Hay problemas sincronizando el fichero"
@@ -2484,52 +2496,52 @@ msgstr "No se pudo tratar el archivo de paquetes %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "No se pudo tratar el archivo de paquetes %s (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Lnea %lu mal formada en lista de fuentes %s (URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Lnea %lu mal formada en lista de fuentes %s (dist)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Lnea %lu mal formada en lista de fuentes %s (anlisis de URI)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Lnea %lu mal formada en lista de fuentes %s (dist absoluta)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Lnea %lu mal formada en lista de fuentes %s (anlisis de dist)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "Abriendo %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Lnea %u demasiado larga en la lista de fuentes %s."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Lnea %u mal formada en lista de fuentes %s (tipo)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tipo '%s' desconocido en la lnea %u de lista de fuentes %s"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Lnea %u mal formada en la lista de fuentes %s (id del fabricante)"
@@ -2660,18 +2672,18 @@ msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr "Tal vez quiera ejecutar 'apt-get update' para corregir estos problemas"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
"Registro invlido en el archivo de preferencias, no hay cabecera de paquete"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "No se entiende el pin tipo %s"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "No hay prioridad especificada para pin (o es cero)"
@@ -2761,16 +2773,16 @@ msgstr ""
"Al procesar las dependencias de archivos no se encontr el\n"
"paquete %s %s"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "No se puede leer la lista de paquetes fuente %s"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "Recogiendo archivos que proveen"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "Error de E/S guardando cach fuente"
@@ -2779,21 +2791,21 @@ msgstr "Error de E/S guardando cach fuente"
msgid "rename failed, %s (%s -> %s)."
msgstr "fall el cambio de nombre, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "La suma MD5 difiere"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "La suma hash difiere"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"No existe ninguna clave pblica disponible para los siguientes "
"identificadores de clave:\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2803,7 +2815,7 @@ msgstr ""
"que necesita arreglar manualmente este paquete (debido a que falta una "
"arquitectura)"
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2812,7 +2824,7 @@ msgstr ""
"No se pudo localizar un archivo para el paquete %s. Esto puede significar "
"que necesita arreglar manualmente este paquete."
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2820,7 +2832,7 @@ msgstr ""
"Los archivos de ndice de paquetes estn corrompidos. El campo 'Filename:' "
"no existe para para el paquete %s."
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "El tamao difiere"
@@ -2959,7 +2971,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "Abriendo fichero de configuracin %s"
@@ -2970,7 +2981,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:542
#, fuzzy, c-format
-#| msgid "Hash Sum mismatch"
msgid "Hash mismatch for: %s"
msgstr "La suma hash difiere"
@@ -2991,7 +3001,6 @@ msgstr "Eliminando %s"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "Se borr completamente %s"
@@ -3077,14 +3086,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "No pude parchear el fichero"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "La conexin se cerr prematuramente"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "No se pudo acceder al anillo de claves: '%s'"
+
+#~ msgid "Could not patch file"
+#~ msgstr "No pude parchear el fichero"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/eu.po b/po/eu.po
index 79627a72e..40ee7ce9a 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_eu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2009-05-17 00:41+0200\n"
"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
"Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
@@ -150,7 +150,7 @@ msgstr " Bertsio taula:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s %s-rentzat %s %s-ean konpilatua\n"
@@ -303,7 +303,7 @@ msgstr ""
" -c=? Irakurri konfigurazio fitxategi hau\n"
" -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "%s : ezin da idatzi"
@@ -435,8 +435,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "Datu-basea zaharra da; %s bertsio-berritzen saiatzen ari da"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"DB formatu baliogabe da. Apt bertsio zaharrago batetik eguneratu baduzu, "
@@ -453,11 +454,11 @@ msgstr "Ezin da ireki %s datu-base fitxategia: %s"
msgid "Failed to stat %s"
msgstr "Huts egin du %s(e)tik datuak lortzean"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Artxiboak ez du kontrol erregistrorik"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Ezin da kurtsorerik eskuratu"
@@ -522,26 +523,26 @@ msgstr "*** Ezin izan da %s %s(r)ekin estekatu"
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-en mugara (%sB) heldu da.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "Artxiboak ez du pakete eremurik"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s: ez du override sarrerarik\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s mantentzailea %s da, eta ez %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s: ez du jatorri gainidazketa sarrerarik\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s: ez du bitar gainidazketa sarrerarik\n"
@@ -645,7 +646,7 @@ msgstr "Huts egin du %s izenaren ordez %s ipintzean"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "Adierazpen erregularren konpilazio errorea - %s"
@@ -806,11 +807,11 @@ msgstr "Paketeak ezabatu beharra dute baina Ezabatzea ezgaiturik dago."
msgid "Internal error, Ordering didn't finish"
msgstr "Barne errorea, ez da ordenatzeaz amaitu"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "Ezin da deskarga direktorioa blokeatu"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Ezin izan da Iturburu zerrenda irakurri."
@@ -841,8 +842,8 @@ msgstr "Ekintza honen ondoren, %sB gehiago erabiliko dira diskoan.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Ekintza honen ondoren, %sB libratuko dira diskoan.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Ezin da %s(e)n duzun leku librea atzeman."
@@ -879,7 +880,7 @@ msgstr "Abortatu."
msgid "Do you want to continue [Y/n]? "
msgstr "Aurrera jarraitu nahi al duzu [B/e]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ezin da lortu %s %s\n"
@@ -888,7 +889,7 @@ msgstr "Ezin da lortu %s %s\n"
msgid "Some files failed to download"
msgstr "Fitxategi batzuk ezin izan dira deskargatu"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "Deskarga amaituta eta deskarga soileko moduan"
@@ -985,35 +986,35 @@ msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu"
msgid "Selected version %s (%s) for %s\n"
msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Ezin da atzitu %s iturburu paketeen zerrenda"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "Eguneratzeko komandoak ez du argumenturik hartzen"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Ezin da zerrenda direktorioa blokeatu"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Suposatu ez dugun zerbait ezabatuko da, ezin da AutoRemover abiarazi"
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1021,18 +1022,18 @@ msgstr ""
"Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago "
"behar."
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago "
"behar."
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "'apt-get autoremove' erabili ezabatzeko."
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1050,43 +1051,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "Informazio honek arazoa konpontzen lagun dezake:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Barne Errorea, AutoRemover-ek zerbait apurtu du"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "Ezin izan da %s zeregina aurkitu"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "Ezin izan da %s paketea aurkitu"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s eskuz instalatua bezala ezarri.\n"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1094,7 +1095,7 @@ msgstr ""
"Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo "
"zehaztu konponbide bat)."
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1106,117 +1107,117 @@ msgstr ""
"beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n"
"Sarrerakoetan (Incoming) egoten jarraituko dute."
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "Hautsitako paketeak"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "Ondorengo pakete gehigarriak instalatuko dira:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Iradokitako paketeak:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Gomendatutako paketeak:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "Berriketak kalkulatzen... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Huts egin du"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Eginda"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Ez daukazu nahikoa leku libre %s(e)n."
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Iturburu artxiboetako %sB/%sB eskuratu behar dira.\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Iturburu artxiboetako %sB eskuratu behar dira.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "Eskuratu %s iturburua\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "Huts egin du zenbat artxibo lortzean."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Eraikitzeko '%s' komandoak huts egin du.\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "Prozesu umeak huts egin du"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Gutxienez pakete bat zehaztu behar duzu eraikitze mendekotasunak egiaztatzeko"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ezin izan da %s(r)en eraikitze mendekotasunen informazioa eskuratu"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s: ez du eraikitze mendekotasunik.\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1224,7 +1225,7 @@ msgid ""
msgstr ""
"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1233,32 +1234,32 @@ msgstr ""
"%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak "
"betetzen dituen %3$s paketearen bertsio erabilgarririk"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: instalatutako %3$s "
"paketea berriegia da"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: %3$s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s(r)en eraikitze mendekotasunak ezin izan dira bete."
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "Huts egin du eraikitze mendekotasunak prozesatzean"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "Onartutako Moduluak:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1343,7 +1344,7 @@ msgstr ""
"sources.list(5) eta apt.conf(5) orrialdeak eskuliburuan.\n"
" APT honek Super Behiaren Ahalmenak ditu.\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1590,11 +1591,10 @@ msgstr "%s/%s fitxategiak %s paketekoa gainidazten du"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "Ezin da %s irakurri"
@@ -1624,9 +1624,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "info eta temp direktorioek fitxategi sistema berean egon behar dute"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "Pakete Zerrenda irakurtzen"
@@ -1762,11 +1762,11 @@ msgid "File not found"
msgstr "Ez da fitxategia aurkitu"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "Huts egin du atzitzean"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "Huts egin du aldaketa ordua ezartzean"
@@ -1830,7 +1830,7 @@ msgstr "Konexioa denboraz kanpo"
msgid "Server closed the connection"
msgstr "Zerbitzariak konexioa itxi du"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Irakurketa errorea"
@@ -1842,7 +1842,7 @@ msgstr "Erantzun batek bufferrari gainez eragin dio."
msgid "Protocol corruption"
msgstr "Protokolo hondatzea"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Idazketa errorea"
@@ -1897,7 +1897,7 @@ msgstr "Datu-socket konexioak denbora muga gainditu du"
msgid "Unable to accept connection"
msgstr "Ezin da konexioa onartu"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Arazoa fitxategiaren hash egitean"
@@ -1962,58 +1962,63 @@ msgstr "Ezin izan da konektatu -> %s:%s (%s)"
msgid "Connecting to %s"
msgstr "Konektatzen -> %s..."
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "Ezin izan da '%s' ebatzi"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Aldi baterako akatsa '%s' ebaztean"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Ezin da konektatu -> %s %s:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "Ezin da eraztuna ebatzi: '%s'"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Abortatu instalazioa."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "E: Acquire::gpgv::Options argumentu zerrenda luzeegia. Uzten."
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "Barne errorea: Sinadura zuzena, baina ezin da egiaztapen marka zehaztu"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "Beintza sinadura baliogabe bat aurkitu da."
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr "Ezin da %s abiarazi sinadura egiaztatzeko (gpgv instalaturik al dago?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "Errore ezezaguna gpgv exekutatzean"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "Ondorengo sinadurak baliogabeak dira:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2064,47 +2069,47 @@ msgstr "http zerbitzariak barruti onarpena apurturik du"
msgid "Unknown date format"
msgstr "Datu formatu ezezaguna"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "Hautapenak huts egin du"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "Konexioaren denbora muga gainditu da"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "Errorea irteerako fitxategian idaztean"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "Errorea fitxategian idaztean"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "Errorea fitxategian idaztean"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "Errorea zerbitzaritik irakurtzean"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr "Huts fitxategia mozterakoan"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "Goiburu data gaizki dago"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "Konexioak huts egin du"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Barne errorea"
@@ -2112,12 +2117,12 @@ msgstr "Barne errorea"
msgid "Can't mmap an empty file"
msgstr "Ezin da fitxategi huts baten mmap egin"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Ezin izan da %lu byteren mmap egin"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2126,6 +2131,13 @@ msgstr ""
"MMAP dinamikoa memoriaz kanpo. Mesedez handitu APT::Cache-Limit muga. Uneko "
"balioa: %lu. (man 5 apt.conf)"
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2155,52 +2167,52 @@ msgstr ""
msgid "Selection %s not found"
msgstr "%s hautapena ez da aurkitu"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Mota ezezaguneko laburtzapena: '%c'"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "%s konfigurazio fitxategia irekitzen"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Sintaxi errorea, %s:%u: Blokearen hasieran ez dago izenik."
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Sintaxi errorea %s:%u: Gaizki eratutako"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Sintaxi errorea, %s:%u: Zabor gehigarria balioaren ondoren"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "Sintaxi errorea, %s:%u: Direktibak goi-mailan bakarrik egin daitezke"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Sintaxi errorea, %s:%u: habiaratutako elementu gehiegi"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Sintaxi errorea, %s:%u: hemendik barne hartuta"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Sintaxi errorea, %s:%u: onartu gabeko '%s' direktiba"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Sintaxi errorea, %s:%u: Zabor gehigarria fitxategi amaieran"
@@ -2277,78 +2289,78 @@ msgstr "Ezin da %s(e)ra aldatu"
msgid "Failed to stat the cdrom"
msgstr "Huts egin du CDROMa atzitzean"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr ""
"Ez da blokeorik erabiltzen ari irakurtzeko soilik den %s blokeo "
"fitxategiarentzat"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "Ezin izan da %s blokeo fitxategia ireki"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr ""
"Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo fitxategiarentzat"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "Ezin izan da %s blokeoa hartu"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s espero zen baina ez zegoen han"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du."
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du."
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "%s azpiprozesuak errore kode bat itzuli du (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "%s azpiprozesua ustekabean amaitu da"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "%s fitxategia ezin izan da ireki"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "irakurrita; oraindik %lu irakurtzeke, baina ez da ezer geratzen"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "idatzita; oraindik %lu idazteke, baina ezin da"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Arazoa fitxategia ixtean"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "Arazoa fitxategia desestekatzean"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "Arazoa fitxategia sinkronizatzean"
@@ -2465,52 +2477,52 @@ msgstr "Ezin da %s pakete fitxategia analizatu (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Ezin da %s pakete fitxategia analizatu (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Gaizkieratutako %lu lerroa %s iturburu zerrendan (banaketa orokorra)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "%s irekitzen"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "%2$s iturburu zerrendako %1$u lerroa luzeegia da."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (hornitzaile id-a)"
@@ -2636,17 +2648,17 @@ msgstr "Pakete zerrenda edo egoera fitxategia ezin dira analizatu edo ireki."
msgid "You may want to run apt-get update to correct these problems"
msgstr "Beharbada 'apt-get update' exekutatu nahiko duzu arazoak konpontzeko"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Erregistro baliogabea hobespenen fitxategian, pakete goibururik ez"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "Ez da ulertu %s orratz-mota (pin)"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "Ez da lehentasunik zehaztu orratzarentzat (pin) (edo zero da)"
@@ -2730,16 +2742,16 @@ msgstr "Errorea gertatu da %s prozesatzean (CollectFileProvides)"
msgid "Package %s %s was not found while processing file dependencies"
msgstr "%s %s paketea ez da aurkitu fitxategi mendekotasunak prozesatzean"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Ezin da atzitu %s iturburu paketeen zerrenda"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "Fitxategiaren erreferentziak biltzen"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "S/I errorea iturburu katxea gordetzean"
@@ -2748,19 +2760,19 @@ msgstr "S/I errorea iturburu katxea gordetzean"
msgid "rename failed, %s (%s -> %s)."
msgstr "huts egin du izen-aldaketak, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "MD5Sum ez dator bat"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "Egiaztapena ez dator bat"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr "Ez dago gako publiko erabilgarririk hurrengo gako ID hauentzat:\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2769,7 +2781,7 @@ msgstr ""
"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
"beharko duzu paketea. (arkitektura falta delako)"
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2778,7 +2790,7 @@ msgstr ""
"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
"beharko duzu paketea."
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2786,7 +2798,7 @@ msgstr ""
"Paketearen indize fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
"paketearentzat."
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "Tamaina ez dator bat"
@@ -2922,7 +2934,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "%s konfigurazio fitxategia irekitzen"
@@ -2933,7 +2944,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:542
#, fuzzy, c-format
-#| msgid "Hash Sum mismatch"
msgid "Hash mismatch for: %s"
msgstr "Egiaztapena ez dator bat"
@@ -2954,7 +2964,6 @@ msgstr "%s kentzen"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "%s guztiz ezabatu da"
@@ -3040,14 +3049,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Ezin izan zaio fitxategiari adabakia ezarri"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Konexioa behar baino lehenago itxi da"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Ezin da eraztuna ebatzi: '%s'"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Ezin izan zaio fitxategiari adabakia ezarri"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/fi.po b/po/fi.po
index 06faec09a..c345a749e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2008-12-11 14:52+0200\n"
"Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -148,7 +148,7 @@ msgstr " Versiotaulukko:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s laitealustalle %s käännöksen päiväys %s %s\n"
@@ -300,7 +300,7 @@ msgstr ""
" -c=? Lue tämä asetustiedosto\n"
" -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
@@ -436,8 +436,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "Tietokanta on vanha, yritetään päivittää %s"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"Tietokannan muoto ei kelpaa. Jos tehtiin päivitys vanhasta apt:n versiosta, "
@@ -454,11 +455,11 @@ msgstr "Tietokantatiedostoa %s ei saatu avattua: %s"
msgid "Failed to stat %s"
msgstr "Tiedostolle %s ei toimi stat"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Arkistolla ei ole ohjaustietuetta"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Kohdistinta ei saada"
@@ -523,26 +524,26 @@ msgstr "*** Linkin %s -> %s luonti ei onnistunut"
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLinkin yläraja %st saavutettu.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "Arkistossa ei ollut pakettikenttää"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s:llä ei ole poikkeustietuetta\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s ylläpitäjä on %s eikä %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s:llä ei ole poikkeustietuetta\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s:llä ei ole binääristäkään poikkeustietuetta\n"
@@ -646,7 +647,7 @@ msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
msgid "Y"
msgstr "K"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "Käännösvirhe lausekkeessa - %s"
@@ -807,11 +808,11 @@ msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä."
msgid "Internal error, Ordering didn't finish"
msgstr "Tapahtui sisäinen virhe, järjestäminen keskeytyi"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "Noutokansiota ei saatu lukittua"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Lähteiden luetteloa ei pystynyt lukemaan."
@@ -841,8 +842,8 @@ msgstr "Toiminnon jälkeen käytetään %s t lisää levytilaa.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Toiminnon jälkeen vapautuu %s t levytilaa.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kansion %s vapaan tilan määrä ei selvinnyt"
@@ -880,7 +881,7 @@ msgstr "Keskeytä."
msgid "Do you want to continue [Y/n]? "
msgstr "Haluatko jatkaa [K/e]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Tiedoston %s nouto ei onnistunut %s\n"
@@ -889,7 +890,7 @@ msgstr "Tiedoston %s nouto ei onnistunut %s\n"
msgid "Some files failed to download"
msgstr "Joidenkin tiedostojen nouto ei onnistunut"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "Nouto on valmis ja määrätty vain nouto"
@@ -986,36 +987,36 @@ msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt"
msgid "Selected version %s (%s) for %s\n"
msgstr "Valittiin versio %s (%s) paketille %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "stat ei toiminut lähdepakettiluettelolle %s"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "Komento update ei käytä parametreja"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Luettelokansiota ei voitu lukita"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"On tarkoitus olla poistamatta mitään, joten AutoRemover:ia ei voi käynnistää"
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1023,18 +1024,18 @@ msgstr ""
"Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
"vaadittuja:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
"vaadittuja:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Poista ne komennolla \"apt-get autoremove\"."
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1052,43 +1053,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Sisäinen virhe, AutoRemover rikkoi jotain"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "Tehtävää %s ei löytynyt"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "Pakettia %s ei löytynyt"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1096,7 +1097,7 @@ msgstr ""
"Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" "
"ilmanpaketteja (tai ratkaise itse)."
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1107,116 +1108,116 @@ msgstr ""
"jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n"
"vielä luotu tai siirretty Incoming-kansiosta."
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "Rikkinäiset paketit"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Ehdotetut paketit:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Suositellut paketit:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "Käsitellään päivitystä ... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Ei onnistunut"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Valmis"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "Sisäinen virhe, resolver rikkoi jotain"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Paketin %s lähdekoodipakettia ei löytynyt"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "On noudettava %st lähdekoodiarkistoja.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "Nouda lähdekoodi %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "Joidenkin arkistojen noutaminen ei onnistunut."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Purkukomento \"%s\" ei onnistunut.\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Paketointikomento \"%s\" ei onnistunut.\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "Lapsiprosessi kaatui"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Paketille %s ei ole saatavilla riippuvuustietoja"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1224,7 +1225,7 @@ msgid ""
msgstr ""
"riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1233,32 +1234,32 @@ msgstr ""
"%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio "
"ei vastaa versioriippuvuuksia"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Riippuvutta %s paketille %s ei voi tyydyttää: Asennettu paketti %s on liian "
"uusi"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää."
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "Tuetut moduulit:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1342,7 +1343,7 @@ msgstr ""
"lisätietoja ja lisää valitsimia.\n"
" This APT has Super Cow Powers.\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1590,11 +1591,10 @@ msgstr "Tiedosto %s/%s kirjoitetaan paketista %s tulleen päälle"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "Tiedostoa %s ei voi lukea"
@@ -1624,9 +1624,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Kansioiden info ja temp pitää olla samassa tiedostojärjestelmässä"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "Luetaan pakettiluetteloita"
@@ -1762,11 +1762,11 @@ msgid "File not found"
msgstr "Tiedostoa ei löydy"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "Komento stat ei toiminut"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua"
@@ -1828,7 +1828,7 @@ msgstr "Yhteys aikakatkaistiin"
msgid "Server closed the connection"
msgstr "Palvelin sulki yhteyden"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Lukuvirhe"
@@ -1840,7 +1840,7 @@ msgstr "Vastaus aiheutti puskurin ylivuodon."
msgid "Protocol corruption"
msgstr "Yhteyskäytäntö on turmeltunut"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Virhe kirjoitettaessa"
@@ -1894,7 +1894,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin"
msgid "Unable to accept connection"
msgstr "Yhteyttä ei voitu hyväksyä"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Pulmia tiedoston hajautuksessa"
@@ -1958,61 +1958,66 @@ msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s)"
msgid "Connecting to %s"
msgstr "Avataan yhteys %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nimeä \"%s\" ei voitu selvittää"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Tilapäinen häiriö selvitettäessä \"%s\""
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Ei ole mahdollista muodostaa yhteyttä %s %s:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "Avainrengasta \"%s\" ei saatavilla"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Asennus keskeytetään."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"E: Parametrien luettelo Acquire::gpgv::Options liian pitkä. Lopetetaan."
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Sisäinen virhe: Allekirjoitus kelpaa, mutta avaimen sormenjälki tuntematon?!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "LÖytyi ainakin yksi kelvoton allekirjoitus."
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Ei käynnistynyt \"%s\" allekirjoitusta tarkistamaan (onko gpgv asennettu?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "Tapahtui tuntematon virhe suoritettaessa gpgv"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "Seuraavat allekirjoitukset eivät olleet kelvollisia:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2063,47 +2068,47 @@ msgstr "HTTP-palvelimen arvoaluetuki on rikki"
msgid "Unknown date format"
msgstr "Tuntematon päiväysmuoto"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "Select ei toiminut"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "Yhteys aikakatkaistiin"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "Tapahtui virhe luettaessa palvelimelta"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr "Tiedoston typistäminen ei onnistunut"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "Virheellinen otsikkotieto"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "Yhteys ei toiminut"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Sisäinen virhe"
@@ -2111,18 +2116,25 @@ msgstr "Sisäinen virhe"
msgid "Can't mmap an empty file"
msgstr "Tyhjälle tiedostolle ei voi tehdä mmap:ia"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Ei voitu tehdä %lu tavun mmap:ia"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2152,52 +2164,52 @@ msgstr ""
msgid "Selection %s not found"
msgstr "Valintaa %s ei löydy"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Tuntematon tyypin lyhenne: \"%c\""
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "Avataan asetustiedosto %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Syntaksivirhe %s: %u: Lohko alkaa ilman nimeä."
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntaksivirhe %s: %u: väärän muotoinen nimikenttä"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Syntaksivirhe %s: %u: Arvon jälkeen ylimääräistä roskaa"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "Syntaksivirhe %s: %u: Direktiivejä voi olla vain ylimmällä tasolla"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Syntaksivirhe %s: %u: Liian monta sisäkkäistä includea"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntaksivirhe %s: %u: Sisällytetty tästä"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Syntaksivirhe %s: %u: Tätä direktiiviä ei tueta \"%s\""
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaksivirhe %s: %u: Ylimääräistä roskaa tiedoston lopussa"
@@ -2273,75 +2285,75 @@ msgstr "Kansioon %s vaihto ei onnistu"
msgid "Failed to stat the cdrom"
msgstr "Komento stat ei toiminut rompulle"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "Lukkoa ei käytetä kirjoitussuojatulle tiedostolle %s"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "Lukkotiedostoa %s ei voitu avata"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "Lukitusta ei käytetä NFS-liitetylle tiedostolle %s"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "Lukkoa %s ei saada"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Odotettiin %s, mutta sitä ei ollut"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Aliprosessi %s aiheutti suojausvirheen."
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "Aliprosessi %s aiheutti suojausvirheen."
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Aliprosessi %s palautti virhekoodin (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Aliprosessi %s lopetti odottamatta"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "Tiedostoa %s ei voitu avata"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "read, vielä %lu lukematta mutta tiedosto loppui"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "write, vielä %lu kirjoittamatta mutta epäonnistui"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Pulmia tiedoston sulkemisessa"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "Pulmia tehtäessä tiedostolle unlink"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "Pulmia tehtäessä tiedostolle sync"
@@ -2458,52 +2470,52 @@ msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
msgid "Unable to parse package file %s (2)"
msgstr "Pakettitiedostoa %s (2) ei voi jäsentää"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (Absoluuttinen dist)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "Avataan %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Rivi %u on liian pitkä lähdeluettelossa %s."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Rivi %u on väärän muotoinen lähdeluettelossa%s (toimittajan tunniste)"
@@ -2628,17 +2640,17 @@ msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr "Voit haluta suorittaa apt-get update näiden pulmien korjaamiseksi"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Asetustiedostossa on virheellinen tietue, Package-otsikko puuttuu"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "Tunnistetyyppi %s on tuntematon"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "Tärkeysjärjestystä ei määritetty tunnisteelle (tai se on nolla)"
@@ -2723,16 +2735,16 @@ msgstr "Tapahtui virhe käsiteltäessä %s (CollectFileProvides)"
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Pakettia %s %s ei löytynyt käsiteltäessä tiedostojen riippuvuuksia."
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "stat ei toiminut lähdepakettiluettelolle %s"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "Kootaan tiedostojen tarjoamistietoja"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa"
@@ -2741,19 +2753,19 @@ msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa"
msgid "rename failed, %s (%s -> %s)."
msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "MD5Sum ei täsmää"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "Hash Sum täsmää"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr "Julkisia avaimia ei ole saatavilla, avainten ID:t ovat:\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2762,7 +2774,7 @@ msgstr ""
"En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan "
"tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)"
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2771,7 +2783,7 @@ msgstr ""
"Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan "
"tämän paketin itse."
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2779,7 +2791,7 @@ msgstr ""
"Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-"
"kenttää."
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "Koko ei täsmää"
@@ -2916,7 +2928,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "Avataan asetustiedosto %s"
@@ -2927,7 +2938,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:542
#, fuzzy, c-format
-#| msgid "Hash Sum mismatch"
msgid "Hash mismatch for: %s"
msgstr "Hash Sum täsmää"
@@ -2948,7 +2958,6 @@ msgstr "Poistetaan %s"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "%s poistettiin kokonaan"
@@ -3034,14 +3043,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Tiedostoa %s ei voitu avata"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Yhteys katkesi ennenaikaisesti"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Avainrengasta \"%s\" ei saatavilla"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Tiedostoa %s ei voitu avata"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/gl.po b/po/gl.po
index c382d3ae9..a8be68b13 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_gl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2008-12-17 22:44+0100\n"
"Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n"
"Language-Team: galician <proxecto@trasno.net>\n"
@@ -151,7 +151,7 @@ msgstr " Táboa de versións:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s para %s compilado o %s %s\n"
@@ -308,7 +308,7 @@ msgstr ""
" -o=? Establece unha opción de configuración, por exemplo: -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "Non se puido escribir en %s"
@@ -447,8 +447,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "A base de datos é antiga, trátase de actualizar %s"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"O formato da base de datos non é válido. Se actualizou desde unha versión "
@@ -465,11 +466,11 @@ msgstr "Non se puido abrir o ficheiro de base de datos %s: %s"
msgid "Failed to stat %s"
msgstr "Non se atopou %s"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "O arquivo non ten un rexistro de control"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Non se puido obter un cursor"
@@ -534,26 +535,26 @@ msgstr "*** Non se puido ligar %s con %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Alcanzouse o límite de desligado de %sB.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "O arquivo non tiña un campo Package"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s non ten unha entrada de \"override\"\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " O mantedor de %s é %s, non %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s non ten unha entrada de \"override\" de código fonte\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s tampouco ten unha entrada de \"override\" de binarios\n"
@@ -657,7 +658,7 @@ msgstr "Non se puido cambiar o nome de %s a %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro na compilación da expresión regular - %s"
@@ -818,11 +819,11 @@ msgstr "Hai que eliminar paquetes pero a eliminación está desactivada."
msgid "Internal error, Ordering didn't finish"
msgstr "Erro interno, a ordeación non rematou"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "Non se puido bloquear o directorio de descargas"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Non se puido ler a lista de orixes."
@@ -852,8 +853,8 @@ msgstr "Despois desta operación hanse ocupar %sB de disco adicionais.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Despois desta operación hanse liberar %sB de disco.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Non se puido determinar o espazo libre en %s"
@@ -890,7 +891,7 @@ msgstr "Abortar."
msgid "Do you want to continue [Y/n]? "
msgstr "¿Quere continuar [S/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Non se puido obter %s %s\n"
@@ -899,7 +900,7 @@ msgstr "Non se puido obter %s %s\n"
msgid "Some files failed to download"
msgstr "Non se puido descargar algúns ficheiros"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "Completouse a descarga no modo de só descargas"
@@ -998,54 +999,54 @@ msgstr "Non se atopou a versión \"%s\" de \"%s\""
msgid "Selected version %s (%s) for %s\n"
msgstr "Escolleuse a versión %s (%s) de %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Non se atopou a lista de paquetes fonte %s"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "A orde \"update\" non toma argumentos"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Non se puido bloquear o directorio de listas"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"Non se supón que se deban eliminar cousas; non se pode iniciar o "
"autoeliminador"
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr ""
"Os seguintes paquetes instaláronse automaticamente e xa non son necesarios:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"Os seguintes paquetes instaláronse automaticamente e xa non son necesarios:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Empregue \"apt-get autoremove\" para eliminalos."
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1063,43 +1064,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "A seguinte información pode axudar a resolver a situación:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Erro interno, o autoeliminador rompeu cousas"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Erro interno, AllUpgrade rompeu cousas"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "Non se puido atopar a tarefa %s"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "Non se puido atopar o paquete %s"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, escóllese %s para a expresión regular \"%s\"\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s cambiouse a instalado manualmente.\n"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Pode querer executar \"apt-get -f install\" corrixir isto:"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1107,7 +1108,7 @@ msgstr ""
"Dependencias incumpridas. Probe \"apt-get -f install\" sen paquetes (ou "
"especifique unha solución)."
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1118,118 +1119,118 @@ msgstr ""
"unha situación imposible ou, se emprega a distribución inestable, que\n"
"algúns paquetes solicitados aínda non se crearon ou moveron de Incoming."
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "Paquetes rotos"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "Hanse instalar os seguintes paquetes extra:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Paquetes suxiridos:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Paquetes recomendados:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "A calcular a actualización... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Fallou"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Rematado"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "Erro interno, o resolvedor interno rompeu cousas"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Ten que especificar alomenos un paquete para lle descargar o código fonte"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Non se puido atopar un paquete fonte para %s"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Omítese o ficheiro xa descargado \"%s\"\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Non hai espazo libre de abondo en %s"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Hai que recibir %sB/%sB de arquivos de fonte.\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Hai que recibir %sB de arquivos de fonte.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter fonte %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "Non se puido recibir algúns arquivos."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Omítese o desempaquetamento do código fonte xa desempaquetado en %s\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Fallou a orde de desempaquetamento \"%s\".\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Comprobe que o paquete \"dpkg-dev\" estea instalado.\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Fallou a codificación de %s.\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "O proceso fillo fallou"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Ten que especificar alomenos un paquete para lle comprobar as dependencias "
"de compilación"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Non se puido obter a información de dependencias de compilación de %s"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s non ten dependencias de compilación.\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1238,7 +1239,7 @@ msgstr ""
"A dependencia \"%s\" de %s non se pode satisfacer porque non se pode atopar "
"o paquete %s"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1247,32 +1248,32 @@ msgstr ""
"A dependencia \"%s\" de %s non se pode satisfacer porque ningunha versión "
"dispoñible do paquete %s satisfai os requirimentos de versión"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Non se puido satisfacer a dependencia \"%s\" de %s: O paquete instalado %s é "
"novo de máis"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Non se puido satisfacer a dependencia \"%s\" de %s: %s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Non se puideron satisfacer as dependencias de compilación de %s."
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "Non se puido procesar as dependencias de compilación"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "Módulos soportados:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1360,7 +1361,7 @@ msgstr ""
"máis información e opcións.\n"
" Este APT ten Poderes de Supervaca.\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1607,11 +1608,10 @@ msgstr "O ficheiro %s/%s sobrescribe o do paquete %s"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "Non se pode ler %s"
@@ -1642,9 +1642,9 @@ msgstr ""
"Os directorios info e temp teñen que estar no mesmo sistema de ficheiros"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "A ler as listas de paquetes"
@@ -1778,11 +1778,11 @@ msgid "File not found"
msgstr "Non se atopou o ficheiro"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "Non se atopou"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "Non se puido estabrecer a hora de modificación"
@@ -1844,7 +1844,7 @@ msgstr "Tempo esgotado para a conexión"
msgid "Server closed the connection"
msgstr "O servidor pechou a conexión"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Erro de lectura"
@@ -1856,7 +1856,7 @@ msgstr "Unha resposta desbordou o buffer."
msgid "Protocol corruption"
msgstr "Corrupción do protocolo"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Erro de escritura"
@@ -1911,7 +1911,7 @@ msgstr "A conexión do socket de datos esgotou o tempo"
msgid "Unable to accept connection"
msgstr "Non se pode aceptar a conexión"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema ao calcular o hash do ficheiro"
@@ -1975,63 +1975,68 @@ msgstr "Non se puido conectar a %s:%s (%s)."
msgid "Connecting to %s"
msgstr "A conectar a %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "Non se puido resolver \"%s\""
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Fallo temporal ao resolver \"%s\""
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Algo estraño ocorreu ao resolver \"%s:%s\" (%i)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Non se pode conectar a %s %s:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "Non se puido acceder ao chaveiro: \"%s\""
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "A abortar a instalación."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"E: A lista de argumentos de Acquire:gpgv::Options é longa de máis. Sáese."
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Erro interno: Sinatura correcta, pero non se puido determinar a pegada "
"dixital da chave"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "Atopouse alomenos unha sinatura non válida."
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Non se puido executar \"%s\" para verificar a sinatura (¿está gpgv "
"instalado?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "Erro descoñecido ao executar gpgv"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "As seguintes sinaturas non eran válidas:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2082,47 +2087,47 @@ msgstr "Este servidor HTTP ten un soporte de rangos roto"
msgid "Unknown date format"
msgstr "Formato de data descoñecido"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "Fallou a chamada a select"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "A conexión esgotou o tempo"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "Erro ao escribir no ficheiro de saída"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "Erro ao escribir nun ficheiro"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "Erro ao escribir no ficheiro"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "Erro ao ler do servidor. O extremo remoto pechou a conexión"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "Erro ao ler do servidor"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr "Non se puido truncar o ficheiro"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "Datos da cabeceira incorrectos"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "A conexión fallou"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Erro interno"
@@ -2130,18 +2135,25 @@ msgstr "Erro interno"
msgid "Can't mmap an empty file"
msgstr "Non se pode facer mmap sobre un ficheiro baleiro"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Non se puido facer mmap de %lu bytes"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2171,52 +2183,52 @@ msgstr ""
msgid "Selection %s not found"
msgstr "Non se atopou a selección %s"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Abreviatura de tipo \"%c\" descoñecida"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "A abrir o ficheiro de configuración %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Erro de sintaxe %s:%u: O bloque comeza sen un nome."
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Erro de sintaxe %s:%u: Etiqueta mal formada"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Erro de sintaxe %s:%u: Lixo extra despois do valor"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "Erro de sintaxe %s:%u: Só se poden facer directivas no nivel superior"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Erro de sintaxe %s:%u: Includes aniñados de máis"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Erro de sintaxe %s:%u: Incluído de aquí"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Erro de sintaxe %s:%u: Non se soporta a directiva \"%s\""
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Erro de sintaxe %s:%u: Lixo extra á fin da liña"
@@ -2293,75 +2305,75 @@ msgstr "Non se pode cambiar a %s"
msgid "Failed to stat the cdrom"
msgstr "Non se puido analizar o CD-ROM"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "Non se empregan bloqueos para o ficheiro de bloqueo de só lectura %s"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "Non se puido abrir o ficheiro de bloqueo %s"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "Non se empregan bloqueos para o ficheiro de bloqueo montado por NFS %s"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "Non se puido obter o bloqueo %s"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Agardouse por %s pero non estaba alí"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "O subproceso %s recibiu un fallo de segmento."
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "O subproceso %s recibiu un fallo de segmento."
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "O subproceso %s devolveu un código de erro (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "O subproceso %s saíu de xeito inesperado"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "Non se puido abrir o ficheiro %s"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "lectura, aínda hai %lu para ler pero non queda ningún"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "escritura, aínda hai %lu para escribir pero non se puido"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Problema ao pechar o ficheiro"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "Problema ao borrar o ficheiro"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "Problema ao sincronizar o ficheiro"
@@ -2478,52 +2490,52 @@ msgstr "Non se pode analizar o ficheiro de paquetes %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Non se pode analizar o ficheiro de paquetes %s (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Liña %lu mal formada na lista de fontes %s (URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Liña %lu mal formada na lista de fontes %s (dist)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Liña %lu mal formada na lista de fontes %s (análise de URI)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Liña %lu mal formada na lista de fontes %s (dist absoluta)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Liña %lu mal formada na lista de fontes %s (análise de dist)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "A abrir %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Liña %u longa de máis na lista de fontes %s."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Liña %u mal formada na lista de fontes %s (tipo)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "O tipo \"%s\" non se coñece na liña %u da lista de fontes %s"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Liña %u mal formada na lista de fontes %s (id de provedor)"
@@ -2649,19 +2661,19 @@ msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr "Pode querer executar apt-get update para corrixir estes problemas"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
"Rexistro non válido no ficheiro de preferencias, non hai unha cabeceira "
"Package"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "Non se entendeu o tipo de inmobilización %s"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr ""
"Non se indicou unha prioridade (ou indicouse cero) para a inmobilización"
@@ -2746,16 +2758,16 @@ msgstr "Ocorreu un erro ao procesar %s (CollectFileProvides)"
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Non se atopou o paquete %s %s ao procesar as dependencias de ficheiros"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Non se atopou a lista de paquetes fonte %s"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "A recoller as provisións de ficheiros"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "Erro de E/S ao gravar a caché de fontes"
@@ -2764,20 +2776,20 @@ msgstr "Erro de E/S ao gravar a caché de fontes"
msgid "rename failed, %s (%s -> %s)."
msgstr "fallou o cambio de nome, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "Os MD5Sum non coinciden"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "Os \"hashes\" non coinciden"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Non hai unha clave pública dispoñible para os seguintes IDs de clave:\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2786,7 +2798,7 @@ msgstr ""
"Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que "
"ten que arranxar este paquete a man. (Falla a arquitectura)"
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2795,7 +2807,7 @@ msgstr ""
"Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que "
"ten que arranxar este paquete a man."
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2803,7 +2815,7 @@ msgstr ""
"Os ficheiros de índices de paquetes están corrompidos. Non hai un campo "
"Filename: para o paquete %s."
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "Os tamaños non coinciden"
@@ -2940,7 +2952,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "A abrir o ficheiro de configuración %s"
@@ -2951,7 +2962,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:542
#, fuzzy, c-format
-#| msgid "Hash Sum mismatch"
msgid "Hash mismatch for: %s"
msgstr "Os \"hashes\" non coinciden"
@@ -2972,7 +2982,6 @@ msgstr "A eliminar %s"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "Eliminouse %s completamente"
@@ -3058,14 +3067,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Non se puido parchear o ficheiro"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "A conexión pechouse prematuramente"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Non se puido acceder ao chaveiro: \"%s\""
+
+#~ msgid "Could not patch file"
+#~ msgstr "Non se puido parchear o ficheiro"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/hu.po b/po/hu.po
index 54a8814fe..95a845819 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: hu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2008-05-11 14:49+0100\n"
"Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
"Language-Team: Hungarian <debian-l10n-hungarian>\n"
@@ -151,7 +151,7 @@ msgstr " Verziótáblázat:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s erre: %s ekkor fordult: %s %s\n"
@@ -305,7 +305,7 @@ msgstr ""
" -c=? Ezt a konfigurációs fájlt olvassa be\n"
" -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "Nem lehet írni ebbe: %s"
@@ -440,8 +440,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "DB régi, megkísérlem frissíteni erre: %s"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"DB formátum érvénytelen. Ha az apt régebbi változatáról frissítettél, töröld "
@@ -458,11 +459,11 @@ msgstr "A(z) %s DB fájlt nem lehet megnyitni: %s"
msgid "Failed to stat %s"
msgstr "%s elérése sikertelen"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Az archívumnak nincs vezérlő rekordja"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Nem sikerült egy mutatóhoz jutni"
@@ -527,26 +528,26 @@ msgstr "*** %s linkelése ehhez: %s sikertelen"
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink elérte %sB korlátját.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "Az archívumnak nem volt csomag mezője"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nem rendelkezik felülbíráló bejegyzéssel\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s karbantartója %s, nem %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nem rendelkezik forrás felülbíráló bejegyzéssel\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nem rendelkezik bináris felülbíráló bejegyzéssel sem\n"
@@ -650,7 +651,7 @@ msgstr "Nem sikerült átnevezni %s-t erre: %s"
msgid "Y"
msgstr "I"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex fordítási hiba - %s"
@@ -811,11 +812,11 @@ msgstr "Csomagokat kellene eltávolítani, de az Eltávolítás nem engedélyeze
msgid "Internal error, Ordering didn't finish"
msgstr "Belső hiba, a rendezés nem zárult"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "Nem tudom zárolni a letöltési könyvtárat"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "A források listája olvashatatlan."
@@ -844,8 +845,8 @@ msgstr "E művelet után további %sB lemez-területetet használok fel.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "E művelet után %sB lemez-terület szabadul fel.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nem határozható meg a szabad hely itt: %s"
@@ -882,7 +883,7 @@ msgstr "Megszakítva."
msgid "Do you want to continue [Y/n]? "
msgstr "Folytatni akarod [Y/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Sikertelen letöltés: %s %s\n"
@@ -891,7 +892,7 @@ msgstr "Sikertelen letöltés: %s %s\n"
msgid "Some files failed to download"
msgstr "Néhány fájlt nem sikerült letölteni"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "A letöltés befejeződött a 'csak letöltés' módban"
@@ -987,50 +988,50 @@ msgstr "'%s' verzió ehhez: '%s' nem található"
msgid "Selected version %s (%s) for %s\n"
msgstr "%s (%s) a kiválasztott verzió ehhez: %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "Az update parancsnak nincsenek argumentumai"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Nem tudom a listakönyvtárat zárolni"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Nincs törölnivaló, az AutoRemover nem indítható"
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Az alábbi csomagok automatikusan települtek, de már nem kellenek:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "Az alábbi csomagok automatikusan települtek, de már nem kellenek:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Töröld az 'apt-get autoremove' paranccsal!"
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1048,43 +1049,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "Az alábbi információ segíthet megoldani a helyzetet:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Belső hiba, az AutoRemover sérült"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Belső hiba, AllUpgrade megsértett valamit"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "Hiányzó %s feladat"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "Az alábbi csomag nem található: %s"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Megjegyzés: %s kiválasztása %s reguláris kifejezéshez\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s kézi telepítésre állított.\n"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Próbáld futtatni az 'apt-get -f install'-t az alábbiak javításához:"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1092,7 +1093,7 @@ msgstr ""
"Teljesítetlen függőségek. Próbáld az 'apt-get -f install'-t csomagok nélkül "
"(vagy telepítsd a függőségeket is!)."
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1104,118 +1105,118 @@ msgstr ""
"használod, akkor néhány igényelt csomag még nem készült el vagy ki\n"
"lett mozdítva az Incoming-ból."
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "Törött csomagok"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "Az alábbi extra csomagok kerülnek telepítésre:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Javasolt csomagok:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Ajánlott csomagok:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "Frissítés kiszámítása... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Sikertelen"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Kész"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "Belső hiba, hibafeloldó gond"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Legalább egy csomagot meg kell adnod, aminek a forrását le kell tölteni"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nem található forráscsomag ehhez: %s"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "A már letöltött '%s' fájl kihagyása\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nincs elég szabad hely itt: %s"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%sB/%sB forrás-archívumot kell letölteni.\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB forrás-archívumot kell letölteni.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "Forrás letöltése: %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "Nem sikerült néhány archívumot letölteni."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "'%s' kibontási parancs nem sikerült.\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Ellenőrizd, hogy a 'dpkg-dev' csomag telepítve van-e.\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "'%s' elkészítési parancs nem sikerült.\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "Hiba a gyermekfolyamatnál"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Legalább egy csomagot adj meg, aminek a fordítási függőségeit ellenőrizni "
"kell"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nem lehet %s fordítási-függőség információját beszerezni"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "Nincs fordítási függősége a következőnek: %s.\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1224,7 +1225,7 @@ msgstr ""
"%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomag nem "
"található"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1233,32 +1234,32 @@ msgstr ""
"%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomagnak nincs a "
"verzió-követelményt kielégítő elérhető verziója."
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%s függőséget %s csomaghoz nem lehet kielégíteni: %s telepített csomag túl "
"friss."
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%s függőséget %s csomaghoz nem lehet kielégíteni: %s "
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s építési függőségei nem elégíthetőek ki."
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "Nem sikerült az építési függőségeket feldolgozni"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "Támogatott modulok:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1343,7 +1344,7 @@ msgstr ""
"további információkért és opciókért.\n"
" Ez az APT a SzuperTehén Hatalmával rendelkezik.\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1588,11 +1589,10 @@ msgstr "A(z) %s/%s fájl felülírja a(z) %s csomagban levőt"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "%s nem olvasható"
@@ -1622,9 +1622,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Az info és temp könyvtáraknak egy fájlrendszeren kell lenniük"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "Csomaglisták olvasása"
@@ -1758,11 +1758,11 @@ msgid "File not found"
msgstr "Nem találom a fájlt"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "Nem érhető el"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "A módosítási időt beállítása sikertelen"
@@ -1824,7 +1824,7 @@ msgstr "Időtúllépés a kapcsolatban"
msgid "Server closed the connection"
msgstr "A kiszolgáló lezárta a kapcsolatot"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Olvasási hiba"
@@ -1836,7 +1836,7 @@ msgstr "A válasz túlcsordította a puffert."
msgid "Protocol corruption"
msgstr "Protokoll hiba"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Írási hiba"
@@ -1890,7 +1890,7 @@ msgstr "Az adat sockethez kapcsolódás túllépte az időt"
msgid "Unable to accept connection"
msgstr "Nem lehet elfogadni a kapcsolatot"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Probléma a fájl hash értékének meghatározásakor"
@@ -1954,58 +1954,63 @@ msgstr "Nem tudtam kapcsolódni ehhez: %s: %s (%s)."
msgid "Connecting to %s"
msgstr "Kapcsolódás: %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nem lehet feloldani a következőt: '%s' "
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Átmeneti hiba '%s' feloldása közben"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Valami rossz történt '%s: %s' feloldásakor (%i)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Sikertelen kapcsolódás ide: %s %s:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "%s kulcstartó nem érhető el"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Telepítés megszakítása."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "H: Az Acquire::gpgv::Options argumentum lista túl hosszú. Kilépek."
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "Belső hiba: Jó aláírás, de meghatározhatatlan kulcs ujjlenyomat?!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "1 vagy több érvénytelen aláírást találtam."
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr "'%s' nem futtatható az aláírás ellenőrzéséhez (a gpgv telepítve van?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "Ismeretlen gpgv futtatási hiba"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "Az alábbi aláírások érvénytelenek voltak:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2055,48 +2060,48 @@ msgstr "Ez a http szerver támogatja a sérült tartományokat "
msgid "Unknown date format"
msgstr "Ismeretlen dátum formátum"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "Sikertelen kiválasztás"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "Időtúllépés a kapcsolatban"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "Hiba a kimeneti fájl írásakor"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "Hiba fájl írásakor"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "Hiba a fájl írásakor"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "Hiba a kiszolgálóról olvasáskor, a túloldal lezárta a kapcsolatot"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "Hiba a kiszolgálóról olvasáskor"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
#, fuzzy
msgid "Failed to truncate file"
msgstr "%s fájl írása sikertelen"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "Rossz fejlécadat"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "Sikertelen kapcsolódás"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Belső hiba"
@@ -2105,18 +2110,25 @@ msgstr "Belső hiba"
msgid "Can't mmap an empty file"
msgstr "Nem lehet mmap-olni egy üres fájlt"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nem sikerült %lu bájtot mmap-olni"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2146,52 +2158,52 @@ msgstr ""
msgid "Selection %s not found"
msgstr "%s kiválasztás nem található"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Ismeretlen típusrövidítés: '%c'"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "%s konfigurációs fájl megnyitása"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Szintaktikai hiba %s: %u: A blokk név nélkül kezdődik"
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Szintaktikai hiba %s: %u: hibás formátumú címke"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Szintaktikai hiba %s: %u: fölösleges szemét az érték után"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "Szintaktikai hiba %s: %u: Csak legfelső szinten használhatók előírások"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Szintaktikai hiba %s: %u: Túl sok beágyazott include"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Szintaktikai hiba %s: %u: ugyaninnen include-olva"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Szintaktikai hiba %s: %u: '%s' nem támogatott előírás"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Szintaktikai hiba %s: %u: fölösleges szemét a fájl végén"
@@ -2268,75 +2280,75 @@ msgstr "Nem sikerült ide váltani: %s"
msgid "Failed to stat the cdrom"
msgstr "Nem sikerült elérni a CD-ROM-ot."
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "Nem zárolom '%s' csak olvasható zárolási fájlt"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "%s zárolási fájl nem nyitható meg"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "Nem zárolom '%s' NFS-csatlakoztatású zárolási fájlt"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "Nem sikerült zárolni: %s"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s nem volt itt, ahogy vártam"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "%s alfolyamat szegmentálási hibát okozott."
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "%s alfolyamat szegmentálási hibát okozott."
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "%s alfolyamat hibakóddal tért vissza (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "%s alfolyamat váratlanul kilépett"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "Nem lehet megnyitni %s fájlt"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "olvasás, még kellene %lu, de már az összes elfogyott"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "írás, még kiírandó %lu de ez nem lehetséges"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Hiba a fájl bezárásakor"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "Hiba a fájl leválasztásával"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "Hiba a fájl szinkronizálásakor"
@@ -2453,52 +2465,52 @@ msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "A(z) %lu. sor hibás %s forráslistában (URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "A(z) %lu. sor hibás %s forráslistában (dist)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "A(z) %lu. sor hibás %s forráslistában (URI feldolgozó)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "A(z) %lu. sor hibás %s forráslistában (Abszolút dist)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "A(z) %lu. sor hibás %s forráslistában (dist feldolgozó)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "%s megnyitása"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "A(z) %u. sor túl hosszú %s forráslistában."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "A(z) %u. sor hibás %s forráslistában (típus)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "'%s' típus nem ismert a(z) %u. sorban a(z) %s forráslistában"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "A(z) %u. sor hibás %s forráslistában (terjesztő id)"
@@ -2625,17 +2637,17 @@ msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr "Próbáld futtatni az apt-get update -et, hogy javítsd e hibákat"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Hibás rekord a tulajdonság fájlban, nincs csomagfejléc"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "A(z) %s tűtípus nem értelmezhető"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "Nincs prioritás (vagy nulla) megadva a tűhöz"
@@ -2724,17 +2736,17 @@ msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"%s %s csomag nem volt megtalálható a fájl függőségeinek feldolgozása közben"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni"
# FIXME
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "\"Előkészít\" kapcsolatok összegyűjtése"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "IO hiba a forrás-gyorsítótár mentésekor"
@@ -2743,19 +2755,19 @@ msgstr "IO hiba a forrás-gyorsítótár mentésekor"
msgid "rename failed, %s (%s -> %s)."
msgstr "sikertelen átnevezés, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "Az MD5Sum nem megfelelő"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "A Hash Sum nem megfelelő"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr "Nincs elérhető nyilvános kulcs az alábbi kulcs azonosítókhoz:\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2764,7 +2776,7 @@ msgstr ""
"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
"kell kijavítani a csomagot. (hiányzó arch. miatt)"
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2773,14 +2785,14 @@ msgstr ""
"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
"kell kijavítani a csomagot."
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"A csomagindex-fájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz."
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "A méret nem megfelelő"
@@ -2915,7 +2927,6 @@ msgstr "%i rekord kiírva %i hiányzó és %i hibásan párosított fájllal\n"
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "%s konfigurációs fájl megnyitása"
@@ -2926,7 +2937,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:542
#, fuzzy, c-format
-#| msgid "Hash Sum mismatch"
msgid "Hash mismatch for: %s"
msgstr "A Hash Sum nem megfelelő"
@@ -2947,7 +2957,6 @@ msgstr "%s eltávolítása"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "%s teljesen eltávolítva"
@@ -3031,14 +3040,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "%s fájl foltozása sikertelen"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "A kapcsolat idő előtt lezárult"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "%s kulcstartó nem érhető el"
+
+#~ msgid "Could not patch file"
+#~ msgstr "%s fájl foltozása sikertelen"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/it.po b/po/it.po
index fdbb9b46e..9208fcc7f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2009,7 +2009,6 @@ msgstr "Impossibile connettersi a %s:%s:"
#. TRANSLATOR: %s is the trusted keyring parts directory
#: methods/gpgv.cc:78
#, fuzzy, c-format
-#| msgid "Aborting install."
msgid "No keyring installed in %s."
msgstr "Interruzione dell'installazione."
diff --git a/po/ja.po b/po/ja.po
index bb2e5fddc..e60501fc3 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2008-11-13 09:26+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -147,7 +147,7 @@ msgstr " バージョンテーブル:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s for %s コンパイル日時: %s %s\n"
@@ -301,7 +301,7 @@ msgstr ""
" -c=? 指定した設定ファイルを読み込む\n"
" -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "%s に書き込めません"
@@ -436,8 +436,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "DB が古いため、%s のアップグレードを試みます"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"DB フォーマットが無効です。apt の古いバージョンから更新したのであれば、データ"
@@ -454,11 +455,11 @@ msgstr "DB ファイル %s を開くことができません: %s"
msgid "Failed to stat %s"
msgstr "%s の状態を取得するのに失敗しました"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "アーカイブにコントロールレコードがありません"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "カーソルを取得できません"
@@ -523,26 +524,26 @@ msgstr "*** %s を %s にリンクするのに失敗しました"
msgid " DeLink limit of %sB hit.\n"
msgstr " リンクを外す制限の %sB に到達しました。\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "アーカイブにパッケージフィールドがありませんでした"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s に override エントリがありません\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %1$s メンテナは %3$s ではなく %2$s です\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s にソース override エントリがありません\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s にバイナリ override エントリがありません\n"
@@ -646,7 +647,7 @@ msgstr "%s を %s に名前変更できませんでした"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "正規表現の展開エラー - %s"
@@ -809,11 +810,11 @@ msgstr "パッケージを削除しなければなりませんが、削除が無
msgid "Internal error, Ordering didn't finish"
msgstr "内部エラー、調整が終わっていません"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "ダウンロードディレクトリをロックできません"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "ソースのリストを読むことができません。"
@@ -843,8 +844,8 @@ msgstr "この操作後に追加で %sB のディスク容量が消費されま
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "この操作後に %sB のディスク容量が解放されます。\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s の空き領域を測定できません"
@@ -881,7 +882,7 @@ msgstr "中断しました。"
msgid "Do you want to continue [Y/n]? "
msgstr "続行しますか [Y/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s の取得に失敗しました %s\n"
@@ -890,7 +891,7 @@ msgstr "%s の取得に失敗しました %s\n"
msgid "Some files failed to download"
msgstr "いくつかのファイルの取得に失敗しました"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました"
@@ -989,53 +990,53 @@ msgstr "'%2$s' のバージョン '%1$s' が見つかりませんでした"
msgid "Selected version %s (%s) for %s\n"
msgstr "%3$s にはバージョン %1$s (%2$s) を選択しました\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "ソースパッケージリスト %s の状態を取得できません"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "update コマンドは引数をとりません"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "list ディレクトリをロックできません"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"一連のものを削除するようになっていないので、AutoRemover を開始できません"
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr ""
"以下のパッケージが自動でインストールされましたが、もう必要とされていません:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"以下のパッケージが自動でインストールされましたが、もう必要とされていません:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "これらを削除するには 'apt-get autoremove' を利用してください。"
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1053,45 +1054,45 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "以下の情報がこの問題を解決するために役立つかもしれません:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr "内部エラー、AutoRemover が何かを破壊しました"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "内部エラー、AllUpgrade が何かを破壊しました"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "タスク %s が見つかりません"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "パッケージ %s が見つかりません"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "注意: 正規表現 '%2$s' に対して %1$s を選択しました\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s は手動でインストールしたと設定されました。\n"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"以下の問題を解決するために 'apt-get -f install' を実行する必要があるかもしれ"
"ません:"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1099,7 +1100,7 @@ msgstr ""
"未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法"
"を明示してください)。"
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1111,118 +1112,118 @@ msgstr ""
"であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n"
"動されていないことが考えられます。"
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "壊れたパッケージ"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "以下の特別パッケージがインストールされます:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "提案パッケージ:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "推奨パッケージ:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "アップグレードパッケージを検出しています ... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "失敗"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "完了"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "内部エラー、問題リゾルバが何かを破壊しました"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr ""
"ソースを取得するには少なくともひとつのパッケージ名を指定する必要があります"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s のソースパッケージが見つかりません"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "すでにダウンロードされたファイル '%s' をスキップします\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "%s に充分な空きスペースがありません"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB のソースアーカイブを取得する必要があります。\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "ソース %s を取得\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "いくつかのアーカイブの取得に失敗しました。"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "展開コマンド '%s' が失敗しました。\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
"'dpkg-dev' パッケージがインストールされていることを確認してください。\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "ビルドコマンド '%s' が失敗しました。\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "子プロセスが失敗しました"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s のビルド依存情報を取得できません"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s にはビルド依存情報が指定されていません。\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1231,7 +1232,7 @@ msgstr ""
"パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと"
"ができません"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1240,32 +1241,32 @@ msgstr ""
"入手可能な %3$s はいずれもバージョンについての要求を満たせないため、%2$s に対"
"する %1$s の依存関係を満たすことができません"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%2$s の依存関係 %1$s を満たすことができません: インストールされた %3$s パッ"
"ケージは新しすぎます"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s のビルド依存関係を満たすことができませんでした。"
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "ビルド依存関係の処理に失敗しました"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "サポートされているモジュール:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1354,7 +1355,7 @@ msgstr ""
"apt.conf(5) を参照してください。\n"
" この APT は Super Cow Powers 化されています。\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1600,11 +1601,10 @@ msgstr "ファイル %s/%s がパッケージ %s のものを上書きします"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "%s を読み込むことができません"
@@ -1634,9 +1634,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "info と temp ディレクトリは同じファイルシステム上になければなりません"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "パッケージリストを読み込んでいます"
@@ -1772,11 +1772,11 @@ msgid "File not found"
msgstr "ファイルが見つかりません"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "状態の取得に失敗しました"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "変更時刻の設定に失敗しました"
@@ -1838,7 +1838,7 @@ msgstr "接続タイムアウト"
msgid "Server closed the connection"
msgstr "サーバが接続を切断しました"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "読み込みエラー"
@@ -1850,7 +1850,7 @@ msgstr "レスポンスがバッファをオーバフローさせました。"
msgid "Protocol corruption"
msgstr "プロトコルが壊れています"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "書き込みエラー"
@@ -1904,7 +1904,7 @@ msgstr "データソケット接続タイムアウト"
msgid "Unable to accept connection"
msgstr "接続を accept できません"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "ファイルのハッシュでの問題"
@@ -1968,61 +1968,66 @@ msgstr "%s:%s (%s) へ接続できませんでした。"
msgid "Connecting to %s"
msgstr "%s へ接続しています"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "'%s' を解決できませんでした"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "'%s' が一時的に解決できません"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "'%s:%s' (%i) の解決中に問題が起こりました"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "%s %s へ接続できません:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "キーリングにアクセスできませんでした: '%s'"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "インストールを中断します。"
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"エラー: Acquire::gpgv::Options の引数リストが長すぎます。終了しています。"
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "内部エラー: 正しい署名ですが、鍵指紋を確定できません?!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "少なくとも 1 つの不正な署名が発見されました。"
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"署名を検証するための '%s' の実行ができませんでした (gpgv はインストールされて"
"いますか?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "gpgv の実行中に未知のエラーが発生"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "以下の署名が無効です:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2071,47 +2076,47 @@ msgstr "http サーバのレンジサポートが壊れています"
msgid "Unknown date format"
msgstr "不明な日付フォーマットです"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "select に失敗しました"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "接続タイムアウト"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "出力ファイルへの書き込みでエラーが発生しました"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "ファイルへの書き込みでエラーが発生しました"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "ファイルへの書き込みでエラーが発生しました"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "サーバからの読み込みに失敗しました"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr "ファイルの切り詰めに失敗しました"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "不正なヘッダです"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "接続失敗"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "内部エラー"
@@ -2119,18 +2124,25 @@ msgstr "内部エラー"
msgid "Can't mmap an empty file"
msgstr "空のファイルを mmap できません"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "%lu バイトの mmap ができませんでした"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2160,52 +2172,52 @@ msgstr ""
msgid "Selection %s not found"
msgstr "選択された %s が見つかりません"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "理解できない省略形式です: '%c'"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "設定ファイル %s をオープンできませんでした"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "文法エラー %s:%u: ブロックが名前なしで始まっています。"
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "文法エラー %s:%u: 不正なタグです"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "文法エラー %s:%u: 値の後に余分なゴミが入っています"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "文法エラー %s:%u: 命令はトップレベルでのみ実行できます"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "文法エラー %s:%u: インクルードのネストが多すぎます"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "文法エラー %s:%u: ここからインクルードされています"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "文法エラー %s:%u: 未対応の命令 '%s'"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "文法エラー %s:%u: ファイルの最後に余計なゴミがあります"
@@ -2281,75 +2293,75 @@ msgstr "%s へ変更することができません"
msgid "Failed to stat the cdrom"
msgstr "cdrom の状態を取得するのに失敗しました"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "読み込み専用のロックファイル %s にロックは使用しません"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "ロックファイル %s をオープンできません"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "nfs マウントされたロックファイル %s にはロックを使用しません"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "ロック %s が取得できませんでした"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s を待ちましたが、そこにはありませんでした"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "子プロセス %s がセグメンテーション違反を受け取りました。"
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "子プロセス %s がセグメンテーション違反を受け取りました。"
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "子プロセス %s がエラーコード (%u) を返しました"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "子プロセス %s が予期せず終了しました"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "ファイル %s をオープンできませんでした"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "読み込みが %lu 残っているはずですが、何も残っていません"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "あと %lu 書き込む必要がありますが、書き込むことができませんでした"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "ファイルのクローズ中に問題が発生しました"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "ファイルの削除中に問題が発生しました"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "ファイルの同期中に問題が発生しました"
@@ -2466,52 +2478,52 @@ msgstr "パッケージファイル %s を解釈することができません (
msgid "Unable to parse package file %s (2)"
msgstr "パッケージファイル %s を解釈することができません (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "ソースリスト %2$s の %1$lu 行目が不正です (absolute dist)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist parse)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "%s をオープンしています"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "ソースリスト %2$s の %1$u 行目が長すぎます。"
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "ソースリスト %2$s の %1$u 行目が不正です (vendor id)"
@@ -2643,19 +2655,19 @@ msgstr ""
"これらの問題を解決するためには apt-get update を実行する必要があるかもしれま"
"せん"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
"不正なレコードが preferences ファイルに存在します。パッケージヘッダがありませ"
"ん"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "pin タイプ %s が理解できませんでした"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "pin で優先度 (または 0) が指定されていません"
@@ -2739,16 +2751,16 @@ msgstr "%s を処理中にエラーが発生しました (CollectFileProvides)"
msgid "Package %s %s was not found while processing file dependencies"
msgstr "パッケージ %s %s がファイル依存の処理中に見つかりませんでした"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "ソースパッケージリスト %s の状態を取得できません"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "ファイル提供情報を収集しています"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "ソースキャッシュの保存中に IO エラーが発生しました"
@@ -2757,19 +2769,19 @@ msgstr "ソースキャッシュの保存中に IO エラーが発生しまし
msgid "rename failed, %s (%s -> %s)."
msgstr "名前の変更に失敗しました。%s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "MD5Sum が適合しません"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "ハッシュサムが適合しません"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2778,7 +2790,7 @@ msgstr ""
"パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
"で修正する必要があります (存在しないアーキテクチャのため)。"
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2787,7 +2799,7 @@ msgstr ""
"パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
"で修正する必要があります。"
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2795,7 +2807,7 @@ msgstr ""
"パッケージインデックスファイルが壊れています。パッケージ %s に Filename: "
"フィールドがありません。"
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "サイズが適合しません"
@@ -2932,7 +2944,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "設定ファイル %s をオープンできませんでした"
@@ -2943,7 +2954,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:542
#, fuzzy, c-format
-#| msgid "Hash Sum mismatch"
msgid "Hash mismatch for: %s"
msgstr "ハッシュサムが適合しません"
@@ -2964,7 +2974,6 @@ msgstr "%s を削除しています"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "%s を完全に削除しました"
@@ -3050,14 +3059,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "ファイルにパッチできませんでした"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "途中で接続がクローズされました"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "キーリングにアクセスできませんでした: '%s'"
+
+#~ msgid "Could not patch file"
+#~ msgstr "ファイルにパッチできませんでした"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/km.po b/po/km.po
index a30ffe945..0b197126b 100644
--- a/po/km.po
+++ b/po/km.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_km\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2006-10-10 09:48+0700\n"
"Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
"Language-Team: Khmer <support@khmeros.info>\n"
@@ -152,7 +152,7 @@ msgstr " តារាង​កំណែ ៖"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s សម្រាប់ %s %s បាន​ចងក្រងនៅលើ​%s %s\n"
@@ -306,7 +306,7 @@ msgstr ""
" -c=? អាន​ឯកសារ​ការ​កំណត់​រចនាស្ព័ន្ធ​នេះ\n"
" -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "មិន​អាច​សរសេរ​ទៅ %s"
@@ -440,8 +440,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "DB ចាស់​, កំពុង​ព្យាយាម​ធ្វើ​ឲ្យ %s ប្រសើរ​ឡើង"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"ទ្រង់ទ្រាយ​មូលដ្ឋាន​ទិន្នន័យ​មិន​ត្រឹមត្រូវ ។ ប្រសិន​បើ​អ្នក​បាន​ធ្វើ​ឲ្យ​វា​ប្រសើឡើង​ពី​កំណែ​ចាស់​របស់ apt សូម​យក​"
@@ -458,11 +459,11 @@ msgstr "មិន​អាច​បើក​ឯកសារ​ DB បានទ
msgid "Failed to stat %s"
msgstr "បាន​បរាជ័យ​ក្នុង​ការថ្លែង %s"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "ប័ណ្ណសារ​គ្មាន​កំណត់​ត្រា​ត្រួត​ពិនិត្យ​ទេ​"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "មិន​អាច​យក​ទស្សន៍ទ្រនិច​"
@@ -527,26 +528,26 @@ msgstr "*** បាន​បរាជ័យ​ក្នុង​ការ​ត
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink កំណត់​នៃ​ការ​វាយ %sB ។\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "ប័ណ្ណសារ​គ្មាន​វាល​កញ្ចប់​"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s គ្មាន​ធាតុធាតុបញ្ចូល​​បដិសេធឡើយ\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " អ្នក​ថែទាំ %s គឺ %s មិនមែន​ %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s គ្មាន​ធាតុ​បដិសេធ​ប្រភព\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s គ្មាន​ធាតុប​ដិសេធគោល​ពីរ​ដែរ\n"
@@ -650,7 +651,7 @@ msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex កំហុស​ការចងក្រង​ - %s"
@@ -811,11 +812,11 @@ msgstr "កញ្ចប់ ​ត្រូវការឲ្យ​យក​ច
msgid "Internal error, Ordering didn't finish"
msgstr "កំហុស​ខាងក្នុង​ ការ​រៀប​តាម​លំដាប់​មិន​បាន​បញ្ចប់ឡើយ"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "មិន​អាច​ចាក់​សោ​ថត​ទាញ​យក​បាន​ឡើយ"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "មិន​អាច​អាន​បញ្ជី​ប្រភព​បាន​ឡើយ​ ។"
@@ -844,8 +845,8 @@ msgstr "បន្ទាប់​ពី​ពន្លា​ %sB នៃ​កា
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "បន្ទាប់​ពី​ពន្លា​ %sB ទំហំ​ថាសនឹង​​ទំនេរ ។ \n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "មិន​អាច​កំណត់​ទំហំ​ទំនេរ​ក្នុង​ %s បានឡើយ"
@@ -882,7 +883,7 @@ msgstr "បោះបង់ ។"
msgid "Do you want to continue [Y/n]? "
msgstr "តើ​អ្នក​ចង់​បន្តឬ​ [បាទ ចាស/ទេ​] ? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s %s\n"
@@ -891,7 +892,7 @@ msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រម
msgid "Some files failed to download"
msgstr "ឯកសារ​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​ទាញ​យក​"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "បានបញ្ចប់ការទាញ​យក​ ហើយ​តែ​ក្នុង​របៀប​​ទាញ​យក​ប៉ុណ្ណោះ"
@@ -988,51 +989,51 @@ msgstr "រក​មិន​ឃើញ​កំណែ​ '%s' សម្រាប
msgid "Selected version %s (%s) for %s\n"
msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ទាន់​សម័យ​គ្មាន​អាគុយម៉ង់​ទេ"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "មិន​អាច​ចាក់​សោ​ថត​បញ្ជីបានឡើយ"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1048,51 +1049,51 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "ព័ត៌មាន​ដូចតទៅនេះ អាចជួយ​ដោះស្រាយ​ស្ថានភាព​បាន ៖"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "កំហុស​ខាងក្នុង ការធ្វើឲ្យប្រសើរ​ទាំងអស់បានធ្វើឲ្យ​ឧបករណ៍​ខូច"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "ចំណាំ កំពុង​ជ្រើស​ %s សម្រាប់ regex '%s'\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "អ្នក​ប្រហែល​ជា​ចង់​រត់ `apt-get -f install' ដើម្បី​កែ​ពួក​វា​ទាំង​នេះ ៖"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
"ភាពអស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ 'apt-get -f install' ដោយ​គ្មាន​កញ្ចប់ (ឬ បញ្ជាក់​ដំណោះស្រាយ) ។"
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1104,122 +1105,122 @@ msgstr ""
"ដែលបាន​ទាមទារនឹងមិនទាន់បានបង្កើត​ឡើយ​\n"
" ឬ ​បានយក​ចេញ​ពីការមកដល់ ។"
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "កញ្ចប់​ដែល​បាន​ខូច​"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "កញ្ចប់​បន្ថែម​ដូចតទៅនេះ នឹងត្រូវបាន​ដំឡើង ៖"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​យោបល់ ៖"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​អនុសាសន៍ ៖"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "បាន​បរាជ័យ"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "ធ្វើរួច​"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "មិន​អាច​រក​កញ្ចប់ប្រភព​​សម្រាប់ %s បានឡើយ"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "កំពុង​រំលង​ឯកសារ​ដែល​បាន​ទាញយក​រួច​ '%s'\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "អ្នក​ពុំ​មាន​ទំហំ​ទំនេរ​គ្រប់គ្រាន់​ទេ​នៅក្នុង​ %s ឡើយ"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "ត្រូវការ​យក​ %sB/%sB នៃ​ប័ណ្ណសារ​ប្រភព ។\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "ត្រូវការ​យក​ %sB នៃ​ប័ណ្ណសារ​ប្រភព​ ។\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "ទៅប្រមូល​ប្រភព​ %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "បរាជ័យ​ក្នុងការទៅប្រមូលយក​ប័ណ្ណសារ​មួយចំនួន ។"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "កំពុង​រំលង​ការស្រាយ​នៃប្រភព​ដែលបានស្រាយរួច​នៅក្នុង %s\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "ពាក្យ​បញ្ជា​ស្រាយ '%s' បាន​បរាជ័យ​ ។\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "សាងសង​ពាក្យ​បញ្ជា​ '%s' បានបរាជ័យ​ ។\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "ដំណើរ​ការ​កូន​បាន​បរាជ័យ​"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr "ត្រូវតែ​បញ្ជាក់​យ៉ាងហោចណាស់​មួយកញ្ចប់ដើម្បីពិនិត្យ builddeps សម្រាប់"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "មិន​អាច​សាងសង់​​ព័ត៌មាន​ភាពអស្រ័យ​សម្រាប់ %s"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s មិនមានភាពអាស្រ័យ​ស្ថាបនាឡើយ​ ។\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ "
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1228,30 +1229,30 @@ msgstr ""
"ភាពអាស្រ័យ %s សម្រាប់ %s មិនអាច​តម្រូវចិត្តបានទេ ព្រោះ មិនមាន​កំណែ​នៃកញ្ចប់ %s ដែលអាច​តម្រូវចិត្ត​"
"តម្រូវការ​កំណែបានឡើយ"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺថ្មីពេក"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s: %s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "ភាពអាស្រ័យ​ដែល​បង្កើត​ %s មិន​អាច​បំពេញ​សេចក្ដី​ត្រូវការ​បាន​ទេ ។"
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើត​ភាព​អាស្រ័យ"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ "
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1334,7 +1335,7 @@ msgstr ""
"pages for more information and options.\n"
" This APT has Super Cow Powers.\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1579,11 +1580,10 @@ msgstr "ឯកសារ​ %s/%s សរសេរជាន់​ពីលើ​
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "មិន​អាច​អាន​ %s បានឡើយ"
@@ -1613,9 +1613,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "ថតព័ត៌មាន​ និង ពុម្ព ត្រូវការនៅលើ​ប្រព័ន្ធឯកសារ​ដូចគ្នា​"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "កំពុង​អាន​បញ្ជី​កញ្ចប់"
@@ -1748,11 +1748,11 @@ msgid "File not found"
msgstr "រកឯកសារ​មិន​ឃើញ​"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "បរាជ័យ​ក្នុងការថ្លែង"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "បរាជ័យក្នុងការកំណត់​ពេលវេលា​ការកែប្រែ​"
@@ -1813,7 +1813,7 @@ msgstr "អស់ពេល​ក្នុងការតភ្ជាប់​"
msgid "Server closed the connection"
msgstr "ម៉ាស៊ីន​បម្រើ​បាន​បិទ​ការតភ្ជាប់​"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "ការអាន​មានកំហុស"
@@ -1825,7 +1825,7 @@ msgstr "ឆ្លើយតប​សតិ​បណ្តោះអាសន្ន
msgid "Protocol corruption"
msgstr "ការបង្ខូច​ពិធីការ​"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "ការសរសេរ​មានកំហុស"
@@ -1879,7 +1879,7 @@ msgstr "ការតភ្ជាប់​រន្ធ​​ទិន្នន័
msgid "Unable to accept connection"
msgstr "មិនអាច​ទទួលយក​ការតភ្ជាប់​បានឡើយ"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "បញ្ហា​ធ្វើឲ្យខូច​ឯកសារ"
@@ -1943,58 +1943,63 @@ msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​ %s
msgid "Connecting to %s"
msgstr "កំពុង​តភ្ជាប់​ទៅកាន់ %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "មិន​អាច​ដោះស្រាយ​ '%s' បានឡើយ"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "ការ​ដោះស្រាយ​ភាព​បរាជ័យ​​បណ្តោះអាសន្ន '%s'"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "ការ​ដោះស្រាយ​អ្វី​អាក្រក់ដែល​បាន​កើត​ឡើង​ '%s:%s' (%i)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​​ %s %s ៖"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "មិន​អាច​ចូល​ដំណើរការ keyring ៖ '%s'"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។"
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "E ៖ បញ្ជី​អាគុយ​ម៉ង់​ពី​ Acquire::gpgv::Options too long ។ ចេញ​ ។"
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "កំហុស​ខាងក្នុង​ ៖ ហត្ថលេខា​​ល្អ ប៉ុន្តែ ​មិន​អាច​កំណត់​កូនសោ​ស្នាម​ម្រាមដៃ ?!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "​បានជួប​ប្រទះ​​​​ហត្ថលេខា​យ៉ាងហោចណាស់មួយ ដែ​លត្រឹមត្រូវ​ ។"
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr "មិន​អាច​ប្រតិបត្តិ '%s' ដើម្បី​ផ្ទៀងផ្ទាត់​ហត្ថលេខា (តើ gpgv ត្រូវ​បាន​ដំឡើង​ឬនៅ ?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "មិនស្គាល់កំហុស ក្នុងការប្រតិបត្តិ gpgv"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "ហត្ថលេខា​ខាង​ក្រោម​មិន​ត្រឹមត្រូវ ៖\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2043,48 +2048,48 @@ msgstr "ម៉ាស៊ីន​បម្រើ HTTP នេះបាន​ខូ
msgid "Unknown date format"
msgstr "មិនស្គាល់​ទ្រង់ទ្រាយ​កាលបរិច្ឆេទ"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "ជ្រើស​បាន​បរាជ័យ​"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "ការតភ្ជាប់​បាន​អស់ពេល​"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារលទ្ធផល"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារ"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "កំហុសក្នុងការ​សរសេរ​ទៅកាន់​ឯកសារ"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "កំហុស​ក្នុងការ​អាន​ពី​ម៉ាស៊ីនបម្រើ ។ ការបញ្ចប់​ពីចម្ងាយ​បានបិទការតភ្ជាប់"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "កំហុស​ក្នុងការអាន​ពី​ម៉ាស៊ីន​បម្រើ"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
#, fuzzy
msgid "Failed to truncate file"
msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "ទិន្នន័យ​បឋមកថា​ខូច"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "កំហុស​ខាង​ក្នុង​"
@@ -2092,18 +2097,25 @@ msgstr "កំហុស​ខាង​ក្នុង​"
msgid "Can't mmap an empty file"
msgstr "មិនអាច mmap ឯកសារទទេ​បានឡើយ"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "មិន​អាច​បង្កើត​ mmap នៃ​ %lu បៃបានឡើយ"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2133,52 +2145,52 @@ msgstr ""
msgid "Selection %s not found"
msgstr "ជម្រើស​ %s រក​មិន​ឃើញ​ឡើយ"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "មិន​បាន​​ទទួល​ស្គាល់​ប្រភេទ​អក្សរ​សង្ខេប ៖ '%c'"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "កំពុង​បើ​ឯកសារ​កំណត់រចនាសម្ព័ន្ធ​ %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "កំហុស​វាក្យ​សម្ពន្ធ %s:%u ៖ ប្លុក​ចាប់​ផ្តើម​​ដោយ​គ្មាន​ឈ្មោះ​ ។"
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "កំហុស​​វាក្យ​សម្ពន្ធ %s:%u ៖ ស្លាក​ដែលបាន Malformed"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "កំហុស​​វាក្យ​សម្ពន្ធ %s:%u ៖ តម្លៃ​ឥតបានការ​នៅ​ក្រៅ​"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "កំហុសវាក្យ​សម្ពន្ធ %s:%u ៖ សេចក្ដីបង្គាប់​អាចត្រូវបានធ្វើ​តែនៅលើ​កម្រិត​កំពូល​តែប៉ុណ្ណោះ"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "កំហុស​វាក្យសម្ពន្ធ %s:%u ៖ មាន​ការរួមបញ្ចូល​ដែលដាក់​រួមគ្នា​យ៉ាងច្រើន"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "កំហុសវាក្យ​សម្ពន្ធ %s:%u ៖ បានរួម​បញ្ចូល​ពី​ទីនេះ​"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "កំហុស​វាក្យ​សម្ពន្ធ %s:%u ៖ សេចក្ដី​បង្គាប់​ដែល​មិនបានគាំទ្រ '%s'"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "កំហុស​វាក្យសម្ពន្ធ %s:%u ៖ សារឥតបានការ​បន្ថែម ដែលនៅខាងចុង​ឯកសារ"
@@ -2254,75 +2266,75 @@ msgstr "មិនអាច​ប្ដូរទៅ %s បានឡើយ"
msgid "Failed to stat the cdrom"
msgstr "បរាជ័យក្នុងការ​ថ្លែង ស៊ីឌីរ៉ូម"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "មិន​ប្រើប្រាស់​ការចាក់សោ សម្រាប់តែឯកសារចាក់សោ​ដែលបានតែអានប៉ុណ្ណោះ %s"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "មិន​អាច​បើក​ឯកសារ​ចាក់សោ​ %s បានឡើយ"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "មិនប្រើ​ការចាក់សោ សម្រាប់ nfs ឯកសារ​ចាក់សោដែលបានម៉ោន%s"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "មិន​អាច​ចាក់សោ %s បានឡើយ"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "រង់ចាំប់​ %s ប៉ុន្តែ ​វា​មិន​នៅទីនោះ"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។"
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។"
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "ដំណើរការ​រង​ %s បានត្រឡប់​ទៅកាន់​កូដ​មាន​កំហុស​ (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "ដំណើរការ​រង​ %s បានចេញ ដោយ​មិន​រំពឹង​ទុក​ "
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "អាន​, នៅតែ​មាន %lu ដើម្បី​អាន​ ប៉ុន្តែ​គ្មាន​អ្វី​នៅសល់"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "សរសេរ​, នៅតែមាន​ %lu ដើម្បី​សរសេរ​ ប៉ុន្តែ​មិន​អាច​"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ​ឯកសារ"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​"
@@ -2440,52 +2452,52 @@ msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1
msgid "Unable to parse package file %s (2)"
msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់​ %s (2) បានឡើយ"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "បន្ទាត់ Malformed %lu ក្នុង​ញ្ជី​ប្រភព​ %s (URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "បន្ទាត់​ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist លែងប្រើ)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "កំពុង​បើក​ %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "បន្ទាត់​ %u មាន​ប្រវែង​វែងពេកនៅ​ក្នុង​បញ្ជី​ប្រភព​ %s ។"
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "បន្ទាត់​ Malformed %u ក្នុង​បញ្ជី​ប្រភព​ %s (ប្រភេទ​)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "បន្ទាត់​ Malformed %u ក្នុង​បញ្ជី​ប្រភព​ %s (លេខសម្គាល់​ក្រុមហ៊ុន​លក់)"
@@ -2608,17 +2620,17 @@ msgstr "បញ្ជី​កញ្ចប់​ ឬ ឯកសារ​ស្ថ
msgid "You may want to run apt-get update to correct these problems"
msgstr "អ្នកប្រហែលជា​ចង់ភាពទាន់សម័យ apt-get ដើម្បី​កែ​បញ្ហា​ទាំងនេះ"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "កំណត់ត្រា​មិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារចំណង់ចំណូលចិត្ត មិនមាន​បឋមកថា​កញ្ចប់ទេ"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "មិន​បាន​យល់​ពី​ប្រភេទ​ម្ជុល %s ឡើយ"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "គ្មាន​អទិភាព (ឬ សូន្យ​) បានបញ្ជាក់​សម្រាប់​ម្ជុល​ទេ"
@@ -2703,16 +2715,16 @@ msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​ក
msgid "Package %s %s was not found while processing file dependencies"
msgstr "កញ្ចប់​ %s %s រក​មិន​ឃើញ​ខណៈ​ពេល​កំពុង​ដំណើរការ​ភាពអាស្រ័យ​​ឯកសារ"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "ការផ្ដល់​ឯកសារ​ប្រមូលផ្ដុំ"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "IO កំហុសក្នុងការររក្សាទុក​ឃ្លាំង​សម្ងាត់​ប្រភព​"
@@ -2721,20 +2733,20 @@ msgstr "IO កំហុសក្នុងការររក្សាទុក​
msgid "rename failed, %s (%s -> %s)."
msgstr "ប្តូរ​ឈ្មោះ​បានបរាជ័យ​, %s (%s -> %s) ។"
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "MD5Sum មិន​ផ្គួផ្គង​"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "MD5Sum មិន​ផ្គួផ្គង​"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr "គ្មាន​កូនសោ​សាធារណៈ​អាច​រក​បាន​ក្នុងកូនសោ IDs ខាងក្រោម​នេះទេ ៖\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2743,7 +2755,7 @@ msgstr ""
"ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បាន​ទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។ "
"(ដោយសារ​​បាត់​ស្ថាបត្យកម្ម)"
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2751,13 +2763,13 @@ msgid ""
msgstr ""
"ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បានទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។"
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "កញ្ចប់​ឯកសារ​លិបិក្រម​ត្រូវ​បាន​ខូច ។ គ្មាន​ឈ្មោះ​ឯកសារ ៖ វាល​សម្រាប់​កញ្ចប់នេះ​ទេ​ %s ។"
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​"
@@ -2891,7 +2903,6 @@ msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួ
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "កំពុង​បើ​ឯកសារ​កំណត់រចនាសម្ព័ន្ធ​ %s"
@@ -2922,7 +2933,6 @@ msgstr "កំពុង​យក %s ចេញ"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង"
@@ -3006,15 +3016,31 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-#, fuzzy
-msgid "Could not patch file"
-msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "បាន​បិទ​ការ​តភ្ជាប់​មុន​ពេល"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "មិន​អាច​ចូល​ដំណើរការ keyring ៖ '%s'"
+
+#, fuzzy
+#~ msgid "Could not patch file"
+#~ msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/ko.po b/po/ko.po
index bd0a0b003..ec4b95ac9 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2008-11-13 07:14+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -144,7 +144,7 @@ msgstr " 버전 테이블:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s(%s), 컴파일 시각 %s %s\n"
@@ -297,7 +297,7 @@ msgstr ""
" -c=? 설정 파일을 읽습니다\n"
" -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "%s에 쓸 수 없습니다"
@@ -431,8 +431,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "DB가 오래되었습니다. %s의 업그레이드를 시도합니다"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"DB 형식이 잘못되었습니다. apt 예전 버전에서 업그레이드했다면, 데이터베이스를 "
@@ -449,12 +450,12 @@ msgstr "DB 파일, %s 파일을 열 수 없습니다: %s"
msgid "Failed to stat %s"
msgstr "%s의 정보를 읽는 데 실패했습니다"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "아카이브에 컨트롤 기록이 없습니다"
# FIXME: 왠 커서??
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "커서를 가져올 수 없습니다"
@@ -520,26 +521,26 @@ msgstr "*** %s 파일을 %s에 링크하는 데 실패했습니다"
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink 한계값 %s바이트에 도달했습니다.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "아카이브에 패키지 필드가 없습니다"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s에는 override 항목이 없습니다\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 관리자가 %s입니다 (%s 아님)\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s에는 source override 항목이 없습니다\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s에는 binary override 항목이 없습니다\n"
@@ -643,7 +644,7 @@ msgstr "%s 파일의 이름을 %s(으)로 바꾸는 데 실패했습니다"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "정규식 컴파일 오류 - %s"
@@ -805,11 +806,11 @@ msgstr "패키지를 지워야 하지만 지우기가 금지되어 있습니다.
msgid "Internal error, Ordering didn't finish"
msgstr "내부 오류. 순서변경작업이 끝나지 않았습니다"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "다운로드 디렉토리를 잠글 수 없습니다"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "소스 목록을 읽을 수 없습니다."
@@ -840,8 +841,8 @@ msgstr "이 작업 후 %s바이트의 디스크 공간을 더 사용하게 됩
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "이 작업 후 %s바이트의 디스크 공간이 비워집니다.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다"
@@ -881,7 +882,7 @@ msgstr "중단."
msgid "Do you want to continue [Y/n]? "
msgstr "계속 하시겠습니까 [Y/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s 파일을 받는 데 실패했습니다 %s\n"
@@ -890,7 +891,7 @@ msgstr "%s 파일을 받는 데 실패했습니다 %s\n"
msgid "Some files failed to download"
msgstr "일부 파일을 받는 데 실패했습니다"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "다운로드를 마쳤고 다운로드 전용 모드입니다"
@@ -988,50 +989,50 @@ msgstr "%2$s 패키지의 '%1$s' 버전을 찾을 수 없습니다"
msgid "Selected version %s (%s) for %s\n"
msgstr "%3$s 패키지의 %1$s (%2$s) 버전을 선택합니다\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "소스 패키지 목록 %s의 정보를 읽을 수 없습니다"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "update 명령은 인수를 받지 않습니다"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "목록 디렉토리를 잠글 수 없습니다"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "삭제를 할 수 없으므로 AutoRemover를 실행하지 못합니다"
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "다음 새 패키지가 전에 자동으로 설치되었지만 더 이상 필요하지 않습니다:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "다음 새 패키지가 전에 자동으로 설치되었지만 더 이상 필요하지 않습니다:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "이들을 지우기 위해서는 'apt-get autoremove'를 사용하십시오."
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1049,44 +1050,44 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "내부 오류, AllUpgrade 프로그램이 무언가를 망가뜨렸습니다"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "%s 작업를 찾을 수 없습니다"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "%s 패키지를 찾을 수 없습니다"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "주의, 정규식 '%2$s'에 대하여 %1$s을(를) 선택합니다\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s 패키지 수동설치로 지정합니다.\n"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "다음을 바로잡으려면 `apt-get -f install'을 실행해 보십시오:"
# FIXME: specify a solution? 무슨 솔루션?
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1094,7 +1095,7 @@ msgstr ""
"의존성이 맞지 않습니다. 패키지 없이 'apt-get -f install'을 시도해 보십시오 "
"(아니면 해결 방법을 지정하십시오)."
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1105,115 +1106,115 @@ msgstr ""
"불안정 배포판을 사용해서 일부 필요한 패키지를 아직 만들지 않았거나,\n"
"아직 Incoming에서 나오지 않은 경우일 수도 있습니다."
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "망가진 패키지"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "다음 패키지를 더 설치할 것입니다:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "제안하는 패키지:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "추천하는 패키지:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "업그레이드를 계산하는 중입니다... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "실패"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "완료"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s의 소스 패키지를 찾을 수 없습니다"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "%s에 충분한 공간이 없습니다"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "%s 소스를 가져옵니다\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "일부 아카이브를 가져오는 데 실패했습니다."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "압축 풀기 명령 '%s' 실패.\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "빌드 명령 '%s' 실패.\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "하위 프로세스가 실패했습니다"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr "해당되는 빌드 의존성을 검사할 패키지를 최소한 하나 지정해야 합니다"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s 패키지에 빌드 의존성이 없습니다.\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1222,7 +1223,7 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니"
"다"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1231,32 +1232,32 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지의 사용 가능한 버"
"전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: 설치한 %3$s 패키지가 너"
"무 최근 버전입니다"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: %3$s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s의 빌드 의존성을 만족시키지 못했습니다."
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "빌드 의존성을 처리하는 데 실패했습니다"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "지원하는 모듈:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1340,7 +1341,7 @@ msgstr ""
"apt.conf(5) 매뉴얼 페이지를 보십시오.\n"
" 이 APT는 Super Cow Powers로 무장했습니다.\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1587,11 +1588,10 @@ msgstr "%s/%s 파일은 %s 패키지에 있는 파일을 덮어 씁니다"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "%s을(를) 읽을 수 없습니다"
@@ -1621,9 +1621,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "정보 디렉토리와 임시 디렉토리는 같은 파일 시스템에 있어야 합니다"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "패키지 목록을 읽는 중입니다"
@@ -1756,11 +1756,11 @@ msgid "File not found"
msgstr "파일이 없습니다"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "파일 정보를 읽는 데 실패했습니다"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "파일 변경 시각을 설정하는 데 실패했습니다"
@@ -1822,7 +1822,7 @@ msgstr "연결 시간 초과"
msgid "Server closed the connection"
msgstr "서버에서 연결을 닫았습니다"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "읽기 오류"
@@ -1834,7 +1834,7 @@ msgstr "응답이 버퍼 크기를 넘어갔습니다."
msgid "Protocol corruption"
msgstr "프로토콜이 틀렸습니다"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "쓰기 오류"
@@ -1888,7 +1888,7 @@ msgstr "데이터 소켓 연결 시간 초과"
msgid "Unable to accept connection"
msgstr "연결을 받을 수 없습니다"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "파일 해싱에 문제가 있습니다"
@@ -1952,60 +1952,65 @@ msgstr "%s:%s에 연결할 수 없습니다 (%s)."
msgid "Connecting to %s"
msgstr "%s에 연결하는 중입니다"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "'%s'의 주소를 알아낼 수 없습니다"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "'%s'의 주소를 알아내는 데 임시로 실패했습니다"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "'%s:%s'의 주소를 알아내는 데 무언가 이상한 일이 발생했습니다 (%i)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "%s %s에 연결할 수 없습니다:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "키링에 접근할 수 없습니다: '%s'"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "설치를 중단합니다."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "E: Acquire::gpgv::Options의 인자 목록이 너무 깁니다. 끝냅니다."
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "내부 오류: 서명은 올바르지만 키 지문을 확인할 수 없습니다!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "최소한 하나 이상의 서명이 잘못되었습니다."
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"서명을 확인하는 '%s' 프로그램을 실행할 수 없습니다. (gnuv 프로그램을 설치했습"
"니까?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "gpgv 실행 도중 알 수 없는 오류 발생"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "다음 서명이 올바르지 않습니다:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2054,47 +2059,47 @@ msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다"
msgid "Unknown date format"
msgstr "데이터 형식을 알 수 없습니다"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "select가 실패했습니다"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "연결 시간이 초과했습니다"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "출력 파일에 쓰는 데 오류가 발생했습니다"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "파일에 쓰는 데 오류가 발생했습니다"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "해당 파일에 쓰는 데 오류가 발생했습니다"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "서버에서 읽고 연결을 닫는 데 오류가 발생했습니다"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "서버에서 읽는 데 오류가 발생했습니다"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr "파일을 자르는 데 실패했습니다"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "헤더 데이터가 잘못되었습니다"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "연결이 실패했습니다"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "내부 오류"
@@ -2102,18 +2107,25 @@ msgstr "내부 오류"
msgid "Can't mmap an empty file"
msgstr "빈 파일에 메모리 매핑할 수 없습니다"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "%lu바이트를 메모리 매핑할 수 없습니다"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2143,52 +2155,52 @@ msgstr ""
msgid "Selection %s not found"
msgstr "선택한 %s이(가) 없습니다"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "이 타입 줄임말을 알 수 없습니다: '%c'"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "설정 파일 %s 파일을 여는 중입니다"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "문법 오류 %s:%u: 블럭이 이름으로 시작하지 않습니다."
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "문법 오류 %s:%u: 태그의 형식이 잘못되었습니다"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "문법 오류 %s:%u: 값 뒤에 쓰레기 데이터가 더 있습니다"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "문법 오류 %s:%u: 지시어는 맨 위 단계에서만 쓸 수 있습니다"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "문법 오류 %s:%u: include가 너무 많이 겹쳐 있습니다"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "문법 오류 %s:%u: 여기서 include됩니다"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "문법 오류 %s:%u: 지원하지 않는 지시어 '%s'"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "문법 오류 %s:%u: 파일의 끝에 쓰레기 데이터가 더 있습니다"
@@ -2264,75 +2276,75 @@ msgstr "%s 디렉토리로 이동할 수 없습니다"
msgid "Failed to stat the cdrom"
msgstr "CD-ROM의 정보를 읽을 수 없습니다"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "읽기 전용 잠금 파일 %s에 대해 잠금을 사용하지 않습니다"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "잠금 파일 %s 파일을 열 수 없습니다"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "NFS로 마운트된 잠금 파일 %s에 대해 잠금을 사용하지 않습니다"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "%s 잠금 파일을 얻을 수 없습니다"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "하위 프로세스 %s 프로세스가 세그멘테이션 오류를 받았습니다."
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "하위 프로세스 %s 프로세스가 세그멘테이션 오류를 받았습니다."
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "하위 프로세스 %s 프로세스가 오류 코드(%u)를 리턴했습니다"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "하위 프로세스 %s 프로세스가 예상치 못하게 끝났습니다"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "%s 파일을 열 수 없습니다"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "%lu만큼 더 읽어야 하지만 더 이상 읽을 데이터가 없습니다"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "%lu만큼 더 써야 하지만 더 이상 쓸 수 없습니다"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "파일을 닫는 데 문제가 있습니다"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "파일을 지우는 데 문제가 있습니다"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "파일을 동기화하는 데 문제가 있습니다"
@@ -2449,52 +2461,52 @@ msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (1)"
msgid "Unable to parse package file %s (2)"
msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (절대 dist)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist 파싱)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "%s 파일을 여는 중입니다"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "소스 리스트 %2$s의 %1$u번 줄이 너무 깁니다."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (벤더 ID)"
@@ -2620,17 +2632,17 @@ msgstr "패키지 목록이나 상태 파일을 파싱할 수 없거나 열 수
msgid "You may want to run apt-get update to correct these problems"
msgstr "apt-get update를 실행하면 이 문제를 바로잡을 수도 있습니다."
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "기본 설정 파일에 잘못된 데이터가 있습니다. 패키지 헤더가 없습니다"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "핀 타입 %s이(가) 무엇인지 이해할 수 없습니다"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "핀에 우선순위(혹은 0)를 지정하지 않았습니다"
@@ -2714,16 +2726,16 @@ msgstr "%s 처리 중에 오류가 발생했습니다 (CollectFileProvides)"
msgid "Package %s %s was not found while processing file dependencies"
msgstr "파일 의존성을 처리하는 데, %s %s 패키지가 없습니다"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "소스 패키지 목록 %s의 정보를 읽을 수 없습니다"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "파일에서 제공하는 것을 모으는 중입니다"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다"
@@ -2732,19 +2744,19 @@ msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다
msgid "rename failed, %s (%s -> %s)."
msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "MD5Sum이 맞지 않습니다"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "해쉬 합계가 서로 다릅니다"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr "다음 키 ID의 공개키가 없습니다:\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2753,7 +2765,7 @@ msgstr ""
"%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습"
"니다. (아키텍쳐가 빠졌기 때문입니다)"
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2762,14 +2774,14 @@ msgstr ""
"%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습"
"니다."
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"패키지 인덱스 파일이 손상되었습니다. %s 패키지에 Filename: 필드가 없습니다."
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "크기가 맞지 않습니다"
@@ -2902,7 +2914,6 @@ msgstr "레코드 %i개를 파일 %i개가 빠지고 %i개가 맞지 않은 상
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "설정 파일 %s 파일을 여는 중입니다"
@@ -2913,7 +2924,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:542
#, fuzzy, c-format
-#| msgid "Hash Sum mismatch"
msgid "Hash mismatch for: %s"
msgstr "해쉬 합계가 서로 다릅니다"
@@ -2934,7 +2944,6 @@ msgstr "%s 패키지를 지우는 중입니다"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "%s 패키지를 완전히 지웠습니다"
@@ -3019,14 +3028,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "%s 파일을 열 수 없습니다"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "연결이 너무 빨리 끊어졌습니다"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "키링에 접근할 수 없습니다: '%s'"
+
+#~ msgid "Could not patch file"
+#~ msgstr "%s 파일을 열 수 없습니다"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/ku.po b/po/ku.po
index 2c9c3dcfb..c22027eb1 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-ku\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2008-05-08 12:48+0200\n"
"Last-Translator: Erdal Ronahi <erdal dot ronahi at gmail dot com>\n"
"Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n"
@@ -151,7 +151,7 @@ msgstr " Tabloya guhertoyan:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s ji bo %s %s komkirî di %s %s de\n"
@@ -259,7 +259,7 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "Nivîsandin ji bo %s ne pêkane"
@@ -355,7 +355,7 @@ msgstr "Danegir kevn e, ji bo bilindkirina %s hewl dide"
#: ftparchive/cachedb.cc:72
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
@@ -370,11 +370,11 @@ msgstr "Danegira %s nehate vekirin: %s"
msgid "Failed to stat %s"
msgstr ""
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Tomara kontrola arşîvê tuneye"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr ""
@@ -439,26 +439,26 @@ msgstr ""
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "Di arşîvê de qada pakêtê tuneye"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -562,7 +562,7 @@ msgstr ""
msgid "Y"
msgstr "E"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -721,11 +721,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "Pelrêça daxistinê nayê quflekirin"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr ""
@@ -754,8 +754,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nikarî cihê vala li %s tesbît bike"
@@ -789,7 +789,7 @@ msgstr "Betal."
msgid "Do you want to continue [Y/n]? "
msgstr "Dixwazî bidomînî [E/n]?"
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Anîna %s %s biserneket\n"
@@ -798,7 +798,7 @@ msgstr "Anîna %s %s biserneket\n"
msgid "Some files failed to download"
msgstr "Daxistina çend pelan biserneket"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr ""
@@ -890,51 +890,51 @@ msgstr ""
msgid "Selected version %s (%s) for %s\n"
msgstr ""
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
+#: cmdline/apt-get.cc:1321
#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
+msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1352
#, c-format
-msgid "Ignore unavailable target release '%s' of package '%s'"
+msgid "Picking '%s' as source package instead of '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
+msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Ev pakêtên NÛ dê werine sazkirin:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "Ev pakêtên NÛ dê werine sazkirin:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -950,49 +950,49 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "Peywira %s nehate dîtin"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "Nikarî pakêta %s bibîne"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "lê %s dê were sazkirin"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1000,152 +1000,152 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "Paketên şikestî"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Paketên tên pêşniyaz kirin:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Paketên tên tawsiyê kirin:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "Bilindkirin tê hesibandin..."
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Serneket"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Temam"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Cihê vala li %s têre nake"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "Çavkanîna %s bîne\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "Anîna çend arşîvan biserneket."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1189,7 +1189,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1422,11 +1422,10 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "Nikare %s bixwîne"
@@ -1456,9 +1455,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr ""
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "Lîsteya pakêtan tê xwendin"
@@ -1587,12 +1586,12 @@ msgid "File not found"
msgstr "Pel nehate dîtin"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
#, fuzzy
msgid "Failed to stat"
msgstr "%s venebû"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr ""
@@ -1652,7 +1651,7 @@ msgstr ""
msgid "Server closed the connection"
msgstr ""
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Çewiya xwendinê"
@@ -1664,7 +1663,7 @@ msgstr ""
msgid "Protocol corruption"
msgstr ""
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Çewtiya nivîsînê"
@@ -1718,7 +1717,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@@ -1783,59 +1782,64 @@ msgstr ""
msgid "Connecting to %s"
msgstr "Bi %s re tê girêdan"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nikarî '%s' çareser bike"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr ""
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr ""
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Nikare bi %s re girêdan pêk bîne %s:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Sazkirin tê betalkirin."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "Di xebitandina gpgv de çewtiya nenas"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Ev pakêtên NÛ dê werine sazkirin:"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1884,49 +1888,49 @@ msgstr ""
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "Hilbijartin neserketî"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:818
+#: methods/http.cc:819
#, fuzzy
msgid "Error writing to output file"
msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "Dema li pelî dihate nivîsîn çewtî"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "Dema li pelî dihate nivîsîn çewtî"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
#, fuzzy
msgid "Failed to truncate file"
msgstr "Nivîsîna pelê %s biserneket"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "Girêdan pêk nehatiye"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Çewtiya hundirîn"
@@ -1934,18 +1938,25 @@ msgstr "Çewtiya hundirîn"
msgid "Can't mmap an empty file"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -1975,52 +1986,52 @@ msgstr ""
msgid "Selection %s not found"
msgstr "Hilbijartina %s nehatiye dîtin"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr ""
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr ""
@@ -2096,75 +2107,75 @@ msgstr "Nikarî derbasa %s bike"
msgid "Failed to stat the cdrom"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "Nikarî qufila pelê %s veke"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, c-format
msgid "Sub-process %s received signal %u."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "Nikarî pelê %s veke"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Di girtina pelî de pirsgirêkek derket"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr ""
@@ -2281,52 +2292,52 @@ msgstr "Pakêt nehate dîtin %s"
msgid "Unable to parse package file %s (2)"
msgstr "Pakêt nehate dîtin %s"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "%s tê vekirin"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
@@ -2443,17 +2454,17 @@ msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr ""
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr ""
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr ""
@@ -2537,16 +2548,16 @@ msgstr ""
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr ""
@@ -2555,39 +2566,39 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr "nav guherandin biserneket, %s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "MD5Sum li hev nayên"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "Hash Sum li hev nayên"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "Mezinahî li hev nayên"
@@ -2728,7 +2739,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:542
#, fuzzy, c-format
-#| msgid "Hash Sum mismatch"
msgid "Hash mismatch for: %s"
msgstr "Hash Sum li hev nayên"
@@ -2749,7 +2759,6 @@ msgstr "%s tê rakirin"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "%s bi tevahî hatine rakirin"
@@ -2833,15 +2842,28 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-#, fuzzy
-msgid "Could not patch file"
-msgstr "Danegira %s nehate vekirin: %s"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Girêdan zû hatiye girtin"
+#, fuzzy
+#~ msgid "Could not patch file"
+#~ msgstr "Danegira %s nehate vekirin: %s"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/lt.po b/po/lt.po
index aa12c3437..4d081b0c1 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2008-08-02 01:47-0400\n"
"Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n"
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -150,7 +150,7 @@ msgstr " Versijų lentelė:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr ""
@@ -268,7 +268,7 @@ msgstr ""
" -c=? Nuskaityti šį konfigūracijų failą\n"
" -o=? Nustatyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "Nepavyko įrašyti į %s"
@@ -407,8 +407,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "Duomenų bazė yra sena, bandoma atnaujinti %s"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"Duomenų bazės formatas yra netinkamas. Jei jūs atsinaujinote iš senesnės "
@@ -425,11 +426,11 @@ msgstr "Nepavyko atverti DB failo %s: %s"
msgid "Failed to stat %s"
msgstr "Nepavyko patikrinti %s"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr ""
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr ""
@@ -494,26 +495,26 @@ msgstr "*** Nepavyko susieti %s su %s"
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "Archyvas neturėjo paketo lauko"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s neturi perrašymo įrašo\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s prižiūrėtojas yra %s, o ne %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -617,7 +618,7 @@ msgstr "Nepavyko pervadinti %s į %s"
msgid "Y"
msgstr "T"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -779,11 +780,11 @@ msgstr "Reikia pašalinti paketus, tačiau šalinimas išjungtas."
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "Nepavyko užrakinti parsiuntimų aplanko"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Nepavyko perskaityti šaltinių sąrašo."
@@ -812,8 +813,8 @@ msgstr "Po šios operacijos bus naudojama %sB papildomos disko vietos.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Po šios operacijos bus atlaisvinta %sB disko vietos.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nepavyko nustatyti %s laisvos vietos"
@@ -850,7 +851,7 @@ msgstr "Nutraukti."
msgid "Do you want to continue [Y/n]? "
msgstr "Ar norite tęsti [T/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Nepavyko parsiųsti %s %s\n"
@@ -859,7 +860,7 @@ msgstr "Nepavyko parsiųsti %s %s\n"
msgid "Some files failed to download"
msgstr "Nepavyko parsiųsti kai kurių failų"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "Pavyko parsiųsti tik parsiuntimo režime"
@@ -957,50 +958,50 @@ msgstr "Nebuvo rasta „%s“ versija paketui „%s“"
msgid "Selected version %s (%s) for %s\n"
msgstr "Pažymėta versija %s (%s) paketui %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
+#: cmdline/apt-get.cc:1321
#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
+msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1352
#, c-format
-msgid "Ignore unavailable target release '%s' of package '%s'"
+msgid "Picking '%s' as source package instead of '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
+msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "Atnaujinimo komandai argumentų nereikia"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Nepavyko užrakinti sąrašo aplanko"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Norėdami juos pašalinti, paleiskite „apt-get autoremove“"
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1016,43 +1017,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "Ši informacija gali padėti išspręsti šią situaciją:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "Nepavyko rasti užduoties %s"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "Nepavyko rasti paketo %s"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Pastaba, žymima %s regex atitikimų formoje '%s'\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Jūs galite norėti paleisti 'apt-get -f install\" klaidų taisymui:"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1060,7 +1061,7 @@ msgstr ""
"Nepatenkintos priklausomybės. Pabandykite įvykdyti 'apt-get -f install' be "
"nurodytų paketų (arba nurodykite išeitį)."
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1072,115 +1073,115 @@ msgstr ""
"leidimą, kuomet kai kurie paketai dar nebuvo sukurti arba buvo\n"
"pašalinti iš \"Incoming\" aplanko."
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "Sugadinti paketai"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "Bus įdiegti šie papildomi paketai:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Siūlomi paketai:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Rekomenduojami paketai:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "Skaičiuojami atnaujinimai... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Nepavyko"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Įvykdyta"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "Vidinė klaida, problemos sprendimas kažką sugadino"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr "Būtina nurodyti bent vieną paketą, kad parsiųsti jo išeities tekstą"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nepavyko surasti išeities teksto paketo, skirto %s"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Praleidžiama jau parsiųsta byla „%s“\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Neturite pakankamai laisvos vietos %s"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Reikia parsiųsti %sB/%sB išeities archyvų.\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Reikia parsiųsti %sB išeities archyvų.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "Parsiunčiamas archyvas %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "Nepavyko gauti kai kurių arhcyvų."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Jau išpakuotas archyvas %s praleidžiama\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Nepavyko įvykdyti išpakavimo komandos „%s“\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Nepavyko įvykdyti paketo kompiliavimo komandos „%s“\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "Klaida procese-palikuonyje"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr "Būtina nurodyti bent vieną paketą, kuriam norite įvykdyti builddeps"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nepavyko gauti kūrimo-priklausomybių informacijos paketui %s"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1188,7 +1189,7 @@ msgid ""
msgstr ""
"%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1197,32 +1198,32 @@ msgstr ""
"%s priklausomybė %s paketui negali būti patenkinama, nes nėra tinkamos "
"versijos %s paketo"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Nepavyko patenkinti %s priklausomybės %s paketui: Įdiegtas paketas %s yra "
"per naujas"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Nepavyko patenkinti %s priklausomybės %s: %s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "Palaikomi moduliai:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1266,7 +1267,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1516,11 +1517,10 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "Nepavyko perskaityti %s"
@@ -1550,9 +1550,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr ""
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "Skaitomi paketų sąrašai"
@@ -1681,11 +1681,11 @@ msgid "File not found"
msgstr "Failas nerastas"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr ""
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr ""
@@ -1745,7 +1745,7 @@ msgstr "Jungiamasi per ilgai"
msgid "Server closed the connection"
msgstr ""
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Skaitymo klaida"
@@ -1757,7 +1757,7 @@ msgstr ""
msgid "Protocol corruption"
msgstr ""
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Rašymo klaida"
@@ -1811,7 +1811,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@@ -1875,58 +1875,63 @@ msgstr "Nepavyko prisijungti prie %s:%s (%s)."
msgid "Connecting to %s"
msgstr "Jungiamasi prie %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nepavyko surasti vardo „%s“"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Laikinas sutrikimas ieškant vardo „%s“"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr ""
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Nepavyko prisijungti prie %s %s:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Diegimas nutraukiamas."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "Nežinoma klaida kviečiant gpgv"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "Šie parašai buvo nevalidūs:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1975,48 +1980,48 @@ msgstr ""
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr ""
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "Prisijungimo laiko limitas baigėsi"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "Klaida bandant rašyti į failą"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
#, fuzzy
msgid "Failed to truncate file"
msgstr "Nepavyko patikrinti %s"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "Prisijungti nepavyko"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Vidinė klaida"
@@ -2024,18 +2029,25 @@ msgstr "Vidinė klaida"
msgid "Can't mmap an empty file"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2065,52 +2077,52 @@ msgstr ""
msgid "Selection %s not found"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr ""
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr ""
@@ -2186,75 +2198,75 @@ msgstr "Nepavyko pakeisti į %s"
msgid "Failed to stat the cdrom"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "Nepavyko atverti rakinimo failo %s"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "Nepavyko rezervuoti rakinimo failo %s"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Procesas %s gavo segmentavimo klaidą"
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "Procesas %s gavo segmentavimo klaidą"
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Procesas %s grąžino klaidos kodą (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Procesas %s netikėtai išėjo"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "Nepavyko atverti failo %s"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Klaida užveriant failą"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "Klaida sinchronizuojant failą"
@@ -2371,52 +2383,52 @@ msgstr ""
msgid "Unable to parse package file %s (2)"
msgstr ""
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "Atveriama %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
@@ -2537,17 +2549,17 @@ msgstr ""
"Greičiausiai norėsite paleisti „apt-get update“, kad šios problemos būtų "
"ištaisytos"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr ""
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr ""
@@ -2631,16 +2643,16 @@ msgstr ""
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr ""
@@ -2649,39 +2661,39 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "MD5 sumos neatitikimas"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "Maišos sumos nesutapimas"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "Neatitinka dydžiai"
@@ -2812,7 +2824,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Skipping already downloaded file '%s'\n"
msgid "Skipping nonexistent file %s"
msgstr "Praleidžiama jau parsiųsta byla „%s“\n"
@@ -2823,7 +2834,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:542
#, fuzzy, c-format
-#| msgid "Hash Sum mismatch"
msgid "Hash mismatch for: %s"
msgstr "Maišos sumos nesutapimas"
@@ -2844,7 +2854,6 @@ msgstr "Šalinamas %s"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "Visiškai pašalintas %s"
@@ -2928,16 +2937,29 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-#, fuzzy
-#| msgid "Could not open file %s"
-msgid "Could not patch file"
-msgstr "Nepavyko atverti failo %s"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr ""
+#, fuzzy
+#~| msgid "Could not open file %s"
+#~ msgid "Could not patch file"
+#~ msgstr "Nepavyko atverti failo %s"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/mr.po b/po/mr.po
index 53fe538d1..646661c56 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2008-11-20 23:27+0530\n"
"Last-Translator: Sampada <sampadanakhare@gmail.com>\n"
"Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India "
@@ -146,7 +146,7 @@ msgstr "आवृत्ती कोष्टक:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s हे %s करिता %s %s वर संग्रहित\n"
@@ -299,7 +299,7 @@ msgstr ""
" -c=? ही संरचना संचिका वाचा \n"
" -o=? एखादा अहेतुक संरचना पर्याय निर्धारित करा जसे- -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "%s मध्ये लिहिण्यास असमर्थ "
@@ -433,8 +433,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "DB जुने आहे,%s पुढच्या आवृतीसाठी प्रयत्न करत आहे"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"DB स्वरुप वैध नाही. जर तुम्ही apt च्या जुन्या आवृत्तीपासून पुढिल आवृत्तीकृत करत असाल तर, "
@@ -451,11 +452,11 @@ msgstr "%s: %s DB संचिका उघडण्यास असमर्थ
msgid "Failed to stat %s"
msgstr "%s स्टेट करण्यास असमर्थ"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "अर्काईव्ह मध्ये नियंत्रण माहिती संच नाही"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "संकेतक घेण्यास असमर्थ"
@@ -520,26 +521,26 @@ msgstr "%s चा %s दुवा साधण्यास असमर्थ"
msgid " DeLink limit of %sB hit.\n"
msgstr "%sB हीट ची डिलींक मर्यादा\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "अर्काईव्ह ला पॅकेज जागा नाही"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr "%s ला ओव्हरराईड/दुर्लक्षित जागा नाही\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr "%s देखभालकर्ता हा %s आणि %s नाही \n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr "%s ला उगम ओव्हरराईड/दुर्लक्षित जागा नाही\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr "%s ला द्वयंक ओव्हरराईड जागा नाही\n"
@@ -643,7 +644,7 @@ msgstr "%s ला पुनर्नामांकन %s करण्यास
msgid "Y"
msgstr "होय"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "रिजेक्स कंपायलेशन त्रुटी -%s "
@@ -804,11 +805,11 @@ msgstr "पॅकेजेस कायमची काढायची आहे
msgid "Internal error, Ordering didn't finish"
msgstr "अंतर्गत त्रुटी,क्रम अजून संपला नाही"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "डाऊनलोड डिरेक्टरी कुलूपबंद करण्यास असमर्थ"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "उगमांच्या याद्या वाचता येणार नाहीत."
@@ -837,8 +838,8 @@ msgstr "या क्रियेनंतर, %sB एवढी अधिक ड
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "या क्रियेनंतर, %sB डिस्क जागा मोकळी होईल.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s मध्ये रिकामी जागा सांगू शकत नाही"
@@ -875,7 +876,7 @@ msgstr "व्यत्यय/बंद करा."
msgid "Do you want to continue [Y/n]? "
msgstr "तुम्हाला पुढे जायचे आहे [Y/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s %s आणणे असफल\n"
@@ -884,7 +885,7 @@ msgstr "%s %s आणणे असफल\n"
msgid "Some files failed to download"
msgstr "काही संचिका डाऊनलोड करण्यास असमर्थ"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "डाऊनलोड संपूर्ण आणि डाऊनलोड मध्ये फक्त पद्धती"
@@ -982,50 +983,50 @@ msgstr "'%s' साठी '%s' आवृत्ती सापडली ना
msgid "Selected version %s (%s) for %s\n"
msgstr "%s साठी %s (%s) निवडलेली आवृत्ती.\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "सुधारित आवृत्तीचा विधान आर्ग्युमेंटस घेऊ शकत नाही."
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "संचयिका यादीला कुलुप लावण्यात असमर्थ"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "आपण या गोष्टी काढून टाकता नये, ऑटोरिमूव्हर सुरू करता येत नाही"
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "ती काढून टाकण्यासाठी 'apt-get autoremove' वापरा."
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1043,45 +1044,45 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "खालील माहिती परिस्थिती निवळण्यासाठी मदत ठरू शकेल:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr "अंतर्गत त्रुटी, AutoRemoverने स्टफला तोडले"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "अंतर्गत त्रुटी,ऑलअपग्रेडने स्टफला तोडले"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "%s कार्य सापडू शकले नाही"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "%s पॅकेज सापडू शकले नाही"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "सूचना, '%s' रिजेक्स साठी %s ची निवड करत आहे\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s स्वहस्ते संस्थापित करायचे आहे.\n"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"तुम्हाला कदाचित `apt-get -f install'(एपीटी-गेट -एफ संस्थापन') प्रोग्राम चालू करावा "
"लागेल'यात बदल करण्यासाठी:"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1089,7 +1090,7 @@ msgstr ""
"अनमेट डिपेंडन्सीज.एपीटी-गेट -एफ संस्थापन (`apt-get -f install') पॅकेजशिवाय प्रयत्न करा "
"(किंवा पर्याय सांगा)."
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1101,122 +1102,122 @@ msgstr ""
"विभागणी असणारी पण हवी असणारी, तयार केली नसलेली पॅकेजेस वापरत असाल \n"
"किंवा ती येणाऱ्यांपैकी बाहेर हलविली असतील."
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "तुटलेली पॅकेजेस"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "खालील अतिरिक्त पॅकेजेस संस्थापित होतील:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "सुचवलेली पॅकेजेस:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "शिफारस केलेली पॅकेजेस:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "पुढिल आवृत्तीची गणती करीत आहे..."
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "असमर्थ"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "झाले"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "अंतर्गत त्रुटी, अडचण निवारकाने स्टफला तोडले"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s उगम पॅकेज शोधणे शक्य नाही/शोधण्यास असमर्थ आहे"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "आधीच डाऊनलोड केलेली '%s' फाईल सोडून द्या\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "%s मध्ये पुरेशी जागा नाही"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "उगम अर्काईव्हज चा %sB/%sB घेण्याची गरज आहे.\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "उगम अर्काईव्हजचा %sB घेण्याची गरज आहे.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "%s उगम घ्या\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "काही अर्काईव्हज आणण्यास असमर्थ."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "%s मध्ये आधीच उघडलेल्या उगमातील उघडलेल्याला सोडून द्या किंवा वगळा\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "'%s' आज्ञा सुट्या करण्यास असमर्थ.\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "बांधणी करणाऱ्या आज्ञा '%s' अयशस्वी.\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "चाईल्ड प्रक्रिया अयशस्वी"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr "बिल्डेपस् कशासाठी ते पडताळण्यासाठी किमान एक पॅकेज सांगणे गरजेचे आहे"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s साठी बांधणी डिपेंडन्सी माहिती मिळवण्यास असमर्थ"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s ला बांधणी डिपेंडन्स नाहीत.\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1225,30 +1226,30 @@ msgstr ""
"आवृतीची मागणी पूर्ण करण्यासाठी %s पॅकेजची आवृत्ती उपलब्ध नाही,त्यामुळे %s साठी %s "
"डिपेंडन्सी पूर्ण होऊ शकत नाही"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "%s अवलंबित्व %s साठी पूर्ण होण्यास असमर्थ: संस्थापित पॅकेज %s खूपच नवीन आहे"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%s साठी %s डिपेंडन्सी पूर्ण होण्यास असमर्थ: %s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s साठी बांधणी-डिपेंडन्सीज पूर्ण होऊ शकत नाही."
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ "
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1333,7 +1334,7 @@ msgstr ""
" apt.conf(5) पुस्तिका पाने पहा.\n"
" ह्या APT ला सुपर काऊ पॉवर्स आहेत\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1580,11 +1581,10 @@ msgstr "File %s/%s, %s पॅकेज मधल्या एका वर प
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "%s वाचण्यास असमर्थ"
@@ -1614,9 +1614,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "info आणि temp संचिका सारख्याच फाईलप्रणालीत असणे आवश्यक आहे"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "पॅकेज याद्या वाचत आहोत"
@@ -1749,11 +1749,11 @@ msgid "File not found"
msgstr "फाईल सापडली नाही"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "स्टॅट करण्यास असमर्थ"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "बदलण्याचा वेळ निश्चित करण्यास असमर्थ"
@@ -1815,7 +1815,7 @@ msgstr "वेळेअभावी संबंध जोडता येत
msgid "Server closed the connection"
msgstr "सर्व्हरने संबंध जोडणी बंद केली"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "त्रुटी वाचा"
@@ -1827,7 +1827,7 @@ msgstr "प्रतिसाधाने बफर भरुन गेले."
msgid "Protocol corruption"
msgstr "प्रोटोकॉल खराब झाले"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "लिहिण्यात त्रुटी"
@@ -1881,7 +1881,7 @@ msgstr "डेटा सॉकेट जोडणी वेळेअभावी
msgid "Unable to accept connection"
msgstr "जोडणी स्विकारण्यास असमर्थ"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "फाईल हॅश करण्यात त्रुटी"
@@ -1945,60 +1945,65 @@ msgstr "%s:%s (%s) ला जोडू शकत नाही"
msgid "Connecting to %s"
msgstr "%s ला जोडत आहे"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "%s रिझॉल्व्ह होऊ शकत नाही "
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "'%s' रिझॉल्व्ह करताना तात्पुरती त्रुटी"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना काहीतरी वाईट घडले"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "%s %s ला जोडण्यास असमर्थ:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "'%s': कीरिंग पर्यंत पोहोचू शकत नाही"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "संस्थापन खंडित करत आहे."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"दोष: ::gpgv:: कडून प्राप्त झालेला ऑर्गुमेंट सूचीचा पर्याय खूप लांबीचा. बाहेर पडत आहे."
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "अंतर्गत त्रुटी: चांगली सही, पण की ठसे सांगू शकत नाही?!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "किमान एक अवैध सही सापडली."
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"सहीची खात्री करण्यासाठी '%s' कार्यान्वित करू शकत नाही (gpgv संस्थापित केले आहे का?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "gpgv कार्यान्वित होत असताना अपरिचित त्रुटी"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "खालील सह्या अवैध आहेत:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2047,47 +2052,47 @@ msgstr "HTTP सर्व्हरने विस्तार तांत्
msgid "Unknown date format"
msgstr "अपरिचित दिनांक प्रकार/स्वरूप "
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "चुकले/असमर्थ निवड करा"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "जोडणी वेळेअभावी तुटली"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "निर्गत फाईल मध्ये लिहिताना त्रुटी/चूक"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "सर्व्हर मधून वाचण्यात चूक. लांब शेवट आणि बंद झालेली जोडणी"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "सर्व्हर मधून वाचण्यात चूक"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr "फाईल छोटी करणे असफल"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "चुकीचा शीर्षक डाटा"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "जोडणी अयशस्वी"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "अंतर्गत त्रुटी"
@@ -2095,18 +2100,25 @@ msgstr "अंतर्गत त्रुटी"
msgid "Can't mmap an empty file"
msgstr "रिकामी फाईल mmap करता येणार नाही"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "mmap चे %lu बाईटस् करता येणार नाहीत"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2136,52 +2148,52 @@ msgstr ""
msgid "Selection %s not found"
msgstr "%s निवडक भाग सापडत नाही"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "संक्षिप्तरुपाचा माहित नसलेला प्रकार: '%c'"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "%s संरचना फाईल उघडत आहे"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "रचनेच्या नियमांचा दोष %s:%u: ब्लॉक नावाशिवाय सुरू होतो."
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "रचनेच्या नियमांचा दोष : %s:%u: मालफॉर्मड् टॅग"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "रचनेच्या नियमांचा दोष %s:%u: मुल्यांच्या नंतर अधिक जंक"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "रचनेच्या नियमांचा दोष %s:%u: दिशादर्शक फक्त उच्च पातळीवर केले जाऊ शकतात"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "रचनेच्या नियमांचा दोष %s:%u: खूपच एकात एक इनक्लूडस्"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "रचनेच्या नियमांचा दोष %s:%u: ह्या पासून समाविष्ट "
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "नियम रचनेचा दोष %s:%u: '%s' दिशादर्शक असहाय्यकारी"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "नियम रचनेचा दोष %s:%u: फाईलच्या अंती अधिक जंक"
@@ -2257,75 +2269,75 @@ msgstr "%s मध्ये बदलण्यास असमर्थ"
msgid "Failed to stat the cdrom"
msgstr "सीडी-रॉम स्टॅट करण्यास असमर्थ"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "फक्त वाचण्यासाठी कुलूप संचिका %s साठी कुलूपबंदचा वापर करीत नाही"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "%s कुलूप फाईल उघडता येत नाही"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "%s nfs(नेटवर्क फाईल सिस्टीम) माऊंटेड कुलुप फाईल ला कुलुप /बंद करता येत नाही"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "%s कुलुप मिळवता येत नाही"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s साठी थांबलो पण ते तेथे नव्हते"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला."
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला."
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "%s उपक्रियेने (%u) त्रुटी कोड दिलेला आहे"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "%s उपक्रिया अचानकपणे बाहेर पडली"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "%s फाईल उघडता येत नाही"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "वाचा, %lu अजूनही वाचण्यासाठी आहे पण आता काही उरली नाही"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "लिहा, %lu अजूनही लिहिण्यासाठी आहे पण लिहिता येत नाही"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "फाईल बंद करण्यात अडचण"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "फाईल अनलिंकिंग करण्यात अडचण"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "संचिकेची syncing समस्या"
@@ -2442,52 +2454,52 @@ msgstr "%s (1) पॅकेज फाईल पार्स करण्या
msgid "Unable to parse package file %s (2)"
msgstr "%s (२) पॅकेज फाईल पार्स करण्यात असमर्थ"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "स्त्रोत सुची %s (यूआरआय) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "स्त्रोत सुची %s (absolute dist) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "%s उघडत आहे"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "%s स्त्रोत सुचीमध्ये ओळ %u खूप लांब आहे."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "स्त्रोत सुची %s (प्रकार) मध्ये %u वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही "
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "स्त्रोत सुची %s (विक्रेता आयडी) मध्ये %u वाईट/व्यंग रेषा "
@@ -2612,17 +2624,17 @@ msgstr "पॅकेजच्या याद्या किंवा संच
msgid "You may want to run apt-get update to correct these problems"
msgstr "तुम्ही ह्या समस्यांचे निवारण करण्यासाठी apt-get update प्रोग्राम चालू करु शकता"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "पसंतीच्या संचिकेत अवैध माहितीसंच, पॅकेजला शीर्षक नाही "
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "%s पिनचा प्रकार समजलेला नाही"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "पिन करिता प्राधान्य/अग्रक्रम (किंवा शून्य)निर्देशीत केलेला नाही"
@@ -2711,16 +2723,16 @@ msgstr "%s (तरतूद/पुरवलेल्या संचिका
msgid "Package %s %s was not found while processing file dependencies"
msgstr "अवलंबित/विसंबून असणाऱ्या संचिकांची प्रक्रिया करीत असतांना पॅकेज %s %s सापडले नाही "
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "तरतूद/पुरवलेल्या संचिका संग्रहित करीत आहे"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "IO त्रुटी उगम निवडक संचयस्थानात संग्रहित होत आहे"
@@ -2729,19 +2741,19 @@ msgstr "IO त्रुटी उगम निवडक संचयस्था
msgid "rename failed, %s (%s -> %s)."
msgstr "पुनर्नामांकन अयशस्वी, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "एमडी५ बेरीज/MD5Sum जुळत नाही"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "हॅश बेरीज जुळत नाही"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr "पुढील कळ ओळखचिन्हांसाठी सार्वजनिक कळ उपलब्ध नाही:\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2750,7 +2762,7 @@ msgstr ""
"मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते "
"स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) "
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2759,7 +2771,7 @@ msgstr ""
"मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हालाहे पॅकेज स्वहस्ते "
"स्थिर/निश्चित करण्याची गरज आहे."
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2767,7 +2779,7 @@ msgstr ""
"पॅकेज यादीची/सुचीची संचिका दूषित/खराब झालेली आहे. संचिका नाव नाही: पॅकेजकरीता क्षेत्र/"
"ठिकाण %s."
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "आकार जुळतनाही"
@@ -2902,7 +2914,6 @@ msgstr "%i गहाळ संचिकाबरोबर आणि %i विज
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "%s संरचना फाईल उघडत आहे"
@@ -2913,7 +2924,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:542
#, fuzzy, c-format
-#| msgid "Hash Sum mismatch"
msgid "Hash mismatch for: %s"
msgstr "हॅश बेरीज जुळत नाही"
@@ -2934,7 +2944,6 @@ msgstr "%s काढून टाकत आहे"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "%s संपूर्ण काढून टाकले"
@@ -3018,14 +3027,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "फाईल पॅच करता आली नाही"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "जोडणी अकाली बंद झाली"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "'%s': कीरिंग पर्यंत पोहोचू शकत नाही"
+
+#~ msgid "Could not patch file"
+#~ msgstr "फाईल पॅच करता आली नाही"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/nb.po b/po/nb.po
index 7688df3e7..7f92788f1 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2009-02-01 18:26+0100\n"
"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
"Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.ui.no>\n"
@@ -154,7 +154,7 @@ msgstr " Versjonstabell:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s for %s kompilert p %s %s\n"
@@ -309,7 +309,7 @@ msgstr ""
" -c=? Les denne innstillingsfila.\n"
" -o=? Sett en vilkrlig innstilling, f.eks. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "Kan ikke skrive til %s"
@@ -443,8 +443,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "Databasen er gammel, forsker oppgradere %s"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"DB-formatet er ugyldig. Hvis du oppgraderte fra en eldre versjon av apt, "
@@ -461,11 +462,11 @@ msgstr "Klarte ikke pne Databasefila %s: %s"
msgid "Failed to stat %s"
msgstr "Klarte ikke f statusen p %s"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Arkivet har ingen kontrollpost"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Klarte ikke finne en peker"
@@ -530,26 +531,26 @@ msgstr "*** Klarte ikke lenke %s til %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-grensa p %s B er ndd.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "Arkivet har ikke noe pakkefelt"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har ingen overstyringsoppfring\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s-vedlikeholderen er %s, ikke %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s har ingen kildeoverstyringsoppfring\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s har ingen binroverstyringsoppfring heller\n"
@@ -653,7 +654,7 @@ msgstr "Klarte ikke endre navnet p %s til %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "Kompileringsfeil i regulrt uttrykk - %s"
@@ -814,11 +815,11 @@ msgstr "Pakker trenges fjernes, men funksjonen er sltt av."
msgid "Internal error, Ordering didn't finish"
msgstr "Intern feil, sortering fullfrte ikke"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "Klarer ikke lse nedlastingsmappa"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Kan ikke lese kildlista."
@@ -849,8 +850,8 @@ msgstr "Etter denne operasjonen vil %sB ekstra diskplass bli brukt.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Etter denne operasjonen vil %sB diskplass bli ledig.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Klarte ikke bestemme ledig plass i %s"
@@ -888,7 +889,7 @@ msgstr "Avbryter."
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du fortsette [Y/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikke skaffe %s %s\n"
@@ -897,7 +898,7 @@ msgstr "Klarte ikke skaffe %s %s\n"
msgid "Some files failed to download"
msgstr "Noen av filene kunne ikke lastes ned"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "Nedlasting fullfrt med innstillinga bare nedlasting"
@@ -995,50 +996,50 @@ msgstr "Versjon %s av %s ble ikke funnet"
msgid "Selected version %s (%s) for %s\n"
msgstr "Utvalgt versjon %s (%s) for %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Kunne ikke finne informasjon om %s - lista over kildekodepakker"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "Oppdaterings-kommandoen tar ingen argumenter"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Kan ikke lse listemappa"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Vi skal ikke slette ting, kan ikke starte auto-fjerner (AutoRemover)"
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Flgende pakker ble automatisk installert og er ikke lenger pkrevet:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "Flgende pakker ble automatisk installert og er ikke lenger pkrevet:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Bruk apt-get autoremove for fjerne dem."
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1056,43 +1057,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "Flgende informasjon kan vre til hjelp med lse problemet:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Intern feil, autofjerneren (AutoRemover) dela noe"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Intern feil - AllUpgrade dela noe"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "Klarte ikke finne oppgave %s"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "Klarte ikke finne pakken %s"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Merk, velger %s istedenfor det regulre uttrykket %s\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s satt til manuell installasjon.\n"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Du vil kanskje utfre apt-get -f install for rette p disse:"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1100,7 +1101,7 @@ msgstr ""
"Uinnfridde avhengighetsforhold. Prv apt-get -f install uten pakker (eller "
"angi en lsning)."
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1112,122 +1113,122 @@ msgstr ""
"at visse kjernepakker enn ikke er laget eller flyttet ut av Incoming for\n"
"distribusjonen."
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "delagte pakker"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "Flgende ekstra pakker vil bli installert."
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Foresltte pakker:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Anbefalte pakker"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "Beregner oppgradering... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Mislyktes"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Utfrt"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern feil, problemlser dela noe"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr "Du m angi minst en pakke du vil ha kildekoden til"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Klarer ikke finne en kildekodepakke for %s"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Hopper over allerede nedlastet fil %s\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har ikke nok ledig plass i %s"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Trenger skaffe %sB av %sB fra kildekodearkivet.\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Trenger skaffe %sB fra kildekodearkivet.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "Skaffer kildekode %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "Klarte ikke skaffe alle arkivene."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Omgr utpakking av allerede utpakket kilde i %s\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Utpakkingskommandoen %s mislyktes.\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Sjekk om pakken dpkg-dev er installert.\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggekommandoen %s mislyktes.\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "Barneprosessen mislyktes"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr "Du m angi minst en pakke du vil sjekke builddeps for"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Klarer ikke skaffe informasjon om bygge-avhengighetene for %s"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen avhengigheter.\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1236,32 +1237,32 @@ msgstr ""
"Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige "
"versjoner av pakken %s som oppfyller versjonskravene"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Klarte ikke tilfredsstille %s avhengighet for %s: den installerte pakken %"
"s er for ny"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Klarte ikke tilfredsstille %s avhengighet for %s: %s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Klarte ikke tilfredstille bygg-avhengighetene for %s."
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "Klarte ikke behandle forutsetningene for bygging"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "Stttede moduler:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1346,7 +1347,7 @@ msgstr ""
"for mer informasjon og flere innstillinger\n"
" Denne APT har kraften til en Superku.\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1594,11 +1595,10 @@ msgstr "Fila %s/%s skriver over den tilsvarende fila i pakken %s"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "Klarer ikke lese %s"
@@ -1629,9 +1629,9 @@ msgstr ""
"Infokatalogen og den midlertidige katalogen m vre p det samme filsystemet"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "Leser pakkelister"
@@ -1769,11 +1769,11 @@ msgid "File not found"
msgstr "Fant ikke fila"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "Klarte ikke f status"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "Klarte ikke sette endringstidspunkt"
@@ -1835,7 +1835,7 @@ msgstr "Tidsavbrudd p forbindelsen"
msgid "Server closed the connection"
msgstr "Tjeneren lukket forbindelsen"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Lesefeil"
@@ -1847,7 +1847,7 @@ msgstr "Et svar oversvmte bufferen."
msgid "Protocol corruption"
msgstr "Protokolldeleggelse"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Skrivefeil"
@@ -1901,7 +1901,7 @@ msgstr "Tidsavbrudd p tilkoblingen til datasokkelen"
msgid "Unable to accept connection"
msgstr "Klarte ikke godta tilkoblingen"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem ved oppretting av nkkel for fil"
@@ -1965,59 +1965,64 @@ msgstr "Klarte ikke koble til %s:%s (%s)."
msgid "Connecting to %s"
msgstr "Kobler til %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "Klarte ikke sl opp %s"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Midlertidig feil ved oppslag av %s"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Noe galt skjedde ved oppslag av %s:%s (%i)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Klarte ikke koble til %s %s:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "Klarte ikke sl opp i nkkelring; %s"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Avbryter istallasjonen."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "E: Argumentliste fra Acquire::gpgv::Options for lang. Avbryter."
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "Intern feil: God signatur, men kunne bestemme nkkelfingeravtrykk?!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "Minst en ugyldig signatur ble funnet."
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Klarte ikke kjre %s for verifisere signaturen (er gpgv installert?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "Ukjent feil ved kjring av gpgv"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "De flgende signaturene var ugyldige:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2068,47 +2073,47 @@ msgstr "Denne HTTP-tjeneren har delagt sttte for omrde"
msgid "Unknown date format"
msgstr "Ukjent datoformat"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "Utvalget mislykkes"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "Tidsavbrudd p forbindelsen"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "Feil ved skriving til utfil"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "Feil ved skriving til fil"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "Feil ved skriving til fila"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "Feil ved lesing fra tjeneren"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr "Klarte ikke forkorte fila %s"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "delagte hodedata"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "Forbindelsen mislykkes"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Intern feil"
@@ -2116,12 +2121,12 @@ msgstr "Intern feil"
msgid "Can't mmap an empty file"
msgstr "Kan ikke utfre mmap p en tom fil"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Kunne ikke lage mmap av %lu bytes"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2130,6 +2135,13 @@ msgstr ""
"Dynamisk MMap gikk tom for minne. k strrelsen p APT::Cache-Limit. "
"Nvrende verdi: %lu. (man 5 apt.conf)"
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2159,52 +2171,52 @@ msgstr ""
msgid "Selection %s not found"
msgstr "Fant ikke utvalget %s"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Ukjent typeforkortelse: %c"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "pner oppsettsfila %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Syntaksfeil %s:%u: Blokka starter uten navn."
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntaksfeil %s:%u: Feil p taggen"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Syntaksfeil %s:%u: Ugyldige angivelser etter verdien"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "Syntaksfeil %s:%u: Direktivene kan bare ligge i det verste nivet"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Syntaksfeil %s:%u: For mange nstede inkluderte filer"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntaksfeil %s:%u: Inkludert herfra"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Syntaksfeil %s:%u: Direktivet %s er ikke stttet"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaksfeil %s:%u: Ugyldige angivelser p slutten av fila"
@@ -2280,75 +2292,75 @@ msgstr "Klarer ikke endre %s"
msgid "Failed to stat the cdrom"
msgstr "Klarer ikke f statusen p CD-spilleren"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "Bruker ikke lsing for den skrivebeskyttede lsefila %s"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "Kunne ikke pne lsefila %s"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "Bruker ikke lsing p den nfs-monterte lsefila %s"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "Fr ikke lst %s"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Ventet p %s, men den ble ikke funnet"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Underprosessen %s mottok et minnefeilsignal."
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "Underprosessen %s mottok et minnefeilsignal."
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Underprosessen %s ga en feilkode (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Underprosessen %s avsluttet uventet"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "Kunne ikke pne fila %s"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "lese, har fremdeles %lu igjen lese, men ingen igjen"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "skrive, har fremdeles %lu igjen skrive, men klarte ikke "
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Problem ved lsing av fila"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "Problem ved oppheving av lenke til fila"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "Problem ved oppdatering av fila"
@@ -2465,52 +2477,52 @@ msgstr "Klarer ikke fortolke pakkefila %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Klarer ikke fortolke pakkefila %s (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Feil p linje %lu i kildelista %s (nettadresse)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Feil p linje %lu i kildelista %s (dist)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Feil p %lu i kildelista %s (fortolkning av nettadressen)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Feil p %lu i kildelista %s (Absolutt dist)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Feil p %lu i kildelista %s (dist fortolking)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "pner %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linje %u i kildelista %s er for lang"
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Feil p %u i kildelista %s (type)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typen %s er ukjent i linje %u i kildelista %s"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Feil p %u i kildelista %s (selgers id)"
@@ -2637,17 +2649,17 @@ msgid "You may want to run apt-get update to correct these problems"
msgstr ""
"Det kan hende du vil kjre apt-get update for rette p disse problemene"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Ugyldig oppslag i foretrekksfila, manglende pakkehode"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "Forsto ikke spikring av typen %s"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "Ingen prioritet (eller null) spesifisert for pin"
@@ -2731,16 +2743,16 @@ msgstr "Feil oppsto under behandling av %s (CollectFileProvides)"
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Fant ikke pakken %s %s ved behandling av filkrav"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Kunne ikke finne informasjon om %s - lista over kildekodepakker"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "Samler inn filtilbud"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "IO-feil ved lagring av kildekode-lager"
@@ -2749,20 +2761,20 @@ msgstr "IO-feil ved lagring av kildekode-lager"
msgid "rename failed, %s (%s -> %s)."
msgstr "klarte ikke endre navnet, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "Feil MD5sum"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "Hashsummen stemmer ikke"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Det er ingen offentlig nkkel tilgjengelig for de flgende nkkel-ID-ene:\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2771,7 +2783,7 @@ msgstr ""
"Klarte ikke finne en fil for pakken %s. Det kan bety at du m ordne pakken "
"selv (fordi arkitekturen mangler)."
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2780,13 +2792,13 @@ msgstr ""
"Klarte ikke finne en fil for pakken %s. Det kan bety at du m ordne denne "
"pakken selv."
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Oversiktsfilene er delagte. Feltet Filename: mangler for pakken %s."
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "Feil strrelse"
@@ -2921,7 +2933,6 @@ msgstr "Skrev %i poster med %i manglende filer og %i feile filer.\n"
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "pner oppsettsfila %s"
@@ -2932,7 +2943,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:542
#, fuzzy, c-format
-#| msgid "Hash Sum mismatch"
msgid "Hash mismatch for: %s"
msgstr "Hashsummen stemmer ikke"
@@ -2953,7 +2963,6 @@ msgstr "Fjerner %s"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "Fjernet %s fullstendig"
@@ -3037,14 +3046,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Kunne ikke pne fila %s"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Forbindelsen ble uventet stengt"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Klarte ikke sl opp i nkkelring; %s"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Kunne ikke pne fila %s"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/ne.po b/po/ne.po
index 5ea94d3a7..08d1225f3 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2006-06-12 14:35+0545\n"
"Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n"
"Language-Team: Nepali <info@mpp.org.np>\n"
@@ -149,7 +149,7 @@ msgstr " संस्करण तालिका:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s को लागि %s %s, %s %s मा कम्पाएल गरिएको छ\n"
@@ -304,7 +304,7 @@ msgstr ""
" -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
" -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr " %s मा लेख्न असक्षम"
@@ -441,7 +441,7 @@ msgstr "DB पुरानो छ, %s स्तरवृद्धि गर्
#: ftparchive/cachedb.cc:72
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
@@ -456,11 +456,11 @@ msgstr "DB फाइल %s असक्षम भयो: %s"
msgid "Failed to stat %s"
msgstr " %s स्थिर गर्न असफल"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "संग्रह संग नियन्त्रण रेकर्ड छैन"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "कर्सर प्राप्त गर्न असक्षम भयो"
@@ -525,26 +525,26 @@ msgstr "*** %s मा %s लिङ्क असफल भयो"
msgid " DeLink limit of %sB hit.\n"
msgstr "यस %sB हिटको डि लिङ्क सिमा।\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "संग्रह संग कुनै प्याकेज फाँट छैन"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s संभारकर्ता %s हो %s होइन\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, fuzzy, c-format
msgid " %s has no source override entry\n"
msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, fuzzy, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
@@ -648,7 +648,7 @@ msgstr " %s मा %s पुन:नामकरण असफल भयो"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s"
@@ -809,11 +809,11 @@ msgstr "प्याकेजहरू हट्न चाहदैछन् त
msgid "Internal error, Ordering didn't finish"
msgstr "आन्तरिक त्रुटि, आदेश समाप्त भएको छैन"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "डाउनलोड डाइरेक्ट्री ताल्चा मार्न असक्षम"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "स्रोतहरुको सूचि पढ्न सकिएन ।"
@@ -842,8 +842,8 @@ msgstr "अनप्याक गरिसके पछि थप डिस्
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "%sB अनप्याक गरिसके पछि डिस्क खाली ठाउँ खाली हुनेछ ।\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन"
@@ -880,7 +880,7 @@ msgstr "परित्याग गर्नुहोस् ।"
msgid "Do you want to continue [Y/n]? "
msgstr "के तपाईँ निरन्तरता दिन चाहनुहुन्छ [Y/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s %s तान्न असफल भयो\n"
@@ -889,7 +889,7 @@ msgstr "%s %s तान्न असफल भयो\n"
msgid "Some files failed to download"
msgstr "केही फाइलहरू डाउनलोड गर्न असफल भयो"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "डाउनलोड समाप्त भयो र डाउनलोडमा मोड मात्रै छ"
@@ -986,51 +986,51 @@ msgstr " '%s' को लागि '%s' संस्करण फेला पा
msgid "Selected version %s (%s) for %s\n"
msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन "
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "अद्यावधिक आदेशले कुनै तर्कहरू लिदैन"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1046,44 +1046,44 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "निम्न सूचनाले अवस्थालाई हल गर्न मद्दत गर्नेछ: "
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो "
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "आन्तरिक त्रुटि,सबै स्तरवृद्धिले उत्तम गुण नष्ट गर्दछ"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "प्याकेज फेला पार्न सकिएन %s"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "प्याकेज फेला पार्न सकिएन %s"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "द्रष्टब्य, रिजेक्स '%s' को लागि %s चयन गरिदैछ\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "तर %s स्थापना हुनुपर्यो"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "तपाईँ यसलाई सुधार गर्न `apt-get -f install' चलाउन चाहनुहुन्छ:"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1091,7 +1091,7 @@ msgstr ""
"नभेटिएका निर्भरताहरू । प्याकेजहरू बिना 'apt-get -f install' प्रयास गर्नुहोस् ( वा "
"समाधान निर्दिष्ट गर्नुहोस्) ।"
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1104,122 +1104,122 @@ msgstr ""
" वितरण अहिले सम्म सिर्जना\n"
" भएको छैन वा आवगमन विनानै सर्यो ।"
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "भाँचिएका प्याकेजहरू"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "निम्न अतिरिक्त प्याकेजहरू स्थापना हुनेछन्:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "सुझाव दिएका प्याकेजहरू:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "सिफारिस गरिएका प्याकेजहरू:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "स्तर वृद्धि गणना गरिदैछ..."
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "असफल भयो"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "काम भयो"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो "
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s को लागि स्रोत प्याकेज फेला पार्न असफल भयो"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "पहिल्यै डाउनलोड भएका फाइलहरु फड्काइदैछ '%s'\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "स्रोत संग्रहहरुको %sB/%sB प्राप्त गर्न आवश्यक छ ।\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "स्रोत संग्रहहरुको %sB प्राप्त गर्न आवश्यक छ ।\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "स्रोत फड्काउनुहोस् %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "केही संग्रह फड्काउन असफल भयो ।"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr " %s मा पहिल्यै अनप्याक गरिएका स्रोतको अनप्याक फड्काइदैछ\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "अनप्याक आदेश '%s' असफल भयो ।\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "निर्माण आदेश '%s' असफल भयो ।\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "शाखा प्रक्रिया असफल भयो"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr "को लागि builddeps जाँच्न कम्तिमा एउटा प्याकेज निर्दष्ट गर्नुपर्छ"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s को लागि निर्माण-निर्भरता सूचना प्राप्त गर्न असक्षम भयो"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s कुनै निर्माणमा आधारित हुदैन ।\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1228,30 +1228,30 @@ msgstr ""
"%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले संस्करण "
"आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन "
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "%s को लागि %s निर्भरता सन्तुष्ट पार्न असफल भयो: स्थापित प्याकेज %s अति नयाँ छ"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%s को लागि %s निर्भरता सन्तुष्ट गर्न असफल: %s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । "
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "समर्थित मोड्युलहरू:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1334,7 +1334,7 @@ msgstr ""
"pages हेर्नुहोस् ।\n"
" APT संग सुपर काउ शक्तिहरू छ ।\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1581,11 +1581,10 @@ msgstr "फाइल %s/%s ले प्याकेज %s मा एउटा
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "%s पढ्न असफल भयो"
@@ -1615,9 +1614,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "सूचना र टेम्प डाइरेक्ट्रीहरू एउटै फाइल प्रणालीमा हुनपर्छ"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "प्याकेज सूचिहरू पढिदैछ"
@@ -1750,11 +1749,11 @@ msgid "File not found"
msgstr "फाइल फेला परेन "
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "स्थिर गर्न असफल भयो"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "परिमार्जन समय सेट असफल भयो"
@@ -1816,7 +1815,7 @@ msgstr "जडान समय सकियो"
msgid "Server closed the connection"
msgstr "सर्भरले जडान बन्द गर्यो"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "त्रुटि पढ्नुहोस्"
@@ -1828,7 +1827,7 @@ msgstr "एउटा प्रतिक्रियाले बफर अधि
msgid "Protocol corruption"
msgstr "प्रोटोकल दूषित"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "त्रुटि लेख्नुहोस्"
@@ -1882,7 +1881,7 @@ msgstr "डेटा सकेटको जडान समय सकियो"
msgid "Unable to accept connection"
msgstr "जडान स्वीकार गर्न असक्षम भयो"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "समस्या द्रुतान्वेषण फाइल"
@@ -1946,58 +1945,63 @@ msgstr " %s:%s (%s) मा जडान गर्न सकिएन ।"
msgid "Connecting to %s"
msgstr "%s मा जडान गरिदैछ"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "'%s' हल गर्न सकिएन"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "'%s' हल गर्दा अस्थायी असफल"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट्यो"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "%s %s मा जडान गर्न असफल भयो:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "कुञ्जी घण्टी पहुँच गर्न सकिएन: '%s'"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "स्थापना परित्याग गरिदैछ ।"
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
+
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "E: प्राप्त गर्नेबाट तर्क सूचि::gpgv::अति लामो विकल्पहरू अवस्थित छ ।"
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "आन्तरिक त्रुटि: असल हस्ताक्षर, तर कुञ्जी औठाछाप निर्धारण गर्न सकिएन?!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "कम्तिमा एउटा अवैध हस्ताक्षर विरोध भयो ।"
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr "हस्ताक्षर रूजू गर्न '%s' कार्यन्वयन गर्न सकिएन (के gpgv स्थापना भयो?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "gpgv कार्यन्वयन गर्दा अज्ञात त्रुटि"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "निम्न हस्ताक्षरहरू अवैध छन्:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2046,48 +2050,48 @@ msgstr "HTTP सर्भर संग भाँचिएको दायरा
msgid "Unknown date format"
msgstr "अज्ञात मिति ढाँचा"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "असफल चयन गर्नुहोस्"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "जडान समय सकियो"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "निर्गात फाइलमा त्रुटि लेखिदैछ"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "फाइलमा त्रुटि लेखिदैछ"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "फाइलमा त्रुटि लेखिदैछ"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "सर्भरबाट त्रुटि पढिदैछ । दूर गन्तब्य बन्द जडान"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "सर्भरबाट त्रुटि पढिदैछ"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
#, fuzzy
msgid "Failed to truncate file"
msgstr "फाइल %s लेख्न असफल भयो"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "खराब हेडर डेटा"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "जडान असफल भयो"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "आन्तरिक त्रुटि"
@@ -2095,18 +2099,25 @@ msgstr "आन्तरिक त्रुटि"
msgid "Can't mmap an empty file"
msgstr "एउटा खाली फाइल mmap बनाउन सकिएन"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "%lu बाइटहरुको mmap बनाउन सकिएन"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2136,52 +2147,52 @@ msgstr ""
msgid "Selection %s not found"
msgstr "चयन %s फेला पार्न सकिएन"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "नचिनिएको टाइप संक्षिप्त रुप: '%c'"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "कनफिगरेसन फाइल खोलिदैछ %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "वाक्य संरचना त्रुटि %s:%u: बन्द कुनै नाम बिना सुरू हुन्छ ।"
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "वाक्य संरचना त्रुटि %s:%u: वैरुप गरिएको ट्याग"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "वाक्य संरचना त्रुटि %s:%u: मान पछाडि अतिरिक्त जंक"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "वाक्य संरचना त्रुटि %s:%u: निर्देशनहरू माथिल्लो तहबाट मात्र हुन्छ"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "वाक्य संरचना त्रुटि %s:%u: अति धेरै नेस्टेड समावेश गर्दछ"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "वाक्य संरचना त्रुटि %s:%u: यहाँ बाट समावेश गरेको"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "वाक्य संरचना त्रुटि %s:%u: समर्थन नभएको डाइरेक्टिभ '%s'"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "वाक्य संरचना त्रुटि %s:%u:फाइलको अन्त्यमा अतिरिक्त जंक"
@@ -2257,75 +2268,75 @@ msgstr "%s मा परिवर्तन गर्न असक्षम"
msgid "Failed to stat the cdrom"
msgstr "सिडी रोम स्थिर गर्न असफल भयो"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "ताल्चा मारिएको फाइल मात्र पढ्नको लागि ताल्चा मार्न प्रयोग गरिएको छैन %s"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "ताल्चा मारिएको फाइल खोल्न सकिएन %s"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "nfs माउन्ट गरिएको लक फाइलको लागि लक प्रयोग गरिएको छैन %s"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "ताल्चा प्राप्त गर्न सकिएन %s"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।"
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।"
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "सहायक प्रक्रिया %s ले एउटा त्रुटि कोड फर्कायो (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "सहायक प्रक्रिया %s अनपेक्षित बन्द भयो"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "फाइल %s खोल्न सकिएन"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "पड्नुहोस्, अहिले सम्म %lu पढ्न छ तर कुनै बाँकी छैन"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "लेख्नुहोस्, अहिले सम्म %lu लेख्न छ तर सकिदैन "
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "फाइल बन्द गर्दा समस्या"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "फाइल अनलिङ्क गर्दा समस्या"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "फाइल गुप्तिकरण गर्दा समस्या"
@@ -2443,52 +2454,52 @@ msgstr "प्याकेज फाइल पद वर्णन गर्न
msgid "Unable to parse package file %s (2)"
msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (२)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (पूर्ण dist)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "%s खोलिदैछ"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "लाइन %u स्रोत सूचि %s मा अति लामो छ ।"
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (प्रकार)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (बिक्रता आइडी)"
@@ -2612,17 +2623,17 @@ msgstr "प्याकेज सूचीहरू वा वस्तुस्
msgid "You may want to run apt-get update to correct these problems"
msgstr "यो समस्याहरू सुधार्न तपाईँ apt-get अद्यावधिक चलाउन चाहनुहुन्छ"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "प्राथमिकता फाइलमा अवैध रेकर्ड, कुनै प्याकेज हेडर छैन"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "पिन टाइप %s बुझ्न सकिएन "
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "पिनको लागि कुनै प्राथमिकता (वा शून्य) निर्दिष्ट छैन"
@@ -2707,16 +2718,16 @@ msgstr " %s प्रक्रिया गर्दा त्रुटि द
msgid "Package %s %s was not found while processing file dependencies"
msgstr "फाइल निर्भरताहरू प्रक्रिया गर्दा प्याकेज %s %s फेला परेन"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन "
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "फाइल उपलब्धताहरू संकलन गरिदैछ"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "स्रोत क्यास बचत गर्दा IO त्रुटि"
@@ -2725,20 +2736,20 @@ msgstr "स्रोत क्यास बचत गर्दा IO त्र
msgid "rename failed, %s (%s -> %s)."
msgstr "पुन:नामकरण असफल गरियो, %s (%s -> %s) ।"
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "MD5Sum मेल भएन"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "MD5Sum मेल भएन"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr "निम्न कुञ्जी IDs को लागि कुनै सार्वजनिक कुञ्जी उपलब्ध छैन:\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2747,7 +2758,7 @@ msgstr ""
"%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज "
"निश्चित गर्नुहोस् । (arch हराएरहेको कारणले) "
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2756,13 +2767,13 @@ msgstr ""
"%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज "
"निश्चित गर्नुहोस् ।"
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "प्याकेज अनुक्रमणिका फाइलहरू दूषित भए । प्याकेज %s को लागि कुनै फाइलनाम: फाँट छैन ।"
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "साइज मेल खाएन"
@@ -2896,7 +2907,6 @@ msgstr "हराइरहेको फाइल %i हरू र मेल न
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "कनफिगरेसन फाइल खोलिदैछ %s"
@@ -2927,7 +2937,6 @@ msgstr " %s हटाइदैछ"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr " %s पूर्ण रुपले हट्यो"
@@ -3011,15 +3020,31 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-#, fuzzy
-msgid "Could not patch file"
-msgstr "फाइल %s खोल्न सकिएन"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "जडान असमायिक बन्द भयो"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "कुञ्जी घण्टी पहुँच गर्न सकिएन: '%s'"
+
+#, fuzzy
+#~ msgid "Could not patch file"
+#~ msgstr "फाइल %s खोल्न सकिएन"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/nl.po b/po/nl.po
index 5f37143a6..967869c6e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2008-05-05 18:39+0200\n"
"Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -147,7 +147,7 @@ msgstr " Versietabel:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s voor %s gecompileerd op %s %s\n"
@@ -305,7 +305,7 @@ msgstr ""
" -c=? Lees dit configuratiebestand.\n"
" -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "Kan niet naar %s schrijven"
@@ -443,8 +443,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "DB is verouderd, opwaardering van %s wordt geprobeerd"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"DB-formaat is ongeldig. Als u opgewaardeerd heeft van een oudere versie, van "
@@ -461,11 +462,11 @@ msgstr "Kan het DB-bestand %s niet openen: %s"
msgid "Failed to stat %s"
msgstr "Status opvragen van %s is mislukt"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Archief heeft geen 'control'-record"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Kan geen cursor verkrijgen"
@@ -530,26 +531,26 @@ msgstr "*** Linken van %s aan %s is mislukt"
msgid " DeLink limit of %sB hit.\n"
msgstr " Ontlinklimiet van %sB is bereikt.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "Archief heeft geen 'package'-veld"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s heeft geen voorrangsingang\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s beheerder is %s, niet %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s heeft geen voorrangsingang voor bronpakketten\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s heeft ook geen voorrangsingang voor binaire pakketten\n"
@@ -653,7 +654,7 @@ msgstr "Hernoemen van %s naar %s is mislukt"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex-compilatiefout - %s"
@@ -815,11 +816,11 @@ msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld."
msgid "Internal error, Ordering didn't finish"
msgstr "Interne fout, rangschikken is niet voltooid"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "Kon de ophaalmap niet vergrendelen"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "De lijst van bronnen kon niet gelezen worden."
@@ -850,8 +851,8 @@ msgstr "Door deze operatie zal er %sB extra schijfruimte gebruikt worden.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Door deze operatie zal er %sB schijfruimte vrijkomen.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen"
@@ -888,7 +889,7 @@ msgstr "Afbreken."
msgid "Do you want to continue [Y/n]? "
msgstr "Wilt u doorgaan [J/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ophalen van %s %s is mislukt\n"
@@ -897,7 +898,7 @@ msgstr "Ophalen van %s %s is mislukt\n"
msgid "Some files failed to download"
msgstr "Ophalen van sommige bestanden is mislukt"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "Ophalen klaar en alleen-ophalen-modus staat aan"
@@ -997,35 +998,35 @@ msgstr "Versie '%s' voor '%s' is niet gevonden"
msgid "Selected version %s (%s) for %s\n"
msgstr "Versie %s (%s) geselecteerd voor %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Kon de status van de bronpakketlijst %s niet opvragen"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "De 'update'-opdracht aanvaard geen argumenten"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Kon de lijst-map niet vergrendelen"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "We mogen geen dingen verwijderen, kan AutoRemover niet starten"
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1033,18 +1034,18 @@ msgstr ""
"De volgende pakketten zijn automatisch geïnstalleerd en zijn niet langer "
"nodig:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"De volgende pakketten zijn automatisch geïnstalleerd en zijn niet langer "
"nodig:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "U kunt deze verwijderen via 'apt-get autoremove'."
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1062,45 +1063,45 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "De volgende informatie helpt u mogelijk verder:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Interne fout, AutoRemover heeft dingen stukgemaakt"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "Kon taak %s niet vinden"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "Kon pakket %s niet vinden"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Let op, %s wordt geselecteerd omwille van de regex '%s'\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s is ingesteld voor handmatige installatie.\n"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"U wilt waarschijnlijk 'apt-get -f install' uitvoeren om volgende op te "
"lossen:"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1108,7 +1109,7 @@ msgstr ""
"Er zijn niet-voldane vereisten. U kunt best 'apt-get -f install' uitvoeren "
"zonder pakketten op te geven, (of u kunt zelf een oplossing specificeren)."
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1119,119 +1120,119 @@ msgstr ""
"een onmogelijke situatie gevraagd hebt of dat u de 'unstable'-distributie \n"
"gebruikt en sommige benodigde pakketten nog vastzitten in 'incoming'."
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "Niet-werkende pakketten:"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "De volgende extra pakketten zullen geïnstalleerd worden:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Voorgestelde pakketten:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Aanbevolen pakketten:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "Opwaardering wordt doorgerekend... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Mislukt"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Klaar"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr ""
"U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet "
"worden"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kan geen bronpakket vinden voor %s"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "U heeft niet voldoende vrije schijfruimte op %s"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Moet %sB aan bronarchieven ophalen.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "Ophalen bron %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "Ophalen van sommige archieven is mislukt."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Uitpakopdracht '%s' is mislukt.\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket geïnstalleerd is.\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Bouwopdracht '%s' is mislukt.\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "Dochterproces is mislukt"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"U dient tenminste één pakket op te geven om de bouwvereisten van te "
"controleren"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kan de informatie over de bouwvereisten voor %s niet ophalen"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s heeft geen bouwvereisten.\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1240,7 +1241,7 @@ msgstr ""
"De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
"onvindbaar is"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1249,32 +1250,32 @@ msgstr ""
"De vereiste %s van pakket %s kan niet voldaan worden omdat er geen "
"beschikbare versies zijn van pakket %s die aan de versievereisten voldoen"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Voldoen van Vereiste %s van pakket %s is mislukt: geïnstalleerde versie %s "
"is te nieuw"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Voldoen van de vereiste %s van pakket %s is mislukt: %s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Bouwvereisten voor %s konden niet voldaan worden."
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "Verwerken van de bouwvereisten is mislukt"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "Ondersteunde modules:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1363,7 +1364,7 @@ msgstr ""
"voor meer informatie en opties.\n"
" Deze APT heeft Super Koekrachten.\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1616,11 +1617,10 @@ msgstr "Het bestand %s/%s overschrijft het bestand van pakket %s"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "Kan %s niet lezen"
@@ -1651,9 +1651,9 @@ msgstr ""
"De 'info'- en de 'temp'-mappen dienen op hetzelfde bestandsysteem te staan"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "Pakketlijsten worden ingelezen"
@@ -1789,11 +1789,11 @@ msgid "File not found"
msgstr "Bestand niet gevonden"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "Status opvragen is mislukt"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "Instellen van de aanpassingstijd is mislukt"
@@ -1855,7 +1855,7 @@ msgstr "Verbinding is verlopen"
msgid "Server closed the connection"
msgstr "Verbinding is verbroken door de server"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Leesfout"
@@ -1867,7 +1867,7 @@ msgstr "Een reactie deed de buffer overlopen"
msgid "Protocol corruption"
msgstr "Protocolcorruptie"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Schrijffout"
@@ -1921,7 +1921,7 @@ msgstr "Datasocket verbinding is verlopen"
msgid "Unable to accept connection"
msgstr "Kan de verbinding niet aanvaarden"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Probleem bij het hashen van het bestand"
@@ -1985,64 +1985,69 @@ msgstr "Kon niet verbinden met %s:%s (%s)."
msgid "Connecting to %s"
msgstr "Er wordt verbinding gemaakt met %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "Kon '%s' niet vinden"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Tijdelijke fout bij het opzoeken van '%s'"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Er gebeurde iets raars bij het zoeken naar '%s:%s' (%i)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Kan niet verbinden met %s %s:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "Kon de sleutelring niet benaderen: '%s'"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Installatie wordt afgebroken."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"F: argumentenlijst van Acquire::gpv::Options was te lang. Er wordt "
"afgesloten."
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Interne fout: ondertekening is goed maar kon de vingerafdruk van de sleutel\n"
"niet bepalen?!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "Er is tenminste één ongeldige ondertekening gevonden."
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Kon '%s' niet uitvoeren om ondertekening te verifiëren (is gpgv "
"geïnstalleerd?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "Onbekende fout bij het uitvoeren van gpgv"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "De volgende ondertekeningen waren ongeldig:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2095,49 +2100,49 @@ msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet"
msgid "Unknown date format"
msgstr "Onbekend datumformaat"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "Selectie is mislukt"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "Verbinding verliep"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "Fout bij het schrijven naar het uitvoerbestand"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "Fout bij het schrijven naar bestand"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "Fout bij het schrijven naar het bestand"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Fout bij het lezen van de server, andere kant heeft de verbinding gesloten"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "Fout bij het lezen van de server"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
#, fuzzy
msgid "Failed to truncate file"
msgstr "Wegschrijven van bestand %s is mislukt"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "Foute koptekstdata"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "Verbinding mislukt"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Interne fout"
@@ -2145,18 +2150,25 @@ msgstr "Interne fout"
msgid "Can't mmap an empty file"
msgstr "Kan een leeg bestand niet mmappen"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Kon van %lu bytes geen mmap maken"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2186,54 +2198,54 @@ msgstr ""
msgid "Selection %s not found"
msgstr "Selectie %s niet gevonden"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Onbekende type-afkorting '%c'"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "Configuratiebestand %s wordt geopend"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Syntaxfout %s:%u: Blok start zonder naam."
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntaxfout %s:%u: Verkeerd gevormde markering"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Syntaxfout %s:%u: Extra rommel na waarde"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Syntaxfout %s:%u: Richtlijnen kunnen enkel op het hoogste niveau gegeven "
"worden"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Syntaxfout %s:%u: Teveel geneste invoegingen"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntaxfout %s:%u: Vanaf hier ingevoegd"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Syntaxfout %s:%u: Niet-ondersteunde richtlijn '%s'"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaxfout %s:%u: Extra rommel aan het einde van het bestand"
@@ -2311,78 +2323,78 @@ msgstr "Kan %s niet veranderen"
msgid "Failed to stat the cdrom"
msgstr "Het opvragen van de CD-status is mislukt"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr ""
"Er wordt geen vergrendeling gebruikt voor het alleen-lezen-"
"vergrendelingsbestand %s"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "Kon het vergrendelingsbestand '%s' niet openen"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr ""
"Het via nfs aangekoppelde vergrendelingsbestand %s wordt niet vergrendeld"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "Kon vergrendeling %s niet verkrijgen"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Er is gewacht op %s, maar die kwam niet"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Subproces %s ontving een segmentatiefout."
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "Subproces %s ontving een segmentatiefout."
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Subproces %s gaf de foutcode %u terug"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Subproces %s sloot onverwacht af"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "Kon het bestand %s niet openen"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "lees, de laatste te lezen %lu zijn niet beschikbaar"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "schrijf, de laatste %lu konden niet weggeschreven worden"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Probleem bij het afsluiten van het bestand"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "Probleem bij het ontlinken van het bestand"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "Probleem bij het synchroniseren van het bestand"
@@ -2499,52 +2511,52 @@ msgstr "Kon pakketbestand %s niet ontleden (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Kon pakketbestand %s niet ontleden (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Misvormde regel %lu in bronlijst %s (URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Misvormde regel %lu in bronlijst %s (dist)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Misvormde regel %lu in bronlijst %s (URI parse)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Misvormde regel %lu in bronlijst %s (absolute dist)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Misvormde regel %lu in bronlijst %s (dist parse)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "%s wordt geopend"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Regel %u van de bronlijst %s is te lang."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Misvormde regel %u in bronlijst %s (type)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Type '%s' op regel %u in bronlijst %s is onbekend"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Misvormde regel %u in bronlijst %s (verkopers-ID)"
@@ -2677,17 +2689,17 @@ msgid "You may want to run apt-get update to correct these problems"
msgstr ""
"U kunt misschien 'apt-get update' uitvoeren om deze problemen te verhelpen"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Ongeldige record in het voorkeurenbestand, geen 'Package'-koptekst"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "Pintype %s wordt niet begrepen"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "Er is geen prioriteit (of nul) opgegeven voor deze pin"
@@ -2775,16 +2787,16 @@ msgstr ""
"Pakket %s %s werd niet gevonden bij het verwerken van de "
"bestandsafhankelijkheden"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Kon de status van de bronpakketlijst %s niet opvragen"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "Voorziene bestanden worden verzameld"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakket-cache"
@@ -2793,20 +2805,20 @@ msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakket-cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "herbenoeming is mislukt, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "MD5-som komt niet overeen"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "Hash-som komt niet overeen"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-IDs:\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2815,7 +2827,7 @@ msgstr ""
"Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u "
"dit pakket handmatig moet repareren (wegens missende architectuur)"
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2824,7 +2836,7 @@ msgstr ""
"Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u "
"dit pakket handmatig moet repareren."
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2832,7 +2844,7 @@ msgstr ""
"De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor "
"pakket %s."
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "Grootte komt niet overeen"
@@ -2969,7 +2981,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "Configuratiebestand %s wordt geopend"
@@ -2980,7 +2991,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:542
#, fuzzy, c-format
-#| msgid "Hash Sum mismatch"
msgid "Hash mismatch for: %s"
msgstr "Hash-som komt niet overeen"
@@ -3001,7 +3011,6 @@ msgstr "%s wordt verwijderd"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "%s is volledig verwijderd"
@@ -3087,14 +3096,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Kon bestand niet patchen"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Verbinding werd voortijdig afgebroken"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Kon de sleutelring niet benaderen: '%s'"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Kon bestand niet patchen"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/nn.po b/po/nn.po
index 8508266f1..428d07152 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_nn\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2005-02-14 23:30+0100\n"
"Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
"Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -151,7 +151,7 @@ msgstr " Versjonstabell:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s for %s %s kompilert p %s %s\n"
@@ -308,7 +308,7 @@ msgstr ""
" -c=? Les denne innstillingsfila.\n"
" -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "Klarte ikkje skriva til %s"
@@ -442,7 +442,7 @@ msgstr "DB er for gammal, forskjer oppgradere %s"
#: ftparchive/cachedb.cc:72
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
@@ -457,11 +457,11 @@ msgstr "Klarte ikkje opna DB-fila %s: %s"
msgid "Failed to stat %s"
msgstr "Klarte ikkje f status til %s"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Arkivet har ingen kontrollpost"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Klarte ikkje f peikar"
@@ -526,26 +526,26 @@ msgstr "*** Klarte ikkje lenkja %s til %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-grensa p %sB er ndd.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "Arkivet har ikkje noko pakkefelt"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har inga overstyringsoppfring\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s-vedlikehaldaren er %s, ikkje %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, fuzzy, c-format
msgid " %s has no source override entry\n"
msgstr " %s har inga overstyringsoppfring\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, fuzzy, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s har inga overstyringsoppfring\n"
@@ -649,7 +649,7 @@ msgstr "Klarte ikkje endra namnet p %s til %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex-kompileringsfeil - %s"
@@ -812,11 +812,11 @@ msgstr "Nokre pakkar m fjernast, men fjerning er sltt av."
msgid "Internal error, Ordering didn't finish"
msgstr "Intern feil ved tilleggjing av avleiing"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "Klarte ikkje lsa nedlastingskatalogen"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Kjeldelista kan ikkje lesast."
@@ -845,8 +845,8 @@ msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Du har ikkje nok ledig plass i %s"
@@ -884,7 +884,7 @@ msgstr "Avbryt."
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du halda fram [J/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikkje henta %s %s\n"
@@ -893,7 +893,7 @@ msgstr "Klarte ikkje henta %s %s\n"
msgid "Some files failed to download"
msgstr "Klarte ikkje henta nokre av filene"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "Nedlastinga er ferdig i nedlastingsmodus"
@@ -992,51 +992,51 @@ msgstr "Fann ikkje versjonen %s av %s"
msgid "Selected version %s (%s) for %s\n"
msgstr "Vald versjon %s (%s) for %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Klarte ikkje f status p kjeldepakkelista %s"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "Oppdateringskommandoen tek ingen argument"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Klarte ikkje lsa listekatalogen"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Dei flgjande NYE pakkane vil verta installerte:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "Dei flgjande NYE pakkane vil verta installerte:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1052,44 +1052,44 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "Flgjande informasjon kan hjelpa med lysa situasjonen:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Intern feil. AllUpgrade ydelagde noko"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Intern feil. AllUpgrade ydelagde noko"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Fann ikkje pakken %s"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "Fann ikkje pakken %s"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Merk, vel %s i staden for regex %s\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "men %s skal installerast"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Du vil kanskje prva retta p desse ved kyra apt-get -f install."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1097,7 +1097,7 @@ msgstr ""
"Nokre krav er ikkje oppfylte. Du kan prva apt-get -f install (eller velja "
"ei lysing)."
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1109,123 +1109,123 @@ msgstr ""
"distribusjonen, kan det g henda at nokre av pakkane som trengst ikkje\n"
"er laga enno eller at dei framleis ligg i Incoming."
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "ydelagde pakkar"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "Dei flgjande tilleggspakkane vil verta installerte:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Fresltte pakkar:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Tilrdde pakkar"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "Reknar ut oppgradering ... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Mislukkast"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Ferdig"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern feil. AllUpgrade ydelagde noko"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr "Du m velja minst in pakke som kjeldekoden skal hentast for"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Finn ingen kjeldepakke for %s"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har ikkje nok ledig plass i %s"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "M henta %sB/%sB med kjeldekodearkiv.\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "M henta %sB med kjeldekodearkiv.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "Hent kjeldekode %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "Klarte ikkje henta nokre av arkiva."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Utpakkingskommandoen %s mislukkast.\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggjekommandoen %s mislukkast.\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "Barneprosessen mislukkast"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr "Du m velja minst ein pakke som byggjekrava skal sjekkast for"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Klarte ikkje henta byggjekrav for %s"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen byggjekrav.\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1234,31 +1234,31 @@ msgstr ""
"Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon "
"tilgjengelege versjonar av pakken %s som oppfyller versjonskrava"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "Klarte ikkje behandla byggjekrava"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "Sttta modular:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1342,7 +1342,7 @@ msgstr ""
"til apt-get(8), sources.list(5) og apt.conf(5).\n"
" APT har superku-krefter.\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1587,11 +1587,10 @@ msgstr "Fila %s/%s skriv over den tilsvarande fila i pakken %s"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "Klarte ikkje lesa %s"
@@ -1622,9 +1621,9 @@ msgstr ""
"Infokatalogen og den mellombelse katalogen m vera p det same filsystemet"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "Les pakkelister"
@@ -1761,11 +1760,11 @@ msgid "File not found"
msgstr "Fann ikkje fila"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "Klarte ikkje f status"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "Klarte ikkje setja endringstidspunkt"
@@ -1827,7 +1826,7 @@ msgstr "Tidsavbrot p samband"
msgid "Server closed the connection"
msgstr "Tenaren lukka sambandet"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Lesefeil"
@@ -1839,7 +1838,7 @@ msgstr "Eit svar flaumde over bufferen."
msgid "Protocol corruption"
msgstr "Protokollydeleggjing"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Skrivefeil"
@@ -1893,7 +1892,7 @@ msgstr "Tidsavbrot p tilkopling til datasokkel"
msgid "Unable to accept connection"
msgstr "Klarte ikkje godta tilkoplinga"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem ved oppretting av nkkel for fil"
@@ -1957,59 +1956,64 @@ msgstr "Klarte ikkje kopla til %s:%s (%s)."
msgid "Connecting to %s"
msgstr "Koplar til %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "Klarte ikkje sl opp %s"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Mellombels feil ved oppslag av %s"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Det hende noko dumt ved oppslag av %s:%s (%i)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Klarte ikkje kopla til %s %s:"
-#: methods/gpgv.cc:71
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
#, fuzzy, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "Klarte ikkje sl opp %s"
+msgid "No keyring installed in %s."
+msgstr "Avbryt installasjon."
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
+
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Dei flgjande tilleggspakkane vil verta installerte:"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2058,48 +2062,48 @@ msgstr "Denne HTTP-tenaren har ydelagd sttte for omrde"
msgid "Unknown date format"
msgstr "Ukjend datoformat"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "Utvalet mislukkast"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "Tidsavbrot p sambandet"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "Feil ved skriving til utfil"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "Feil ved skriving til fil"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "Feil ved skriving til fila"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "Feil ved lesing fr tenaren. Sambandet vart lukka i andre enden"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "Feil ved lesing fr tenaren"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
#, fuzzy
msgid "Failed to truncate file"
msgstr "Klarte ikkje skriva fila %s"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "ydelagde hovuddata"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "Sambandet mislukkast"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Intern feil"
@@ -2107,18 +2111,25 @@ msgstr "Intern feil"
msgid "Can't mmap an empty file"
msgstr "Kan ikkje utfra mmap p ei tom fil"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Klarte ikkje laga mmap av %lu byte"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2148,52 +2159,52 @@ msgstr ""
msgid "Selection %s not found"
msgstr "Fann ikkje utvalet %s"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Ukjend typeforkorting: %c"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "Opnar oppsettsfila %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Syntaksfeil %s:%u: Blokka startar utan namn."
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntaksfeil %s:%u: Misforma tagg"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Syntaksfeil %s:%u: Ekstra rot etter verdien"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "Syntaksfeil %s:%u: Direktiva kan berre liggja i det vste nivet"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Syntaksfeil %s:%u: For mange nsta inkluderte filer"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntaksfeil %s:%u: Inkludert herifr"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Syntaksfeil %s:%u: Direktivet %s er ikkje sttta"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaksfeil %s:%u: Ekstra rot til slutt i fila"
@@ -2269,75 +2280,75 @@ msgstr "Klarte ikkje byta til %s"
msgid "Failed to stat the cdrom"
msgstr "Klarte ikkje f status til CD-ROM"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "Brukar ikkje lsing for den skrivebeskytta lsefila %s"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "Klarte ikkje opna lsefila %s"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "Brukar ikkje lsing for den nfs-monterte lsefila %s"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "Klarte ikkje lsa %s"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Venta p %s, men den fanst ikkje"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Underprosessen %s mottok ein segmenteringsfeil."
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "Underprosessen %s mottok ein segmenteringsfeil."
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Underprosessen %s returnerte ein feilkode (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Underprosessen %s avslutta uventa"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "Klarte ikkje opna fila %s"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "lese, har framleis %lu att lesa, men ingen att"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "skrive, har framleis %lu att skrive, men klarte ikkje"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Problem ved lsing av fila"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "Problem ved oppheving av lenkje til fila"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "Problem ved synkronisering av fila"
@@ -2455,52 +2466,52 @@ msgstr "Klarte ikkje tolka pakkefila %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Klarte ikkje tolka pakkefila %s (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Misforma linje %lu i kjeldelista %s (URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Misforma linje %lu i kjeldelista %s (dist)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Misforma linje %lu i kjeldelista %s (absolutt dist)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "Opnar %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linja %u i kjeldelista %s er for lang."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Misforma linje %u i kjeldelista %s (type)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, fuzzy, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typen %s er ukjend i linja %u i kjeldelista %s"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Misforma linje %u i kjeldelista %s (utgjevar-ID)"
@@ -2630,17 +2641,17 @@ msgid "You may want to run apt-get update to correct these problems"
msgstr ""
"Du vil kanskje prva retta p desse problema ved kyra apt-get update."
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Ugyldig oppslag i innstillingsfila, manglar pakkehovud"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "Skjnar ikkje spikringstypen %s"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "Ingen prioritet (eller null) oppgitt for spiker"
@@ -2725,16 +2736,16 @@ msgstr "Feil ved behandling av %s (CollectFileProvides)"
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Fann ikkje pakken %s %s ved behandling av filkrav"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Klarte ikkje f status p kjeldepakkelista %s"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "Samlar inn filtilbod"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "IU-feil ved lagring av kjeldelager"
@@ -2743,20 +2754,20 @@ msgstr "IU-feil ved lagring av kjeldelager"
msgid "rename failed, %s (%s -> %s)."
msgstr "endring av namn mislukkast, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "Feil MD5-sum"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "Feil MD5-sum"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2765,7 +2776,7 @@ msgstr ""
"Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv "
"(fordi arkitekturen manglar)."
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2773,14 +2784,14 @@ msgid ""
msgstr ""
"Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv."
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Pakkeindeksfilene er ydelagde. Feltet Filename: manglar for pakken %s."
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "Feil storleik"
@@ -2914,7 +2925,6 @@ msgstr "Skreiv %i postar med %i manglande filer og %i filer som ikkje passa\n"
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "Opnar oppsettsfila %s"
@@ -3028,15 +3038,32 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-#, fuzzy
-msgid "Could not patch file"
-msgstr "Klarte ikkje opna fila %s"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Sambandet vart uventa stengd"
+#, fuzzy
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Klarte ikkje sl opp %s"
+
+#, fuzzy
+#~ msgid "Could not patch file"
+#~ msgstr "Klarte ikkje opna fila %s"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/pl.po b/po/pl.po
index 30e5741ab..f21b2cf21 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.23.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2009-09-27 03:42+0100\n"
"Last-Translator: Wiktor Wandachowicz <siryes@gmail.com>\n"
"Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -151,7 +151,7 @@ msgstr " Tabela wersji:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s dla %s skompilowany %s %s\n"
@@ -306,7 +306,7 @@ msgstr ""
" -c=? Czyta wskazany plik konfiguracyjny.\n"
" -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "Nie udało się pisać do %s"
@@ -442,8 +442,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "Baza jest przestarzała, próbuję zaktualizować %s"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"Niepoprawny format bazy. Jeśli została zaktualizowana starsza wersja apt, "
@@ -460,11 +461,11 @@ msgstr "Nie udało się otworzyć pliku bazy %s: %s"
msgid "Failed to stat %s"
msgstr "Nie udało się wykonać operacji stat na %s"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Archiwum nie posiada rekordu kontrolnego"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Nie udało się pobrać kursora"
@@ -529,26 +530,26 @@ msgstr "*** Nie udało się dowiązać %s do %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Osiągnięto ograniczenie odłączania %sB.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "Archiwum nie posiadało pola pakietu"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nie posiada wpisu w pliku override\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " opiekunem %s jest %s, a nie %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nie posiada wpisu w pliku override źródeł\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nie posiada również wpisu w pliku override binariów\n"
@@ -652,7 +653,7 @@ msgstr "Nie udało się zmienić nazwy %s na %s"
msgid "Y"
msgstr "T"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "Błąd kompilacji wyrażenia regularnego - %s"
@@ -813,11 +814,11 @@ msgstr "Pakiety powinny zostać usunięte, ale Remove jest wyłączone."
msgid "Internal error, Ordering didn't finish"
msgstr "Błąd wewnętrzny, sortowanie niezakończone"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "Nie udało się zablokować katalogu pobierania"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Nie udało się odczytać list źródeł."
@@ -848,8 +849,8 @@ msgstr "Po tej operacji zostanie dodatkowo użyte %sB miejsca na dysku.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Po tej operacji zostanie zwolnione %sB miejsca na dysku.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nie udało się ustalić ilości wolnego miejsca w %s"
@@ -886,7 +887,7 @@ msgstr "Przerwane."
msgid "Do you want to continue [Y/n]? "
msgstr "Kontynuować [T/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Nie udało się pobrać %s %s\n"
@@ -895,7 +896,7 @@ msgstr "Nie udało się pobrać %s %s\n"
msgid "Some files failed to download"
msgstr "Nie udało się pobrać niektórych plików"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "Ukończono pobieranie w trybie samego pobierania"
@@ -994,35 +995,35 @@ msgstr "Wersja \"%s\" dla \"%s\" nie została znaleziona"
msgid "Selected version %s (%s) for %s\n"
msgstr "Wybrano wersję %s (%s) dla %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Nie udało się wykonać operacji stat na liście pakietów źródłowych %s"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "Polecenie update nie wymaga żadnych argumentów"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Nie udało się zablokować katalogu list"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Nic nie powinno być usuwane, AutoRemover nie zostanie uruchomiony"
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1030,18 +1031,18 @@ msgstr ""
"Następujące pakiety zostały zainstalowane automatycznie i nie są już więcej "
"wymagane:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"%lu pakiety(ów) zostały zainstalowane automatycznie i nie są już więcej "
"wymagane.\n"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Aby je usunąć należy użyć \"apt-get autoremove\"."
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1059,43 +1060,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "Następujące informacje mogą pomóc rozwiązać sytuację:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Błąd wewnętrzny, AutoRemover wszystko popsuł"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Błąd wewnętrzny, AllUpgrade wszystko popsuło"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "Nie udało się odnaleźć zadania %s"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "Nie udało się odnaleźć pakietu %s"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Uwaga, wybieranie %s za wyrażenie \"%s\"\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s zaznaczony jako zainstalowany ręcznie.\n"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić:"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1103,7 +1104,7 @@ msgstr ""
"Niespełnione zależności. Proszę spróbować \"apt-get -f install\" bez "
"pakietów (lub podać rozwiązanie)."
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1115,119 +1116,119 @@ msgstr ""
"w której niektóre pakiety nie zostały jeszcze utworzone lub przeniesione\n"
"z katalogu Incoming (\"Przychodzące\")."
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "Pakiety są uszkodzone"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "Zostaną zainstalowane następujące dodatkowe pakiety:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Sugerowane pakiety:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Polecane pakiety:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "Obliczanie aktualizacji..."
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Nie udało się"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Gotowe"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "Błąd wewnętrzny, rozwiązywanie problemów wszystko popsuło"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Należy podać przynajmniej jeden pakiet, dla którego mają zostać pobrane "
"źródła"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nie udało się odnaleźć źródła dla pakietu %s"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Pomijanie już pobranego pliku \"%s\"\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "W %s nie ma wystarczającej ilości wolnego miejsca"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Konieczne pobranie %sB/%sB archiwów źródeł.\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Konieczne pobranie %sB archiwów źródeł.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "Pobierz źródło %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "Nie udało się pobrać niektórych archiwów."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Pomijanie rozpakowania już rozpakowanego źródła w %s\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Polecenie rozpakowania \"%s\" zawiodło.\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Polecenie budowania \"%s\" zawiodło.\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "Proces potomny zawiódł"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Należy podać przynajmniej jeden pakiet, dla którego mają zostać sprawdzone "
"zależności dla budowania"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nie udało się pobrać informacji o zależnościach dla budowania %s"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nie ma zależności dla budowania.\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1236,7 +1237,7 @@ msgstr ""
"Zależność %s od %s nie może zostać spełniona, ponieważ nie znaleziono "
"pakietu %s"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1245,32 +1246,32 @@ msgstr ""
"Zależność %s od %s nie może zostać spełniona, ponieważ żadna z dostępnych "
"wersji pakietu %s nie ma odpowiedniej wersji"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Nie udało się spełnić zależności %s od %s: Zainstalowany pakiet %s jest zbyt "
"nowy"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Nie udało się spełnić zależności %s od %s: %s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Nie udało się spełnić zależności dla budowania %s."
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "Nie udało się przetworzyć zależności dla budowania"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "Obsługiwane moduły:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1354,7 +1355,7 @@ msgstr ""
"apt-get(8), sources.list(5) i apt.conf(5).\n"
" Ten APT ma moce Super Krowy.\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1607,11 +1608,10 @@ msgstr "Plik %s/%s nadpisuje plik w pakiecie %s"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "Nie można czytać %s"
@@ -1641,9 +1641,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Pliki info i katalog tymczasowy muszą być na tym samym systemie plików"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "Czytanie list pakietów"
@@ -1779,11 +1779,11 @@ msgid "File not found"
msgstr "Nie odnaleziono pliku"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "Nie udało się wykonać operacji stat"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "Nie udało się ustawić czasu modyfikacji"
@@ -1847,7 +1847,7 @@ msgstr "Przekroczenie czasu połączenia"
msgid "Server closed the connection"
msgstr "Serwer zamknął połączenie"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Błąd odczytu"
@@ -1859,7 +1859,7 @@ msgstr "Odpowiedź przepełniła bufor."
msgid "Protocol corruption"
msgstr "Naruszenie zasad protokołu"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Błąd zapisu"
@@ -1913,7 +1913,7 @@ msgstr "Przekroczony czas połączenia gniazda danych"
msgid "Unable to accept connection"
msgstr "Nie udało się przyjąć połączenia"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Nie udało się obliczyć skrótu pliku"
@@ -1977,62 +1977,67 @@ msgstr "Nie udało się połączyć z %s:%s (%s)."
msgid "Connecting to %s"
msgstr "Łączenie z %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nie udało się przetłumaczyć nazwy \"%s\""
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Tymczasowy błąd przy tłumaczeniu \"%s\""
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Coś niewłaściwego stało się przy tłumaczeniu \"%s:%s\" (%i)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Nie udało się połączyć z %s %s:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "Nie udało się uzyskać dostępu do bazy kluczy: \"%s\""
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Przerywanie instalacji"
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "E: Lista argumentów Acquire::gpgv::Options zbyt długa. Zakończenie."
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Błąd wewnętrzny: Prawidłowy podpis, ale nie nie udało się ustalić odcisku "
"klucza?!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "Napotkano przynajmniej jeden nieprawidłowy podpis."
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Nie udało się uruchomić \"%s\" by zweryfikować podpis (czy gpgv jest "
"zainstalowane?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "Nieznany błąd podczas uruchamiania gpgv"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "Następujące podpisy były błędne:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2083,47 +2088,47 @@ msgstr "Ten serwer HTTP nieprawidłowo obsługuje zakresy (ranges)"
msgid "Unknown date format"
msgstr "Nieznany format daty"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "Operacja select nie powiodła się"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "Przekroczenie czasu połączenia"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "Błąd przy pisaniu do pliku wyjściowego"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "Błąd przy pisaniu do pliku"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "Błąd przy pisaniu do pliku"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "Błąd czytania z serwera: Zdalna strona zamknęła połączenie"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "Błąd czytania z serwera"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr "Nie udało się uciąć zawartości pliku %s"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "Błędne dane nagłówka"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "Połączenie nie udało się"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Błąd wewnętrzny"
@@ -2131,12 +2136,12 @@ msgstr "Błąd wewnętrzny"
msgid "Can't mmap an empty file"
msgstr "Nie można wykonać mmap na pustym pliku"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nie udało się wykonać mmap %lu bajtów"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2145,6 +2150,13 @@ msgstr ""
"Brak miejsca dla dynamicznego MMap. Proszę zwiększyć rozmiar APT::Cache-"
"Limit. Aktualna wartość: %lu. (man 5 apt.conf)"
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2174,53 +2186,53 @@ msgstr "%lis"
msgid "Selection %s not found"
msgstr "Nie odnaleziono wyboru %s"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Nierozpoznany skrót typu: \"%c\""
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "Otwieranie pliku konfiguracyjnego %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Błąd składniowy %s:%u: Blok nie zaczyna się nazwą."
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Błąd składniowy %s:%u: Błędny znacznik"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Błąd składniowy %s:%u: Po wartości występują śmieci"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Błąd składniowy %s:%u: Dyrektywy mogą występować tylko na najwyższym poziomie"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Błąd składniowy %s:%u: Zbyt wiele zagnieżdżonych operacji include"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Błąd składniowy %s:%u: Włączony tutaj"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Błąd składniowy %s:%u: Nieobsługiwana dyrektywa \"%s\""
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Błąd składniowy %s:%u: Śmieci na końcu pliku"
@@ -2296,75 +2308,75 @@ msgstr "Nie udało się przejść do %s"
msgid "Failed to stat the cdrom"
msgstr "Nie udało się wykonać operacji stat na CDROM-ie"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "Dla pliku blokady %s tylko do odczytu nie zostanie użyta blokada"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "Nie udało się otworzyć pliku blokady %s"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "Dla pliku blokady %s montowanego przez NFS nie zostanie użyta blokada"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "Nie udało się uzyskać blokady %s"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Oczekiwano na proces %s, ale nie było go"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Podproces %s spowodował naruszenie segmentacji."
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, c-format
msgid "Sub-process %s received signal %u."
msgstr "Podproces %s dostał sygnał %u."
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Podproces %s zwrócił kod błędu (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Podproces %s zakończył się niespodziewanie"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "Nie udało się otworzyć pliku %s"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "należało przeczytać jeszcze %lu, ale nic nie zostało"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "należało zapisać jeszcze %lu, ale nie udało się to"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Problem przy zamykaniu pliku"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "Problem przy usuwaniu pliku"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "Problem przy zapisywaniu pliku na dysk"
@@ -2481,52 +2493,52 @@ msgstr "Nie udało się zanalizować pliku pakietu %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Nie udało się zanalizować pliku pakietu %s (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Nieprawidłowa linia %lu w liście źródeł %s (URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Nieprawidłowa linia %lu w liście źródeł %s (dystrybucja)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza URI)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Nieprawidłowa linia %lu w liście źródeł %s (bezwzględna dystrybucja)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza dystrybucji)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "Otwieranie %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linia %u w liście źródeł %s jest zbyt długa."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Nieprawidłowa linia %u w liście źródeł %s (identyfikator producenta)"
@@ -2652,17 +2664,17 @@ msgstr "Nie udało się otworzyć lub zanalizować zawartości list pakietów."
msgid "You may want to run apt-get update to correct these problems"
msgstr "Należy uruchomić apt-get update aby naprawić te problemy."
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Nieprawidłowe informacje w pliku ustawień %s, brak nagłówka Package"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "Nierozpoznany typ przypinania %s"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "Brak (lub zerowy) priorytet przypięcia"
@@ -2749,16 +2761,16 @@ msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"Pakiet %s %s nie został odnaleziony podczas przetwarzania zależności plików"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Nie udało się wykonać operacji stat na liście pakietów źródłowych %s"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "Zbieranie zapewnień plików"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "Błąd wejścia/wyjścia przy zapisywaniu podręcznego magazynu źródeł"
@@ -2767,19 +2779,19 @@ msgstr "Błąd wejścia/wyjścia przy zapisywaniu podręcznego magazynu źróde
msgid "rename failed, %s (%s -> %s)."
msgstr "nie udało się zmienić nazwy, %s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "Błędna suma MD5"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "Błędna suma kontrolna"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr "Dla następujących identyfikatorów kluczy brakuje klucza publicznego:\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2788,7 +2800,7 @@ msgstr ""
"Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba "
"będzie ręcznie naprawić ten pakiet (z powodu brakującej architektury)."
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2797,14 +2809,14 @@ msgstr ""
"Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba "
"będzie ręcznie naprawić ten pakiet."
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Pliki indeksu pakietów są uszkodzone. Brak pola Filename: dla pakietu %s."
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "Błędny rozmiar"
@@ -2941,7 +2953,6 @@ msgstr "Zapisano %i rekordów z %i brakującymi plikami i %i niepasującymi\n"
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "Otwieranie pliku konfiguracyjnego %s"
@@ -2952,7 +2963,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:542
#, fuzzy, c-format
-#| msgid "Hash Sum mismatch"
msgid "Hash mismatch for: %s"
msgstr "Błędna suma kontrolna"
@@ -2973,7 +2983,6 @@ msgstr "Usuwanie %s"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "Całkowicie usunięto %s"
@@ -3064,14 +3073,30 @@ msgstr ""
msgid "Not locked"
msgstr "Nie zablokowany"
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Nie udało się nałożyć łatki na plik"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Połączenie zostało zamknięte przedwcześnie"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Nie udało się uzyskać dostępu do bazy kluczy: \"%s\""
+
+#~ msgid "Could not patch file"
+#~ msgstr "Nie udało się nałożyć łatki na plik"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/pt.po b/po/pt.po
index 3eff616bd..4026e76ff 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2008-09-09 20:54+0100\n"
"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -147,7 +147,7 @@ msgstr " Tabela de Versão:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s para %s compilado em %s %s\n"
@@ -304,7 +304,7 @@ msgstr ""
" -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "Não conseguiu escrever para %s"
@@ -438,8 +438,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "A base de dados é antiga, a tentar actualizar %s"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"O formato da base de dados é inválido. Se actualizou a partir de uma versão "
@@ -456,11 +457,11 @@ msgstr "Não foi possível abrir o ficheiro %s da base de dados: %s"
msgid "Failed to stat %s"
msgstr "Falha stat %s"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "O arquivo não tem registro de controlo"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Não foi possível obter um cursor"
@@ -525,26 +526,26 @@ msgstr "*** Falhou ligar %s a %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Limite DeLink de %sB atingido.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "Arquivo não possuía campo package"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s não possui entrada override\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " o maintainer de %s é %s, não %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s não possui fonte de entrada de 'override'\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s também não possui entrada binária de 'override'\n"
@@ -648,7 +649,7 @@ msgstr "Falhou renomear %s para %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro de compilação de regex - %s"
@@ -809,11 +810,11 @@ msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado."
msgid "Internal error, Ordering didn't finish"
msgstr "Erro Interno, Ordering não terminou"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "Impossível criar acesso exclusivo ao directório de downloads"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "A lista de fontes não pôde ser lida."
@@ -844,8 +845,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Após esta operação, será libertado %sB de espaço em disco.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Não foi possível determinar o espaço livre em %s"
@@ -882,7 +883,7 @@ msgstr "Abortado."
msgid "Do you want to continue [Y/n]? "
msgstr "Deseja continuar [Y/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falhou obter %s %s\n"
@@ -891,7 +892,7 @@ msgstr "Falhou obter %s %s\n"
msgid "Some files failed to download"
msgstr "Falhou o download de alguns ficheiros"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "Download completo e em modo de fazer apenas o download"
@@ -990,35 +991,35 @@ msgstr "Não foi encontrada a versão '%s' para '%s'"
msgid "Selected version %s (%s) for %s\n"
msgstr "Versão seleccionada %s (%s) para %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Não foi possível executar stat à lista de pacotes de código fonte %s"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "O comando update não leva argumentos"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Impossível criar acesso exclusivo ao directório de listas"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Não é suposto nós apagarmos coisas, não pode iniciar o AutoRemover"
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1026,18 +1027,18 @@ msgstr ""
"Os seguintes pacotes foram instalados automaticamente e já não são "
"necessários:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"Os seguintes pacotes foram instalados automaticamente e já não são "
"necessários:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Utilize 'apt-get autoremove' para os remover."
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1055,43 +1056,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "A seguinte informação pode ajudar a resolver a situação:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Erro Interno, o AutoRemover estragou coisas"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Erro Interno, AllUpgrade estragou algo"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "Não foi possível encontrar a tarefa %s"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossível encontrar o pacote %s"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Note, a seleccionar %s para a expressão regular '%s'\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s está definido para ser instalado manualmente.\n"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Você deve querer executar `apt-get -f install' para corrigir estes:"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1099,7 +1100,7 @@ msgstr ""
"Dependências não satisfeitas. Tente `apt-get -f install' sem nenhum pacote "
"(ou especifique uma solução)."
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1111,119 +1112,119 @@ msgstr ""
"distribuição unstable em que alguns pacotes pedidos ainda não foram \n"
"criados ou foram movidos do Incoming."
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "Pacotes estragados"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "Os seguintes pacotes extra serão instalados:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Pacotes sugeridos:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Pacotes recomendados:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "A calcular a actualização... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Falhou"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Pronto"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "Erro Interno, o solucionador de problemas estragou coisas"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr "Tem de especificar pelo menos um pacote para obter o código fonte de"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Não foi possível encontrar um pacote de código fonte para %s"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "A saltar o ficheiro '%s', já tinha sido feito download'\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Você não possui espaço livre suficiente em %s"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "É necessário obter %sB/%sB de arquivos de código fonte.\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "É necessário obter %sB de arquivos de código fonte.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter código fonte %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "Falhou obter alguns arquivos."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"A saltar a descompactação do pacote de código fonte já descompactado em %s\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "O comando de descompactação '%s' falhou.\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "O comando de compilação '%s' falhou.\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "O processo filho falhou"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Deve especificar pelo menos um pacote para verificar as dependências de "
"compilação"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"Não foi possível obter informações de dependências de compilação para %s"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s não tem dependências de compilação.\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1232,7 +1233,7 @@ msgstr ""
"a dependência de %s para %s não pôde ser satisfeita porque o pacote %s não "
"pôde ser encontrado"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1241,32 +1242,32 @@ msgstr ""
"a dependência de %s para %s não pode ser satisfeita porque nenhuma versão "
"disponível do pacote %s pode satisfazer os requisitos de versão"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Falha ao satisfazer a dependência %s para %s: O pacote instalado %s é "
"demasiado novo"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Falha ao satisfazer a dependência %s para %s: %s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Não foi possível satisfazer as dependências de compilação para %s."
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "Falhou processar as dependências de compilação"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "Módulos Suportados:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1353,7 +1354,7 @@ msgstr ""
"sources.list(5) e apt.conf(5)\n"
" Este APT tem Poderes de Super Vaca.\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1604,11 +1605,10 @@ msgstr "O ficheiro %s/%s substitui o que está no pacote %s"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "Não foi possível ler %s"
@@ -1639,9 +1639,9 @@ msgstr ""
"Os directórios info e temp precisam estar no mesmo sistema de ficheiros"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "A ler as listas de pacotes"
@@ -1775,11 +1775,11 @@ msgid "File not found"
msgstr "Ficheiro não encontrado"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "Falhou o stat"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "Falhou definir hora de modificação"
@@ -1841,7 +1841,7 @@ msgstr "Foi atingido o tempo limite de ligação"
msgid "Server closed the connection"
msgstr "O servidor fechou a ligação"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Erro de leitura"
@@ -1853,7 +1853,7 @@ msgstr "Uma resposta sobrecarregou o buffer"
msgid "Protocol corruption"
msgstr "Corrupção de protocolo"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Erro de escrita"
@@ -1907,7 +1907,7 @@ msgstr "Ligação de socket de dados expirou"
msgid "Unable to accept connection"
msgstr "Impossível aceitar ligação"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema ao calcular o hash do ficheiro"
@@ -1971,63 +1971,68 @@ msgstr "Não foi possível ligar em %s:%s (%s)."
msgid "Connecting to %s"
msgstr "A ligar a %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "Não foi possível resolver '%s'"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Falha temporária a resolver '%s'"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Não foi possível ligar a %s %s:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "Não foi possível aceder à 'keyring': '%s'"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "A abortar a instalação."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"E: A lista de argumentos de Acquire::gpgv::Options é demasiado longa. A sair."
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Erro interno: Assinatura válida, mas não foi possível determinar a impressão "
"digital da chave?!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "Pelo menos uma assinatura inválida foi encontrada."
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Não foi possível executar '%s' para verificar a assinatura (o gpgv está "
"instalado?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "Erro desconhecido ao executar gpgv"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "As seguintes assinaturas eram inválidas:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2078,47 +2083,47 @@ msgstr "Este servidor HTTP possui suporte de range errado"
msgid "Unknown date format"
msgstr "Formato de data desconhecido"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "A selecção falhou"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "O tempo da ligação expirou"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "Erro ao escrever para o ficheiro de saída"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "Erro ao escrever para ficheiro"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "Erro ao escrever para o ficheiro"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "Erro ao ler do servidor. O lado remoto fechou a ligação"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "Erro ao ler do servidor"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr "Falhou truncar o ficheiro"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "Dados de cabeçalho errados"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "A ligação falhou"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Erro interno"
@@ -2126,18 +2131,25 @@ msgstr "Erro interno"
msgid "Can't mmap an empty file"
msgstr "Não é possível fazer mmap a um ficheiro vazio"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Não foi possível fazer mmap de %lu bytes"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2167,53 +2179,53 @@ msgstr ""
msgid "Selection %s not found"
msgstr "A selecção %s não foi encontrada"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Abreviatura de tipo desconhecida: '%c'"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "A abrir o ficheiro de configuração %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Erro de sintaxe %s:%u: O bloco começa sem nome."
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Erro de sintaxe %s:%u: Tag malformada"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Erro de sintaxe %s:%u: Lixo extra depois do valor"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Erro de sintaxe %s:%u: Directivas só podem ser feitas no nível mais alto"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Erro de sintaxe %s:%u: Demasiados includes encadeados"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Erro de sintaxe %s:%u: Incluído a partir deste ponto"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Erro de sintaxe %s:%u: Directiva '%s' não suportada"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Erro de sintaxe %s:%u: Lixo extra no final do ficheiro"
@@ -2289,78 +2301,78 @@ msgstr "Impossível mudar para %s"
msgid "Failed to stat the cdrom"
msgstr "Impossível executar stat ao cdrom"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr ""
"Não está a ser utilizado acesso exclusivo para apenas leitura ao ficheiro %s"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "Não foi possível abrir ficheiro de lock %s"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr ""
"Não está a ser utilizado o acesso exclusivo para o ficheiro %s, montado via "
"nfs"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "Não foi possível obter acesso exclusivo a %s"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperou por %s mas não estava lá"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "O sub-processo %s recebeu uma falha de segmentação."
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "O sub-processo %s recebeu uma falha de segmentação."
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "O sub-processo %s retornou um código de erro (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "O sub-processo %s terminou inesperadamente"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "Não foi possível abrir ficheiro o %s"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "lido, ainda restam %lu para serem lidos mas não resta nenhum"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "escrito, ainda restam %lu para escrever mas não foi possível"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Problema ao fechar o ficheiro"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "Problema ao remover o link ao ficheiro"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "Problema sincronizando o ficheiro"
@@ -2477,52 +2489,52 @@ msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Não foi possível fazer parse ao ficheiro de pacote %s (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Linha malformada %lu na lista de fontes %s (URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Linha malformada %lu na lista de fontes %s (distribuição)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Linha malformada %lu na lista de fontes %s (parse de URI)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Linha malformada %lu na lista de fontes %s (distribuição absoluta)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Linha malformada %lu na lista de fontes %s (dist parse)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "A abrir %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linha %u é demasiado longa na lista de fontes %s."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Linha malformada %u na lista de fontes %s (tipo)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Linha malformada %u na lista de fontes %s (id de fornecedor)"
@@ -2655,17 +2667,17 @@ msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr "Você terá que executar apt-get update para corrigir estes problemas"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Registro inválido no ficheiro de preferências, sem cabeçalho Package"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "Não foi possível entender o tipo de marca (pin) %s"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "Nenhuma prioridade (ou zero) especificada para marcação (pin)"
@@ -2755,16 +2767,16 @@ msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"O pacote %s %s não foi encontrado ao processar as dependências de ficheiros"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Não foi possível executar stat à lista de pacotes de código fonte %s"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "A obter File Provides"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "Erro de I/O ao gravar a cache de código fonte"
@@ -2773,21 +2785,21 @@ msgstr "Erro de I/O ao gravar a cache de código fonte"
msgid "rename failed, %s (%s -> %s)."
msgstr "falhou renomear, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "MD5Sum não coincide"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "Código de verificação hash não coincide"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Não existe qualquer chave pública disponível para as seguintes IDs de "
"chave:\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2797,7 +2809,7 @@ msgstr ""
"significar que você precisa corrigir manualmente este pacote. (devido a "
"arquitectura em falta)"
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2806,7 +2818,7 @@ msgstr ""
"Não foi possível localizar arquivo para o pacote %s. Isto pode significar "
"que você precisa consertar manualmente este pacote."
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2814,7 +2826,7 @@ msgstr ""
"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
"para o pacote %s."
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "Tamanho incorrecto"
@@ -2951,7 +2963,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "A abrir o ficheiro de configuração %s"
@@ -2962,7 +2973,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:542
#, fuzzy, c-format
-#| msgid "Hash Sum mismatch"
msgid "Hash mismatch for: %s"
msgstr "Código de verificação hash não coincide"
@@ -2983,7 +2993,6 @@ msgstr "A remover %s"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "Remoção completa de %s"
@@ -3069,14 +3078,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Não foi possível aplicar o 'patch' ao ficheiro"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Ligação encerrada prematuramente"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Não foi possível aceder à 'keyring': '%s'"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Não foi possível aplicar o 'patch' ao ficheiro"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6ca0c52ff..b02214a9b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2008-11-17 02:33-0200\n"
"Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -149,7 +149,7 @@ msgstr " Tabela de versão:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s para %s compilado em %s %s\n"
@@ -308,7 +308,7 @@ msgstr ""
" -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "Impossível escrever para %s"
@@ -443,8 +443,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "BD é antigo, tentando atualizar %s"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"Formato do BD é inválido. Se você atualizou a partir de uma versão antiga do "
@@ -461,11 +462,11 @@ msgstr "Impossível abrir o arquivo BD %s: %s"
msgid "Failed to stat %s"
msgstr "Falhou ao executar \"stat\" %s"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Repositório não possui registro de controle"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Impossível obter um cursor"
@@ -530,26 +531,26 @@ msgstr "*** Falhou ao ligar %s a %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Limite DeLink de %sB atingido.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "Repositório não possuía campo pacote"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s não possui entrada override\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " mantenedor de %s é %s, não %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s não possui entrada override fonte\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s também não possui entrada override binária\n"
@@ -653,7 +654,7 @@ msgstr "Falhou ao renomear %s para %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro de compilação de regex - %s"
@@ -815,11 +816,11 @@ msgstr "Pacotes precisam ser removidos mas a remoção está desabilitada."
msgid "Internal error, Ordering didn't finish"
msgstr "Erro interno, Ordenação não finalizou"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "Impossível criar trava no diretório de download"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "A lista de fontes não pode ser lida."
@@ -851,8 +852,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Depois desta operação, %sB de espaço em disco serão liberados.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Não foi possível determinar o espaço livre em %s"
@@ -889,7 +890,7 @@ msgstr "Abortar."
msgid "Do you want to continue [Y/n]? "
msgstr "Você quer continuar [S/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falhou ao buscar %s %s\n"
@@ -898,7 +899,7 @@ msgstr "Falhou ao buscar %s %s\n"
msgid "Some files failed to download"
msgstr "Alguns arquivos falharam ao baixar"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "Baixar completo e no modo somente baixar (\"download only\")"
@@ -995,35 +996,35 @@ msgstr "Versão '%s' para '%s' não foi encontrada"
msgid "Selected version %s (%s) for %s\n"
msgstr "Versão selecionada %s (%s) para %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Não foi possível executar \"stat\" na lista de pacotes fonte %s"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "O comando update não leva argumentos"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Impossível criar trava no diretório de listas"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Nós não deveríamos apagar coisas, impossível iniciar AutoRemover"
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1031,18 +1032,18 @@ msgstr ""
"Os seguintes pacotes foram automaticamente instalados e não são mais "
"requeridos:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"Os seguintes pacotes foram automaticamente instalados e não são mais "
"requeridos:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Use 'apt-get autoremove' para removê-los."
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1060,43 +1061,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "A informação a seguir pode ajudar a resolver a situação:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Erro Interno, o AutoRemover quebrou coisas"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Erro interno, AllUpgrade quebrou coisas"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "Impossível achar tarefa %s"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossível achar pacote %s"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, selecionando %s para expressão regular '%s'\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s configurado para instalar manualmente.\n"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Você deve querer executar 'apt-get -f install' para corrigí-los:"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1104,7 +1105,7 @@ msgstr ""
"Dependências desencontradas. Tente 'apt-get -f install' sem nenhum pacote "
"(ou especifique uma solução)."
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1116,117 +1117,117 @@ msgstr ""
"distribuição instável, que alguns pacotes requeridos não foram\n"
"criados ainda ou foram retirados da \"Incoming\"."
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "Pacotes quebrados"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "Os pacotes extra a seguir serão instalados:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Pacotes sugeridos:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Pacotes recomendados:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "Calculando atualização... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Falhou"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Pronto"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "Erro interno, o solucionador de problemas quebrou coisas"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossível encontrar um pacote fonte para %s"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Pulando arquivo já baixado '%s'\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Você não possui espaço livre suficiente em %s"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Preciso obter %sB/%sB de arquivos fonte.\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Preciso obter %sB de arquivos fonte.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter fonte %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "Falhou ao buscar alguns arquivos."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Pulando o desempacotamento de fontes já desempacotados em %s\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comando de desempacotamento '%s' falhou.\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comando de construção '%s' falhou.\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "Processo filho falhou"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Deve-se especificar pelo menos um pacote para que se cheque as dependências "
"de construção"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Impossível conseguir informações de dependência de construção para %s"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s não tem dependências de construção.\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1235,7 +1236,7 @@ msgstr ""
"a dependência de %s por %s não pode ser satisfeita porque o pacote %s não "
"pode ser encontrado"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1244,32 +1245,32 @@ msgstr ""
"a dependência de %s por %s não pode ser satisfeita porque nenhuma versão "
"disponível do pacote %s pode satisfazer os requerimentos de versão"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Falhou ao satisfazer a dependência de %s por %s: Pacote instalado %s é muito "
"novo"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Falhou ao satisfazer a dependência de %s por %s: %s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Não foi possível satisfazer as dependências de compilação para %s."
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "Falhou ao processar as dependências de construção"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "Módulos para os quais há suporte:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1355,7 +1356,7 @@ msgstr ""
"para mais informações e opções.\n"
" Este APT tem Poderes de Super Vaca.\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1607,11 +1608,10 @@ msgstr "Arquivo %s/%s sobrescreve arquivo no pacote %s"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "Impossível ler %s"
@@ -1641,9 +1641,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Os diretórios info e temp precisam estar no mesmo sistema de arquivos"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "Lendo listas de pacotes"
@@ -1778,11 +1778,11 @@ msgid "File not found"
msgstr "Arquivo não encontrado"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "Falhou ao executar \"stat\""
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "Falhou ao definir hora de modificação"
@@ -1844,7 +1844,7 @@ msgstr "Conexão expirou"
msgid "Server closed the connection"
msgstr "Servidor fechou a conexão"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Erro de leitura"
@@ -1856,7 +1856,7 @@ msgstr "Uma resposta sobrecarregou o buffer"
msgid "Protocol corruption"
msgstr "Corrupção de protocolo"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Erro de escrita"
@@ -1910,7 +1910,7 @@ msgstr "Conexão do socket de dados expirou"
msgid "Unable to accept connection"
msgstr "Impossível aceitar conexão"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema criando o hash do arquivo"
@@ -1974,63 +1974,68 @@ msgstr "Não foi possível conectar em %s:%s (%s)."
msgid "Connecting to %s"
msgstr "Conectando a %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "Não foi possível resolver '%s'"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Falha temporária resolvendo '%s'"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Impossível conectar em %s %s:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "Não foi possível acessar o chaveiro: '%s'"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Abortando instalação."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"E: Lista de argumentos de Acquire::gpgv::Options muito extensa. Saindo."
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Erro interno: Assinatura boa, mas não foi possível determinar a impressão "
"digital da chave?!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "Ao menos uma assinatura inválida foi encontrada."
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Não foi possível executar '%s' para verificar a assinatura (o gpgv está "
"instalado?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "Erro desconhecido executando gpgv"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "As seguintes assinaturas eram inválidas:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2081,47 +2086,47 @@ msgstr "Este servidor HTTP possui suporte a \"range\" quebrado"
msgid "Unknown date format"
msgstr "Formato de data desconhecido"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "Seleção falhou"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "Conexão expirou"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "Erro escrevendo para arquivo de saída"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "Erro escrevendo para arquivo"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "Erro escrevendo para o arquivo"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "Erro lendo do servidor"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr "Falhou ao truncar arquivo"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "Dados de cabeçalho ruins"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "Conexão falhou"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Erro interno"
@@ -2129,18 +2134,25 @@ msgstr "Erro interno"
msgid "Can't mmap an empty file"
msgstr "Não foi possível fazer \"mmap\" de um arquivo vazio"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Não foi possível fazer \"mmap\" de %lu bytes"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2170,53 +2182,53 @@ msgstr ""
msgid "Selection %s not found"
msgstr "Seleção %s não encontrada"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Abreviação de tipo desconhecida: '%c'"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "Abrindo arquivo de configuração %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Erro de sintaxe %s:%u: Bloco inicia sem nome."
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Erro de sintaxe %s:%u: Tag mal formada"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Erro de sintaxe %s:%u: Lixo extra depois do valor"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Erro de sintaxe %s:%u: Diretivas podem ser feitas somente no nível mais alto"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Erro de sintaxe %s:%u: Muitos \"includes\" aninhados"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Erro de sintaxe %s:%u: Incluído a partir deste ponto"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Erro de sintaxe %s:%u: Não há suporte para a diretiva '%s'"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Erro de sintaxe %s:%u: Lixo extra no final do arquivo"
@@ -2293,75 +2305,75 @@ msgstr "Impossível mudar para %s"
msgid "Failed to stat the cdrom"
msgstr "Impossível executar \"stat\" no cdrom"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "Não usando travamento para arquivo de trava somente leitura %s"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "Não foi possível abrir arquivo de trava %s"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "Não usando travamento para arquivo de trava montado via nfs %s"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "Não foi possível obter trava %s"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperado %s mas este não estava lá"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Sub-processo %s recebeu uma falha de segmentação."
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "Sub-processo %s recebeu uma falha de segmentação."
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Sub-processo %s retornou um código de erro (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Sub-processo %s finalizou inesperadamente"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "Não foi possível abrir arquivo %s"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "leitura, ainda restam %lu para serem lidos mas nenhum deixado"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "escrita, ainda restam %lu para gravar mas não foi possível"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Problema fechando o arquivo"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "Problema removendo o arquivo"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "Problema sincronizando o arquivo"
@@ -2478,53 +2490,53 @@ msgstr "Impossível analisar arquivo de pacote %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Impossível analisar arquivo de pacote %s (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Linha mal formada %lu no arquivo de fontes %s (URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Linha mal formada %lu no arquivo de fontes %s (análise de URI)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição absoluta)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "Abrindo %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linha %u muito longa na lista de fontes %s."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Linha mal formada %u no arquivo de fontes %s (tipo)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Linha mal formada %u na lista de fontes %s (id de fornecedor)"
@@ -2654,17 +2666,17 @@ msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr "Você terá que executar apt-get update para corrigir estes problemas"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Registro inválido no arquivo de preferências, sem cabeçalho Package"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "Não foi possível entender o tipo de \"pin\" %s"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "Nenhuma prioridade (ou zero) especificada para \"pin\""
@@ -2754,16 +2766,16 @@ msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"Pacote %s %s não foi encontrado enquanto processando dependências de arquivo"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Não foi possível executar \"stat\" na lista de pacotes fonte %s"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "Coletando Arquivo \"Provides\""
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "Erro de E/S ao gravar cache fonte"
@@ -2772,19 +2784,19 @@ msgstr "Erro de E/S ao gravar cache fonte"
msgid "rename failed, %s (%s -> %s)."
msgstr "renomeação falhou, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "MD5Sum incorreto"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "Hash Sum incorreto"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr "Não existem chaves públicas para os seguintes IDs de chaves:\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2794,7 +2806,7 @@ msgstr ""
"que você precisa consertar manualmente este pacote. (devido a arquitetura "
"não especificada)."
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2803,7 +2815,7 @@ msgstr ""
"Não foi possível localizar arquivo para o pacote %s. Isto pode significar "
"que você precisa consertar manualmente este pacote."
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2811,7 +2823,7 @@ msgstr ""
"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo \"Filename:"
"\" para o pacote %s."
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "Tamanho incorreto"
@@ -2948,7 +2960,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "Abrindo arquivo de configuração %s"
@@ -2959,7 +2970,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:542
#, fuzzy, c-format
-#| msgid "Hash Sum mismatch"
msgid "Hash mismatch for: %s"
msgstr "Hash Sum incorreto"
@@ -2980,7 +2990,6 @@ msgstr "Removendo %s"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "%s completamente removido"
@@ -3064,14 +3073,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Não foi possível aplicar o patch"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Conexão encerrada prematuramente"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Não foi possível acessar o chaveiro: '%s'"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Não foi possível aplicar o patch"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/ro.po b/po/ro.po
index 776668d7e..f99371e7f 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ro\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2008-11-15 02:21+0200\n"
"Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
"Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -150,7 +150,7 @@ msgstr " Tabela de versiuni:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s pentru %s compilat la %s %s\n"
@@ -304,7 +304,7 @@ msgstr ""
" -c=? Citește acest fișier de configurare\n"
" -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "Nu s-a putut scrie în %s"
@@ -445,8 +445,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "DB este vechi, se încearcă înnoirea %s"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"Formatul DB este nevalid. Dacă l-ați înnoit pe apt de la o versiune mai "
@@ -463,11 +464,11 @@ msgstr "Nu s-a putut deschide fișierul DB %s: %s"
msgid "Failed to stat %s"
msgstr "Eșec la „stat” pentru %s"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Arhiva nu are înregistrare de control"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Nu s-a putut obține un cursor"
@@ -532,26 +533,26 @@ msgstr "*** Eșec la „link” între %s și %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Limita de %sB a dezlegării a fost atinsă.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "Arhiva nu are câmp de pachet"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nu are intrare de înlocuire\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s responsabil este %s nu %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nu are nici o intrare sursă de înlocuire\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nu are nici intrare binară de înlocuire\n"
@@ -655,7 +656,7 @@ msgstr "Eșec la redenumirea lui %s în %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "Eroare de compilare expresie regulată - %s"
@@ -816,11 +817,11 @@ msgstr "Pachete trebuiesc șterse dar ștergerea este dezactivată."
msgid "Internal error, Ordering didn't finish"
msgstr "Eroare internă, Ordering nu s-a terminat"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "Nu s-a putut bloca directorul de descărcare"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Lista surselor nu poate fi citită."
@@ -850,8 +851,8 @@ msgstr "După această operație vor fi folosiți din disc încă %sB.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "După această operație se vor elibera %sB din spațiul ocupat pe disc.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "N-am putut determina spațiul disponibil în %s"
@@ -889,7 +890,7 @@ msgstr "Renunțare."
msgid "Do you want to continue [Y/n]? "
msgstr "Vreți să continuați [Y/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Eșec la aducerea lui %s %s\n"
@@ -898,7 +899,7 @@ msgstr "Eșec la aducerea lui %s %s\n"
msgid "Some files failed to download"
msgstr "Descărcarea unor fișiere a eșuat"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "Descărcare completă și în modul doar descărcare"
@@ -995,51 +996,51 @@ msgstr "Versiunea '%s' pentru '%s' n-a fost găsită"
msgid "Selected version %s (%s) for %s\n"
msgstr "Versiune selectată %s (%s) pentru %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Nu pot determina starea listei surse de pachete %s"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "Comanda de actualizare nu are argumente"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Nu pot încuia directorul cu lista"
# XXX: orice sugestie este bine-venită
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Nu este voie să se șteargă lucruri, nu se poate porni AutoRemover"
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Folosiți 'apt-get autoremove' pentru a le șterge."
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1058,43 +1059,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "Următoarele informații ar putea să vă ajute la rezolvarea situației:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Eroare internă, AutoRemover a deteriorat diverse chestiuni"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "Nu s-a putut găsi sarcina %s"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "Nu pot găsi pachetul %s"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Notă, selectare %s pentru expresie regulată '%s'\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s este marcat ca fiind instalat manual.\n"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Ați putea porni 'apt-get -f install' pentru a corecta acestea:"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1102,7 +1103,7 @@ msgstr ""
"Dependențe neîndeplinite. Încercați 'apt-get -f install' fără nici un pachet "
"(sau oferiți o altă soluție)."
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1115,118 +1116,118 @@ msgstr ""
"pachete\n"
"cerute n-au fost create încă sau au fost mutate din Incoming."
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "Pachete deteriorate"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "Următoarele extra pachete vor fi instalate:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Pachete sugerate:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Pachete recomandate:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "Calculez înnoirea... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Eșec"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Terminat"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr "Trebuie specificat cel puțin un pachet pentru a-i aduce sursa"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nu s-a putut găsi o sursă pachet pentru %s"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Sar peste fișierul deja descărcat '%s'\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nu aveți suficient spațiu în %s"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Este nevoie să descărcați %sB/%sB din arhivele surselor.\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Este nevoie să descărcați %sB din arhivele surselor.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "Aducere sursa %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "Eșec la aducerea unor arhive."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Sar peste despachetarea sursei deja despachetate în %s\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comanda de despachetare '%s' eșuată.\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comanda de construire '%s' eșuată.\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "Procesul copil a eșuat"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Trebuie specificat cel puțin un pachet pentru a-i verifica dependențele "
"înglobate"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nu pot prelua informațiile despre dependențele înglobate ale lui %s"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nu are dependențe înglobate.\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1235,7 +1236,7 @@ msgstr ""
"Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu "
"poate fi găsit"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1244,32 +1245,32 @@ msgstr ""
"Dependența lui %s de %s nu poate fi satisfăcută deoarece nici o versiune "
"disponibilă a pachetului %s nu poate satisface versiunile cerute"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Eșec la satisfacerea dependenței %s pentru %s: Pachetul instalat %s este "
"prea nou"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Eșec la satisfacerea dependenței %s pentru %s: %s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Dependențele înglobate pentru %s nu pot fi satisfăcute."
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "Eșec la prelucrarea dependențelor de compilare"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "Module suportate:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1356,7 +1357,7 @@ msgstr ""
"pentru mai multe informații și opțiuni.\n"
" Acest APT are puterile unei Super Vaci.\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1608,11 +1609,10 @@ msgstr "Fișierul %s/%s îl suprascrie pe cel din pachetul %s"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "Nu s-a putut citi %s"
@@ -1642,9 +1642,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Directoarele info și temp trebuie să fie în același sistem de fișiere"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "Citire liste de pachete"
@@ -1783,11 +1783,11 @@ msgid "File not found"
msgstr "Fișier negăsit"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "Eșec la „stat”"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "Eșec la ajustarea timpului de modificare"
@@ -1849,7 +1849,7 @@ msgstr "Timpul de conectare a expirat"
msgid "Server closed the connection"
msgstr "Serverul a închis conexiunea"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Eroare de citire"
@@ -1861,7 +1861,7 @@ msgstr "Un răspuns a depășit zona de tampon."
msgid "Protocol corruption"
msgstr "Protocol corupt"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Eroare de scriere"
@@ -1917,7 +1917,7 @@ msgstr "Timpul de conectare la socket-ul de date expirat"
msgid "Unable to accept connection"
msgstr "Nu s-a putut accepta conexiune"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problemă la calcularea dispersiei pentru fișierul"
@@ -1982,62 +1982,67 @@ msgstr "Nu s-a putut realiza conexiunea cu %s:%s (%s)."
msgid "Connecting to %s"
msgstr "Conectare la %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nu s-a putut rezolva „%s”"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Eșec temporar la rezolvarea lui „%s”"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "S-a întâmplat ceva „necurat” la rezolvarea lui „%s:%s” (%i)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Nu s-a putut realiza conexiunea cu %s %s:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "Nu s-a putut accesa inelul de chei: '%s'"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Abandonez instalarea."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"E: Lista de argumente din Acquire::gpgv::Options este prea lungă. Se iese."
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Eroare internă: Semnătură corespunzătoare, dar nu s-a putut determina "
"amprenta digitale a cheii?!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "Cel puțin o semnătură nevalidă a fost întâlnită."
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Nu s-a putut executa „%s” pentru verificarea semnăturii (gpgv este instalat?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "Eroare necunoscută în timp ce se execută gpgv"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "Următoarele semnături nu au fost valide:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2088,48 +2093,48 @@ msgstr "Acest server HTTP are un suport defect de intervale"
msgid "Unknown date format"
msgstr "Format dată necunoscut"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "Selecția a eșuat"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "Timp de conectare expirat"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "Eroare la scrierea fișierului de rezultat"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "Eroare la scrierea în fișier"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "Eroare la scrierea în fișierul"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Eroare la citirea de la server. Conexiunea a fost închisă de la distanță"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "Eroare la citirea de la server"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr "Eșec la trunchierea fișierului"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "Antet de date necorespunzător"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "Conectare eșuată"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Eroare internă"
@@ -2137,18 +2142,25 @@ msgstr "Eroare internă"
msgid "Can't mmap an empty file"
msgstr "Nu s-a putut executa „mmap” cu un fișier gol"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nu s-a putut face mmap cu %lu octeți"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2178,53 +2190,53 @@ msgstr ""
msgid "Selection %s not found"
msgstr "Selecția %s nu a fost găsită"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Abreviere de tip nerecunoscut: „%c”"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "Se deschide fișierul de configurare %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Eroare de sintaxă %s:%u: Blocul începe fără nume"
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Eroare de sintaxă %s:%u: etichetă greșită"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Eroare de sintaxă %s:%u: mizerii suplimentare după valoare"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Eroare de sintaxă %s:%u: Directivele pot fi date doar la nivelul superior"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Eroare de sintaxă %s:%u: prea multe imbricări incluse"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Eroare de sintaxă %s:%u: incluse de aici"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Eroare de sintaxă %s:%u: directivă nesuportată '%s'"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Eroare de sintaxă %s:%u: mizerii suplimentare la sfârșitul fișierului"
@@ -2301,75 +2313,75 @@ msgstr "Nu pot schimba la %s"
msgid "Failed to stat the cdrom"
msgstr "Eșec la „stat” pentru CD"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "Nu s-a folosit închiderea pentru fișierul disponibil doar-citire %s"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "Nu pot deschide fișierul blocat %s"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "Nu este folosit blocajul pentru fișierul montat nfs %s"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "Nu pot determina blocajul %s"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Așteptat %s, dar n-a fost acolo"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Subprocesul %s a primit o eroare de segmentare."
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "Subprocesul %s a primit o eroare de segmentare."
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Subprocesul %s a întors un cod de eroare (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Subprocesul %s s-a terminat brusc"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "Nu s-a putut deschide fișierul %s"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "citire, încă mai am %lu de citit dar n-a mai rămas nimic"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "scriere, încă mai am %lu de scris dar nu pot"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Problemă la închiderea fișierului"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "Problemă la dezlegarea fișierului"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "Problemă în timpul sincronizării fișierului"
@@ -2486,52 +2498,52 @@ msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Nu s-a putut analiza fișierul pachet %s (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Linie greșită %lu în lista sursă %s (URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Linie greșită %lu în lista sursă %s (dist)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Linie greșită %lu în lista sursă %s (analiza URI)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Linie greșită %lu în lista sursă %s (dist. absolută)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "Deschidere %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linia %u prea lungă în lista sursă %s."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Linie greșită %u în lista sursă %s (tip)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Linie greșită %u în lista sursă %s (identificator vânzător)"
@@ -2661,17 +2673,17 @@ msgid "You may want to run apt-get update to correct these problems"
msgstr ""
"Ați putea vrea să porniți 'apt-get update' pentru a corecta aceste probleme."
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Înregistrare invalidă în fișierul de preferințe, fără antet de pachet"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "Nu s-a înțeles tipul de pin %s"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "Fără prioritate (sau zero) specificată pentru pin"
@@ -2761,16 +2773,16 @@ msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"Nu s-a găsit pachetul %s %s în timpul procesării dependențelor de fișiere"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Nu pot determina starea listei surse de pachete %s"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "Colectare furnizori fișier"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "Eroare IO în timpul salvării sursei cache"
@@ -2779,21 +2791,21 @@ msgstr "Eroare IO în timpul salvării sursei cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "redenumire eșuată, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "Nepotrivire MD5Sum"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "Nepotrivire la suma de căutare"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Nu există nici o cheie publică disponibilă pentru următoarele "
"identificatoare de chei:\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2802,7 +2814,7 @@ msgstr ""
"N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna "
"că aveți nevoie să reparați manual acest pachet (din pricina unui arch lipsă)"
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2811,7 +2823,7 @@ msgstr ""
"N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna "
"că aveți nevoie să depanați manual acest pachet."
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2819,7 +2831,7 @@ msgstr ""
"Fișierele index de pachete sunt deteriorate. Fără câmpul 'nume fișier:' la "
"pachetul %s."
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "Nepotrivire dimensiune"
@@ -2956,7 +2968,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "Se deschide fișierul de configurare %s"
@@ -2967,7 +2978,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:542
#, fuzzy, c-format
-#| msgid "Hash Sum mismatch"
msgid "Hash mismatch for: %s"
msgstr "Nepotrivire la suma de căutare"
@@ -2988,7 +2998,6 @@ msgstr "Se șterge %s"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "Șters complet %s"
@@ -3073,14 +3082,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Nu s-a putut peteci fișierul"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Conexiune închisă prematur"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Nu s-a putut accesa inelul de chei: '%s'"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Nu s-a putut peteci fișierul"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/ru.po b/po/ru.po
index ea2ba0b9c..60f73f7de 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.25\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2010-01-08 09:47+0300\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -156,7 +156,7 @@ msgstr " Таблица версий:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s для %s скомпилирован %s %s\n"
@@ -306,7 +306,7 @@ msgstr ""
" -c=? Читать указанный файл настройки\n"
" -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "Невозможно записать в %s"
@@ -447,11 +447,8 @@ msgstr "DB устарела, попытка обновить %s"
#: ftparchive/cachedb.cc:72
#, fuzzy
-#| msgid ""
-#| "DB format is invalid. If you upgraded from an older version of apt, "
-#| "please remove and re-create the database."
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"Некорректный формат базы данных (DB). Если вы обновляли версию apt, удалите "
@@ -468,11 +465,11 @@ msgstr "Не удалось открыть DB файл %s: %s"
msgid "Failed to stat %s"
msgstr "Не удалось получить атрибуты %s"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "В архиве нет поля control"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Невозможно получить курсор"
@@ -537,26 +534,26 @@ msgstr "*** Не удалось создать ссылку %s на %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Превышен лимит в %sB в DeLink.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "В архиве нет поля package"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " Нет записи о переназначении (override) для %s\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " пакет %s сопровождает %s, а не %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " Нет записи source override для %s\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " Нет записи binary override для %s\n"
@@ -661,7 +658,7 @@ msgstr "Не удалось переименовать %s в %s"
msgid "Y"
msgstr "д"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "Ошибка компиляции регулярного выражения - %s"
@@ -827,11 +824,11 @@ msgstr "Пакеты необходимо удалить, но удаление
msgid "Internal error, Ordering didn't finish"
msgstr "Внутренняя ошибка, Ordering не завершилась"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "Невозможно заблокировать каталог, куда складываются скачиваемые файлы"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Не читается перечень источников."
@@ -864,8 +861,8 @@ msgstr ""
"После данной операции, объём занятого дискового пространства уменьшится на %"
"sB.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Не удалось определить количество свободного места в %s"
@@ -904,7 +901,7 @@ msgstr "Аварийное завершение."
msgid "Do you want to continue [Y/n]? "
msgstr "Хотите продолжить [Д/н]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Не удалось получить %s %s\n"
@@ -913,7 +910,7 @@ msgstr "Не удалось получить %s %s\n"
msgid "Some files failed to download"
msgstr "Некоторые файлы скачать не удалось"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "Указан режим \"только скачивание\", и скачивание завершено"
@@ -1010,50 +1007,50 @@ msgstr "Версия '%s' для '%s' не найдена"
msgid "Selected version %s (%s) for %s\n"
msgstr "Выбрана версия %s (%s) для %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr "Игнорируется недоступная версия '%s' пакета '%s'"
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr "Игнорируется недоступный выпуск '%s' пакета '%s'"
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Используется '%s' в качестве исходного пакета вместо '%s'\n"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr "Игнорируется недоступная версия '%s' пакета '%s'"
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "Команде update не нужны аргументы"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Невозможно заблокировать каталог со списками пакетов"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Не предполагалось удалять stuff, невозможно запустить AutoRemover"
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Следующие пакеты устанавливались автоматически и больше не требуются:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "%lu пакетов было установлены автоматически и больше не требуются.\n"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Для их удаления используйте 'apt-get autoremove'."
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1071,45 +1068,45 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "Следующая информация, возможно, поможет вам:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Внутренняя ошибка, AutoRemover всё поломал"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Внутренняя ошибка, AllUpgrade всё поломал"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "Не удалось найти задачу %s"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "Не удалось найти пакет %s"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Заметьте, выбирается %s из-за регулярного выражения %s\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s установлен вручную.\n"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -"
"f install':"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1117,7 +1114,7 @@ msgstr ""
"Неудовлетворённые зависимости. Попытайтесь выполнить 'apt-get -f install', "
"не указывая имени пакета, (или найдите другое решение)."
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1128,118 +1125,118 @@ msgstr ""
"или же используете нестабильную версию дистрибутива, где запрошенные вами\n"
"пакеты ещё не созданы или были удалены из Incoming."
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "Сломанные пакеты"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "Будут установлены следующие дополнительные пакеты:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Предлагаемые пакеты:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Рекомендуемые пакеты:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "Расчёт обновлений... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Неудачно"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Готово"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "Внутренняя ошибка, решатель проблем всё поломал"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Укажите как минимум один пакет, исходный код которого необходимо получить"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Невозможно найти пакет с исходным кодом для %s"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Пропускаем уже скачанный файл '%s'\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Недостаточно места в %s"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Необходимо получить %sб/%sб архивов исходного кода.\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Необходимо получить %sб архивов исходного кода.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "Получение исходного кода %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "Некоторые архивы не удалось получить."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Пропускается распаковка уже распакованного исходного кода в %s\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Команда распаковки '%s' завершилась неудачно.\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Проверьте, установлен ли пакет 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Команда сборки '%s' завершилась неудачно.\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "Порождённый процесс завершился неудачно"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Для проверки зависимостей для сборки необходимо указать как минимум один "
"пакет"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Невозможно получить информацию о зависимостях для сборки %s"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s не имеет зависимостей для сборки.\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1248,7 +1245,7 @@ msgstr ""
"Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не "
"найден"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1257,32 +1254,32 @@ msgstr ""
"Зависимость типа %s для %s не может быть удовлетворена, поскольку ни одна из "
"версий пакета %s не удовлетворяет требованиям"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный "
"пакет %s новее, чем надо"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Зависимости для сборки %s не могут быть удовлетворены."
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "Обработка зависимостей для сборки завершилась неудачно"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "Поддерживаемые модули:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1369,7 +1366,7 @@ msgstr ""
"содержится подробная информация и описание параметров.\n"
" В APT есть коровья СУПЕРСИЛА.\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1621,11 +1618,10 @@ msgstr "Файл %s/%s переписывает файл в пакете %s"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "Невозможно прочитать %s"
@@ -1655,9 +1651,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Каталоги info и temp должны находиться на одной файловой системе"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "Чтение списков пакетов"
@@ -1792,11 +1788,11 @@ msgid "File not found"
msgstr "Файл не найден"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "Не удалось получить атрибуты"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "Не удалось установить время модификации"
@@ -1860,7 +1856,7 @@ msgstr "Допустимое время ожидания для соединен
msgid "Server closed the connection"
msgstr "Сервер прервал соединение"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Ошибка чтения"
@@ -1872,7 +1868,7 @@ msgstr "Ответ переполнил буфер."
msgid "Protocol corruption"
msgstr "Искажение протокола"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Ошибка записи"
@@ -1928,7 +1924,7 @@ msgstr "Время установления соединения для соке
msgid "Unable to accept connection"
msgstr "Невозможно принять соединение"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Проблема при хешировании файла"
@@ -1992,62 +1988,67 @@ msgstr "Не удаётся соединиться с %s:%s (%s)."
msgid "Connecting to %s"
msgstr "Соединение с %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "Не удалось найти IP адрес для %s"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Временная ошибка при попытке получить IP адрес '%s'"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Что-то странное произошло при определении '%s:%s' (%i - %s)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Невозможно соединиться с %s: %s:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "Нет доступа к связке (keyring) ключей: '%s'"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Аварийное завершение установки."
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
+
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"E: Слишком большой список параметров у Acquire::gpgv::Options. Завершение "
"работы."
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток "
"ключа?!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "Найдена как минимум одна неправильная подпись."
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr "Не удалось выполнить '%s' для проверки подписи (gpgv установлена?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "Неизвестная ошибка при выполнении gpgv"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "Следующие подписи неверные:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2098,47 +2099,47 @@ msgstr "Этот HTTP-сервер не поддерживает скачива
msgid "Unknown date format"
msgstr "Неизвестный формат данных"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "Ошибка в select"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "Время ожидания для соединения истекло"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "Ошибка записи в выходной файл"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "Ошибка записи в файл"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "Ошибка записи в файл"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "Ошибка чтения, удалённый сервер прервал соединение"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "Ошибка чтения с сервера"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr "Не удалось обрезать файл"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "Неверный заголовок данных"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "Соединение разорвано"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Внутренняя ошибка"
@@ -2146,12 +2147,12 @@ msgstr "Внутренняя ошибка"
msgid "Can't mmap an empty file"
msgstr "Невозможно отобразить в память пустой файл"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Невозможно отобразить в память %lu байт"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2160,6 +2161,13 @@ msgstr ""
"Не хватает места для Dynamic MMap. Увеличьте значение APT::Cache-Limit. "
"Текущее значение: %lu. (man 5 apt.conf)"
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2189,54 +2197,54 @@ msgstr "%liс"
msgid "Selection %s not found"
msgstr "Не найдено: %s"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Неизвестная аббревиатура типа: '%c'"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "Открытие файла настройки %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Синтаксическая ошибка %s:%u: в начале блока нет имени."
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Синтаксическая ошибка %s:%u: искажённый тег"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Синтаксическая ошибка %s:%u: лишние символы после значения"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Синтаксическая ошибка %s:%u: директивы могут задаваться только на верхнем "
"уровне"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Синтаксическая ошибка %s:%u: слишком много вложенных include"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Синтаксическая ошибка %s:%u вызвана include из этого места"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Синтаксическая ошибка %s:%u: не поддерживаемая директива '%s'"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Синтаксическая ошибка %s:%u: лишние символы в конце файла"
@@ -2312,81 +2320,81 @@ msgstr "Невозможно сменить текущий каталог на %
msgid "Failed to stat the cdrom"
msgstr "Невозможно получить атрибуты cdrom"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr ""
"Блокировка не используется, так как файл блокировки %s доступен только для "
"чтения"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "Не удалось открыть файл блокировки %s"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr ""
"Блокировка не используется, так как файл блокировки %s находится на файловой "
"системе nfs"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "Не удалось получить доступ к файлу блокировки %s"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Ожидалось завершение процесса %s, но он не был запущен"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr ""
"Нарушение защиты памяти (segmentation fault) в порождённом процессе %s."
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, c-format
msgid "Sub-process %s received signal %u."
msgstr "Порождённый процесс %s получил сигнал %u."
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Порождённый процесс %s вернул код ошибки (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Порождённый процесс %s неожиданно завершился"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "Не удалось открыть файл %s"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr ""
"ошибка при чтении. собирались прочесть ещё %lu байт, но ничего больше нет"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "ошибка при записи, собирались записать ещё %lu байт, но не смогли"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Проблема закрытия файла"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "Ошибка при удалении файла"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "Проблема при синхронизации файловых буферов с диском"
@@ -2503,53 +2511,53 @@ msgstr "Невозможно разобрать содержимое пакет
msgid "Unable to parse package file %s (2)"
msgstr "Невозможно разобрать содержимое пакета %s (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Искажённая строка %lu в списке источников %s (проблема в URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
"Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Искажённая строка %lu в списке источников %s (анализ URI)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Искажённая строка %lu в списке источников %s (absolute dist)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Искажённая строка %lu в списке источников %s (dist parse)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "Открытие %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Строка %u в списке источников %s слишком длинна."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Искажённая строка %u в списке источников %s (тип)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Неизвестный тип '%s' в строке %u в списке источников %s"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Искажённая строка %u в списке источников %s (vendor id)"
@@ -2680,17 +2688,17 @@ msgstr "Списки пакетов или status-файл не могут бы
msgid "You may want to run apt-get update to correct these problems"
msgstr "Вы можете запустить 'apt-get update' для исправления этих ошибок"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Неверная запись в файле параметров %s: отсутствует заголовок Package"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "Неизвестный тип фиксации %s"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "Для фиксации не указан приоритет (или указан нулевой)"
@@ -2775,16 +2783,16 @@ msgstr "Произошла ошибка во время обработки %s (C
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Во время обработки файла зависимостей не найден пакет %s %s"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Не удалось получить атрибуты списка пакетов исходного кода %s"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "Сбор информации о Provides"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "Ошибка ввода/вывода при попытке сохранить кэш источников"
@@ -2793,19 +2801,19 @@ msgstr "Ошибка ввода/вывода при попытке сохран
msgid "rename failed, %s (%s -> %s)."
msgstr "переименовать не удалось, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "MD5Sum не совпадает"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "Хеш сумма не совпадает"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr "Недоступен открытый ключ для следующих ID ключей:\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2814,7 +2822,7 @@ msgstr ""
"Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся "
"вручную исправить этот пакет (возможно, пропущен arch)"
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2823,13 +2831,13 @@ msgstr ""
"Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся "
"вручную исправить этот пакет."
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s."
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "Не совпадает размер"
@@ -3089,29 +3097,35 @@ msgstr ""
msgid "Not locked"
msgstr "Не заблокирован"
-#: methods/rred.cc:219
-#, fuzzy
-#| msgid "Could not open file %s"
-msgid "Could not patch file"
-msgstr "Не удалось открыть файл %s"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+"Не удалось наложить заплату %s с использованием mmap и файловой операции -- "
+"вероятно, повреждена заплата."
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
+"Не удалось наложить заплату %s с использованием mmap (но не из-за mmap) -- "
+"вероятно, повреждена заплата."
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Соединение закрыто преждевременно"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Нет доступа к связке (keyring) ключей: '%s'"
+
+#, fuzzy
+#~| msgid "Could not open file %s"
+#~ msgid "Could not patch file"
+#~ msgstr "Не удалось открыть файл %s"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
-
-#~ msgid ""
-#~ "Could not patch %s with mmap and with file operation usage - the patch "
-#~ "seems to be corrupt."
-#~ msgstr ""
-#~ "Не удалось наложить заплату %s с использованием mmap и файловой операции "
-#~ "-- вероятно, повреждена заплата."
-
-#~ msgid ""
-#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
-#~ "seems to be corrupt."
-#~ msgstr ""
-#~ "Не удалось наложить заплату %s с использованием mmap (но не из-за mmap) "
-#~ "-- вероятно, повреждена заплата."
diff --git a/po/sk.po b/po/sk.po
index 1d0aa1165..d5fe16c1a 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -436,9 +436,6 @@ msgstr "DB je neaktuálna, prebieha pokus o aktualizáciu %s"
#: ftparchive/cachedb.cc:72
#, fuzzy
-#| msgid ""
-#| "DB format is invalid. If you upgraded from a older version of apt, please "
-#| "remove and re-create the database."
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
@@ -1978,7 +1975,6 @@ msgstr "Nedá sa pripojiť k %s:%s:"
#. TRANSLATOR: %s is the trusted keyring parts directory
#: methods/gpgv.cc:78
#, fuzzy, c-format
-#| msgid "Aborting install."
msgid "No keyring installed in %s."
msgstr "Inštalácia sa prerušuje."
diff --git a/po/sl.po b/po/sl.po
index 9b1505348..59351e42f 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2005-02-16 22:18+0100\n"
"Last-Translator: Jure Cuhalev <gandalf@owca.info>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -145,7 +145,7 @@ msgstr " Tabela razliic:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s za %s %s preveden na %s %s\n"
@@ -302,7 +302,7 @@ msgstr ""
" -c=? Prebere podano datoteko z nastavitvami\n"
" -o=? Nastavi poljubno nastavitveno monost, npr. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "Ni mogoe pisati na %s"
@@ -437,7 +437,7 @@ msgstr "ZP je stara, poskuam nadgraditi %s"
#: ftparchive/cachedb.cc:72
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
@@ -452,11 +452,11 @@ msgstr "Ni mogoe odprti datoteke ZP %s: %s"
msgid "Failed to stat %s"
msgstr "Napaka pri postavitvi %s"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Arhiv nima nadzornega zapisa"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Ni mogoe najti kazalca"
@@ -521,26 +521,26 @@ msgstr "*** Napaka pri povezovanju %s z %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Doseena meja RazVezovanja %sB.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "Arhiv ni imel polja s paketom"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nima prekrivnega vnosa\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " Vzdrevalec %s je %s in ne %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, fuzzy, c-format
msgid " %s has no source override entry\n"
msgstr " %s nima prekrivnega vnosa\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, fuzzy, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nima prekrivnega vnosa\n"
@@ -644,7 +644,7 @@ msgstr "Ni mogoe preimenovati %s v %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "Napaka pri prevajanju regex - %s"
@@ -807,11 +807,11 @@ msgstr "Odstraniti je potrebno pakete, a je Odstranjevanje onemogoeno."
msgid "Internal error, Ordering didn't finish"
msgstr "Notranja napaka pri dodajanju odklona"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "Ni mogoe zakleniti imenika za prenose"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Seznama virov ni mogoe brati."
@@ -840,8 +840,8 @@ msgstr "Po odpakiranju bo uporabljenega %sB dodatnega prostora na disku.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Po odpakiranju bo sproenega %sB prostora na disku.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nimate dovolj prostora na %s"
@@ -878,7 +878,7 @@ msgstr "Prekini."
msgid "Do you want to continue [Y/n]? "
msgstr "Ali elite nadaljevati [Y/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ni mogoe dobiti %s %s\n"
@@ -887,7 +887,7 @@ msgstr "Ni mogoe dobiti %s %s\n"
msgid "Some files failed to download"
msgstr "Prenos nekaterih datotek ni uspel"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "Prenos dokonan in uporabljen nain samo prenos"
@@ -984,51 +984,51 @@ msgstr "Razliice '%s' za '%s' ni mogoe najti"
msgid "Selected version %s (%s) for %s\n"
msgstr "Izbrana razliica %s (%s) za %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Ni mogoe doloiti seznama izvornih paketov %s"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "Ukaz update ne potrebuje argumentov"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Imenika seznamov ni mogoe zakleniti"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Naslednji NOVI paketi bodo nameeni:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "Naslednji NOVI paketi bodo nameeni:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1044,44 +1044,44 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "Naslednji podatki vam bodo morda pomagali reiti teavo:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Notranja napaka zaradi AllUpgrade."
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Notranja napaka zaradi AllUpgrade."
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Ni mogoe najti paketa %s"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "Ni mogoe najti paketa %s"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Opomba: izbran %s namesto regex '%s'\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "vendar bo paket %s nameen"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Poskusite zagnati 'apt-get -f install', e elite popraviti:"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1089,7 +1089,7 @@ msgstr ""
"Nereene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali "
"podajte reitev)."
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1100,126 +1100,126 @@ msgstr ""
"nemogo poloaj, e uporabljate nestabilno izdajo pa, da nekateri zahtevani "
"paketi e niso ustvarjeni ali preneeni iz Prihajajoe."
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "Pokvarjeni paketi"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "Naslednji dodatni paketi bodo nameeni:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Predlagani paketi:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Priporoeni paketi:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "Preraunavanje nadgradnje ... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Spodletelo"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Opravljeno"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Notranja napaka zaradi AllUpgrade."
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Potrebno je navesti vsaj en paket, za katerega elite dobiti izorno kodo"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Izvornega paketa za %s ni mogoe najti"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Odpakiranje e odpakiranih izvornih paketov v %s preskoeno\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nimate dovolj prostora na %s"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Potrebno je dobiti %sB izvornih arhivov.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "Dobi vir %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "Nekaterih arhivov ni mogoe dobiti."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Odpakiranje e odpakiranih izvornih paketov v %s preskoeno\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Ukaz odpakiranja '%s' ni uspel.\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Ukaz gradnje '%s' ni uspel.\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "Otroki proces ni uspel"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Potrebno je navesti vsaj en paket, za katerega elite preveriti odvisnosti "
"za gradnjo"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ni mogoe dobiti informacij o odvisnostih za gradnjo za %s"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nima odvisnosti za gradnjo.\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s odvisnosti za %s ni mogoe zadostiti, ker ni mogoe najti paketa %s"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1228,31 +1228,31 @@ msgstr ""
"%s odvisnosti za %s ni mogoe zadostiti, ker nobena razliica paketa %s ne "
"more zadostiti zahtevi po razliici"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Ni mogoe zadostiti %s odvisnosti za %s. Nameen paket %s je preve nov"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Ni mogoe zadostiti %s odvisnosti za %s. %s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Odvisnostim za gradnjo %s ni mogoe zadostiti."
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "Obdelava odvisnosti za gradnjo ni uspela"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "Podprti moduli:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1335,7 +1335,7 @@ msgstr ""
"sources.list(5) in apt.conf(5).\n"
" APT ima mo Super Krave.\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1583,11 +1583,10 @@ msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "Ni mogoe brati %s"
@@ -1617,9 +1616,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Podatki in zaasni imeniki morajo biti v istem datotenem sistemu"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "Branje seznama paketov"
@@ -1753,11 +1752,11 @@ msgid "File not found"
msgstr "Datoteke ni mogoe najti"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "Doloitev ni uspela"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "Nastavitev asa spremembe ni uspela"
@@ -1819,7 +1818,7 @@ msgstr "Povezava potekla"
msgid "Server closed the connection"
msgstr "Strenik je zaprl povezavo"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Napaka pri branju"
@@ -1831,7 +1830,7 @@ msgstr "Odgovor je prekorail vmesnik."
msgid "Protocol corruption"
msgstr "Okvara protokola"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Napaka pri pisanju"
@@ -1885,7 +1884,7 @@ msgstr "Povezava podatkovne vtinice potekla"
msgid "Unable to accept connection"
msgstr "Ni mogoe sprejeti povezave"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Teava pri razprevanju datoteke"
@@ -1949,59 +1948,64 @@ msgstr "Ni se mogoe povezati z %s:%s (%s)."
msgid "Connecting to %s"
msgstr "Povezujem se z %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "Ni mogoe razreiti '%s'"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Zaasna napaka pri razreevanju '%s'"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Prilo je do napake pri razreevanju '%s:%s' (%i)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Ni se mogoe povezati z %s %s:"
-#: methods/gpgv.cc:71
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
#, fuzzy, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "Ni mogoe razreiti '%s'"
+msgid "No keyring installed in %s."
+msgstr "Prekinjanje namestitve."
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
+
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Naslednji dodatni paketi bodo nameeni:"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2050,48 +2054,48 @@ msgstr "Ta strenik HTTP ima pokvarjen obseg podpore"
msgid "Unknown date format"
msgstr "Neznana oblika datuma"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "Izbira ni uspela"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "as za povezavo se je iztekel"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "Napaka pri pisanju v izhodno datoteko"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "Napaka pri pisanju v datoteko"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "Napaka pri pisanju v datoteko"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "Napaka pri branju oddaljene in zaprte povezave s strenika "
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "Napaka pri branju s strenika"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
#, fuzzy
msgid "Failed to truncate file"
msgstr "Napaka pri pisanju datoteke %s"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "Napani podatki glave"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "Povezava ni uspela"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Notranja napaka"
@@ -2099,18 +2103,25 @@ msgstr "Notranja napaka"
msgid "Can't mmap an empty file"
msgstr "mmap prazne datoteke ni mogo"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Ni mogoe narediti mmap %lu bajtov"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2140,53 +2151,53 @@ msgstr ""
msgid "Selection %s not found"
msgstr "Izbira %s ni mogoe najti"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Ne-prepoznan tip okrajave: '%c'"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "Odpiranje nastavitvene datoteke %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Skladenjska napaka %s:%u: Blok se zane brez imena."
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Skladenjska napaka %s:%u: Nepravilna znaka."
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Skladenjska napaka %s:%u: Dodatno smetje za vrednostjo."
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Skladenjska napaka %s:%u: Napotki se lahko izvedejo le na vrhnjem nivoju."
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Skladenjska napaka %s:%u: Preve ugnezdenih vkljuitev."
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Skladenjska napaka %s:%u: Vkljuen od tu."
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Skladenjska napaka %s:%u: Nepodprt napotek '%s'"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Skladenjska napaka %s:%u: Dodatno smetje na koncu datoteke"
@@ -2262,75 +2273,75 @@ msgstr "Ni mogoe spremeniti v %s"
msgid "Failed to stat the cdrom"
msgstr "Ni mogoe doloiti CD-ROM-a"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "Brez uporabe zaklepanja za zaklenjeno datoteko samo za branje %s"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "Ni mogoe odprti zaklenjene datoteke %s"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "Brez uporabe zaklepanja za datoteko %s, priklopljeno z NTFS"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "Ni mogoe dobiti zaklenjene datoteke %s"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "akal, a %s ni bil tam"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Napaka pri razlenjenosti podprocesa %s."
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "Napaka pri razlenjenosti podprocesa %s."
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Podproces %s je vrnil kodo napake (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Podproces %s se je nepriakovano zakljuil"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "Ne morem odpreti datoteke %s"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "berem, e vedno %lu za branje, a nobeden ostal"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "piem, e vedno %lu za pisanje, a ni mogoe"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Teava pri zapiranju datoteke"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "Teava pri odvezovanju datoteke"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "Teava pri usklajevanju datoteke"
@@ -2448,52 +2459,52 @@ msgstr "Ni mogoe razleniti paketne datoteke %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Ni mogoe razleniti paketne datoteke %s (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Napana vrstica %lu v seznamu virov %s (URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Napana vrstica %lu v seznamu virov %s (distribucija)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Napana vrstica %lu v seznamu virov %s (razlenitev URI)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Napana vrstica %lu v seznamu virov %s (absolutna distribucija)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Napana vrstica %lu v seznamu virov %s (razlenitev distribucije)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "Odpiram %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Vrstica %u v seznamu virov %s je predolga."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Napana vrstica %u v seznamu virov %s (vrsta)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, fuzzy, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Vrsta '%s' v vrstici %u v seznamu virov %s ni znana"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Napana vrstica %u v seznamu virov %s (ID ponudnika)"
@@ -2621,17 +2632,17 @@ msgstr "Ni mogoe odprti ali razleniti seznama paketov ali datoteke stanja."
msgid "You may want to run apt-get update to correct these problems"
msgstr "e elite odpraviti teave, poskusite zagnati apt-get update."
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Napaen zapis v datoteki z nastavitvami. Ni glave paketa"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "Ni mogoe razumeti vrste zaponke %s"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "Prioriteta zaponke ni doloena ali pa je ni."
@@ -2716,16 +2727,16 @@ msgstr "Prilo je do napake pri obdelavi %s (Zberi dobavitelje datotek)"
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Paketa %s %s ni bilo mogoe najti med obdelavo odvisnosti"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Ni mogoe doloiti seznama izvornih paketov %s"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "Zbiranje dobaviteljev datotek"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "Napaka IO pri shranjevanju predpomnilnika virov"
@@ -2734,20 +2745,20 @@ msgstr "Napaka IO pri shranjevanju predpomnilnika virov"
msgid "rename failed, %s (%s -> %s)."
msgstr "preimenovanje spodletelo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "Neujemanje vsote MD5"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "Neujemanje vsote MD5"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2756,7 +2767,7 @@ msgstr ""
"Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono "
"popraviti ta paket (zaradi manjkajoega arhiva)."
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2765,7 +2776,7 @@ msgstr ""
"Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono "
"popraviti ta paket."
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2773,7 +2784,7 @@ msgstr ""
"Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket "
"%s."
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "Neujemanje velikosti"
@@ -2909,7 +2920,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "Odpiranje nastavitvene datoteke %s"
@@ -3023,15 +3033,32 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-#, fuzzy
-msgid "Could not patch file"
-msgstr "Ne morem odpreti datoteke %s"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Povezava se je prezgodaj zaprla"
+#, fuzzy
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Ni mogoe razreiti '%s'"
+
+#, fuzzy
+#~ msgid "Could not patch file"
+#~ msgstr "Ne morem odpreti datoteke %s"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/sv.po b/po/sv.po
index bc3dc6e37..e14b57df5 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2009-03-03 23:15+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <debian-l10n-swedish@debian.org>\n"
@@ -147,7 +147,7 @@ msgstr " Versionstabell:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s för %s kompilerad den %s %s\n"
@@ -300,7 +300,7 @@ msgstr ""
" -c=? Läs denna konfigurationsfil.\n"
" -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "Kunde inte skriva till %s"
@@ -434,8 +434,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "DB är gammal, försöker uppgradera %s"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"DB-formatet är ogiltigt. Ta bort och återskapa databasen om du uppgraderar "
@@ -452,11 +453,11 @@ msgstr "Kunde inte öppna DB-filen %s: %s"
msgid "Failed to stat %s"
msgstr "Misslyckades med att ta status på %s"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Arkivet har ingen styrpost"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Kunde inte få tag i någon markör"
@@ -523,27 +524,27 @@ msgid " DeLink limit of %sB hit.\n"
msgstr " Avlänkningsgränsen på %sB nåddes.\n"
# Fält vid namn "Package"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "Arkivet har inget package-fält"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har ingen post i override-filen\n"
# parametrar: paket, ny, gammal
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " ansvarig för paketet %s är %s ej %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s har ingen källåsidosättningspost\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s har heller ingen binär åsidosättningspost\n"
@@ -649,7 +650,7 @@ msgstr "Misslyckades med att byta namn på %s till %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fel vid kompilering av reguljärt uttryck - %s"
@@ -811,11 +812,11 @@ msgstr "Paketen måste tas bort men \"Remove\" är inaktiverat."
msgid "Internal error, Ordering didn't finish"
msgstr "Internt fel. Sorteringen färdigställdes inte"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "Kunde inte låsa hämtningskatalogen"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Listan över källor kunde inte läsas."
@@ -847,8 +848,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Efter denna åtgärd kommer %sB att frigöras på disken.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kunde inte fastställa ledigt utrymme i %s"
@@ -886,7 +887,7 @@ msgstr "Avbryter."
msgid "Do you want to continue [Y/n]? "
msgstr "Vill du fortsätta [J/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Misslyckades med att hämta %s %s\n"
@@ -895,7 +896,7 @@ msgstr "Misslyckades med att hämta %s %s\n"
msgid "Some files failed to download"
msgstr "Misslyckades med att hämta vissa filer"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "Hämtningen färdig i \"endast-hämta\"-läge"
@@ -993,53 +994,53 @@ msgstr "Version \"%s\" för \"%s\" hittades inte"
msgid "Selected version %s (%s) for %s\n"
msgstr "Vald version %s (%s) för %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Kunde inte ta status på källkodspaketlistan %s"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "Uppdateringskommandot tar inga argument"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Kunde inte låsa listkatalogen"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"Det är inte meningen att vi ska ta bort något, kan inte starta AutoRemover"
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr ""
"Följande paket har installerats automatiskt och är inte längre nödvändiga:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"Följande paket har installerats automatiskt och är inte längre nödvändiga:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Använd \"apt-get autoremove\" för att ta bort dem."
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1057,44 +1058,44 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "Följande information kan vara till hjälp för att lösa situationen:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Internt fel, AutoRemover förstörde något"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Internt fel, AllUpgrade förstörde något"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "Kunde inte hitta funktionen %s"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "Kunde inte hitta paketet %s"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Observera, väljer %s för det reguljära uttrycket \"%s\"\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s är satt till manuellt installerad.\n"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Du kan möjligen rätta till detta genom att köra \"apt-get -f install\":"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1102,7 +1103,7 @@ msgstr ""
"Otillfredsställda beroenden. Prova med \"apt-get -f install\" utan paket "
"(eller ange en lösning)."
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1114,115 +1115,115 @@ msgstr ""
"att några nödvändiga paket ännu inte har skapats eller flyttats\n"
"ut från \"Incoming\"."
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "Trasiga paket"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "Följande ytterligare paket kommer att installeras:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Föreslagna paket:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Rekommenderade paket:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "Beräknar uppgradering... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Misslyckades"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Färdig"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "Internt fel, problemlösaren förstörde någonting"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr "Du måste ange minst ett paket att hämta källkod för"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kunde inte hitta något källkodspaket för %s"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Hoppar över redan hämtade filen \"%s\"\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Behöver hämta %sB/%sB källkodsarkiv.\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Behöver hämta %sB källkodsarkiv.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "Hämtar källkoden %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "Misslyckades med att hämta vissa arkiv."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Packar inte upp redan uppackad källkod i %s\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Uppackningskommandot \"%s\" misslyckades.\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Försäkra dig om att paketet \"dpkg-dev\" är installerat.\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggkommandot \"%s\" misslyckades.\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "Barnprocessen misslyckades"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr "Du måste ange minst ett paket att kontrollera byggberoenden för"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kunde inte hämta information om byggberoenden för %s"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har inga byggberoenden.\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1231,7 +1232,7 @@ msgstr ""
"%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan "
"hittas"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1240,32 +1241,32 @@ msgstr ""
"%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga "
"versioner av paketet %s tillfredsställer versionskraven"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Misslyckades med att tillfredsställa %s-beroendet för %s: Det installerade "
"paketet %s är för nytt"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Misslyckades med att tillfredsställa %s-beroendet för %s: %s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Byggberoenden för %s kunde inte tillfredsställas."
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "Misslyckades med att behandla byggberoenden"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "Moduler som stöds:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1349,7 +1350,7 @@ msgstr ""
"för mer information och flaggor.\n"
" Denna APT har Speciella Ko-Krafter.\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1602,11 +1603,10 @@ msgstr "Filen %s/%s skriver över den i paketet %s"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "Kunde inte läsa %s"
@@ -1636,9 +1636,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Katalogerna info och temp måste vara på samma filsystem"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "Läser paketlistor"
@@ -1773,11 +1773,11 @@ msgid "File not found"
msgstr "Filen hittades inte"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "Kunde inte ta status"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "Misslyckades ställa in ändringstid"
@@ -1839,7 +1839,7 @@ msgstr "Tidsgränsen för anslutningen överskreds"
msgid "Server closed the connection"
msgstr "Servern stängde anslutningen"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Läsfel"
@@ -1851,7 +1851,7 @@ msgstr "Ett svar spillde bufferten."
msgid "Protocol corruption"
msgstr "Protokollet skadat"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Skrivfel"
@@ -1905,7 +1905,7 @@ msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgränsen"
msgid "Unable to accept connection"
msgstr "Kunde inte ta emot anslutningen"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem med att lägga filen till hashtabellen"
@@ -1972,62 +1972,67 @@ msgstr "Kunde inte ansluta till %s:%s (%s)."
msgid "Connecting to %s"
msgstr "Ansluter till %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "Kunde inte slå upp \"%s\""
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Temporärt fel vid uppslagning av \"%s\""
# Okänd felkod; %i = koden
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Något konstigt hände när \"%s:%s\" slogs upp (%i)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Kunde inte ansluta till %s %s:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "Kunde inte komma åt nyckelring: \"%s\""
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Avbryter installationen."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "E: Argumentslistan från Acquire::gpgv::Options är för lång. Avslutar."
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Internt fel: Korrekt signatur men kunde inte fastställa nyckelns "
"fingeravtryck?!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "Minst en ogiltig signatur träffades på."
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Kunde inte köra \"%s\" för att verifiera signatur (är gpgv installerad?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "Okänt fel vid körning av gpgv"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "Följande signaturer är ogiltiga:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2079,47 +2084,47 @@ msgstr "Den här http-serverns stöd för delvis hämtning fungerar inte"
msgid "Unknown date format"
msgstr "Okänt datumformat"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "\"Select\" misslyckades"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "Anslutningen överskred tidsgränsen"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "Fel vid skrivning till utdatafil"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "Fel vid skrivning till fil"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "Fel vid skrivning till filen"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "Fel vid läsning från server: Andra änden stängde förbindelsen"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "Fel vid läsning från server"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr "Misslyckades med att kapa av filen"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "Felaktiga data i huvud"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "Anslutningen misslyckades"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Internt fel"
@@ -2127,12 +2132,12 @@ msgstr "Internt fel"
msgid "Can't mmap an empty file"
msgstr "Kan inte utföra mmap på en tom fil"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Kunde inte utföra mmap på %lu byte"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2141,6 +2146,13 @@ msgstr ""
"Dynamisk MMap fick slut på utrymme. Öka storleken för APT::Cache-Limit. "
"Aktuellt värde: %lu. (man 5 apt.conf)"
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2170,52 +2182,52 @@ msgstr ""
msgid "Selection %s not found"
msgstr "Valet %s hittades inte"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Okänd typförkortning: \"%c\""
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "Öppnar konfigurationsfilen %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Syntaxfel %s:%u: Block börjar utan namn."
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntaxfel %s:%u: Felformat märke"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Syntaxfel %s:%u: Överflödigt skräp efter värde"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "Syntaxfel %s:%u: Direktiv kan endast utföras på toppnivån"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Syntaxfel %s:%u: För många nästlade inkluderingar"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntaxfel %s:%u: Inkluderad härifrån"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Syntaxfel %s:%u: Direktivet \"%s\" stöds inte"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaxfel %s:%u: Överflödigt skräp vid filens slut"
@@ -2293,75 +2305,75 @@ msgstr "Kunde inte byta till %s"
msgid "Failed to stat the cdrom"
msgstr "Kunde inte ta status på cd-romen."
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "Använder inte låsning för skrivskyddade låsfilen %s"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "Kunde inte öppna låsfilen %s"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "Använder inte låsning för nfs-monterade låsfilen %s"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "Kunde inte erhålla låset %s"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Väntade på %s men den fanns inte där"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Underprocessen %s råkade ut för ett segmenteringsfel."
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "Underprocessen %s råkade ut för ett segmenteringsfel."
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Underprocessen %s svarade med en felkod (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Underprocessen %s avslutades oväntat"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "Kunde inte öppna filen %s"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "läsning, har fortfarande %lu att läsa men ingenting finns kvar"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "skrivning, har fortfarande %lu att skriva men kunde inte"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Problem med att stänga filen"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "Problem med att länka ut filen"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "Problem med att synkronisera filen"
@@ -2481,52 +2493,52 @@ msgstr "Kunde inte tolka paketfilen %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Kunde inte tolka paketfilen %s (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Rad %lu i källistan %s har (URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Rad %lu i källistan %s har fel format (dist)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Rad %lu i källistan %s har fel format (Absolut dist)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Rad %lu i källistan %s har fel format (dist-tolkning)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "Öppnar %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Rad %u är för lång i källistan %s."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Rad %u i källistan %s har fel format (typ)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Rad %u i källistan %s har fel format (leverantörs-id)"
@@ -2655,17 +2667,17 @@ msgid "You may want to run apt-get update to correct these problems"
msgstr "Du kan möjligen rätta till problemet genom att köra \"apt-get update\""
# "Package" är en sträng i konfigurationsfilen
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Ogiltig post i konfigurationsfilen, \"Package\"-rubriken saknas"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "Förstod inte nåltypen %s"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "Prioritet ej angiven (eller noll) för nål"
@@ -2751,17 +2763,17 @@ msgstr "Fel uppstod vid hantering av %s (CollectFileProvides)"
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Paketet %s %s hittades inte när filberoenden hanterades"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Kunde inte ta status på källkodspaketlistan %s"
# Bättre ord?
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "Samlar filtillhandahållningar"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "In-/utfel vid lagring av källcache"
@@ -2770,19 +2782,19 @@ msgstr "In-/utfel vid lagring av källcache"
msgid "rename failed, %s (%s -> %s)."
msgstr "namnbyte misslyckades, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "MD5-kontrollsumman stämmer inte"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "Hash-kontrollsumman stämmer inte"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr "Det finns ingen öppen nyckel tillgänglig för följande nyckel-id:n:\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2791,7 +2803,7 @@ msgstr ""
"Jag kunde inte hitta någon fil för paketet %s. Detta kan betyda att du "
"manuellt måste reparera detta paket (på grund av saknad arkitektur)."
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2800,13 +2812,13 @@ msgstr ""
"Jag kunde inte hitta någon fil för paketet %s. Detta kan betyda att du "
"manuellt måste reparera detta paket."
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Paketindexfilerna är skadede. Inget \"Filename:\"-fält för paketet %s."
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "Storleken stämmer inte"
@@ -2941,7 +2953,6 @@ msgstr "Skrev %i poster med %i saknade filer och %i filer som inte stämmer\n"
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "Öppnar konfigurationsfilen %s"
@@ -2952,7 +2963,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:542
#, fuzzy, c-format
-#| msgid "Hash Sum mismatch"
msgid "Hash mismatch for: %s"
msgstr "Hash-kontrollsumman stämmer inte"
@@ -2973,7 +2983,6 @@ msgstr "Tar bort %s"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "Tog bort hela %s"
@@ -3058,14 +3067,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Kunde inte lägga på programfix på filen"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Anslutningen stängdes i förtid"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Kunde inte komma åt nyckelring: \"%s\""
+
+#~ msgid "Could not patch file"
+#~ msgstr "Kunde inte lägga på programfix på filen"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/th.po b/po/th.po
index 8a98257fa..5cd9e120b 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2008-11-06 15:54+0700\n"
"Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
"Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -147,7 +147,7 @@ msgstr " ตารางรุ่น:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s สำหรับ %s คอมไพล์เมื่อ %s %s\n"
@@ -301,7 +301,7 @@ msgstr ""
" -c=? อ่านแฟ้มค่าตั้งนี้\n"
" -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "ไม่สามารถเขียนลงแฟ้ม %s"
@@ -431,8 +431,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "DB เป็นรุ่นเก่า จะพยายามปรับรุ่น %s ขึ้น"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr "ฟอร์แมตของ DB ผิด ถ้าคุณเพิ่งปรับรุ่นมาจาก apt รุ่นเก่า กรุณาลบฐานข้อมูลแล้วสร้างใหม่"
@@ -447,11 +448,11 @@ msgstr "ไม่สามารถเปิดแฟ้ม DB %s: %s"
msgid "Failed to stat %s"
msgstr "stat %s ไม่สำเร็จ"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "แพกเกจไม่มีระเบียนควบคุม"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "ไม่สามารถนำตัวชี้ตำแหน่งมาใช้ได้"
@@ -516,26 +517,26 @@ msgstr "*** ลิงก์ %s ไปยัง %s ไม่สำเร็จ"
msgid " DeLink limit of %sB hit.\n"
msgstr " มาถึงขีดจำกัดการ DeLink ที่ %sB แล้ว\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "แพกเกจไม่มีช่องข้อมูล 'Package'"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s ไม่มีข้อมูล override\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " ผู้ดูแล %s คือ %s ไม่ใช่ %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s ไม่มีข้อมูล override สำหรับซอร์ส\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s ไม่มีข้อมูล override สำหรับไบนารีเช่นกัน\n"
@@ -639,7 +640,7 @@ msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไป
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s"
@@ -800,11 +801,11 @@ msgstr "มีแพกเกจที่จำเป็นต้องถอด
msgid "Internal error, Ordering didn't finish"
msgstr "ข้อผิดพลาดภายใน: การเรียงลำดับไม่เสร็จสิ้น"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "ไม่สามารถล็อคไดเรกทอรีดาวน์โหลด"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "ไม่สามารถอ่านรายชื่อแหล่งแพกเกจได้"
@@ -833,8 +834,8 @@ msgstr "หลังจากการกระทำนี้ ต้องใ
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "หลังจากการกระทำนี้ เนื้อที่บนดิสก์จะว่างเพิ่มอีก %sB\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "ไม่สามารถคำนวณพื้นที่ว่างใน %s"
@@ -871,7 +872,7 @@ msgstr "เลิกทำ"
msgid "Do you want to continue [Y/n]? "
msgstr "คุณต้องการจะดำเนินการต่อไปหรือไม่ [Y/n]?"
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "ไม่สามารถดาวน์โหลด %s %s\n"
@@ -880,7 +881,7 @@ msgstr "ไม่สามารถดาวน์โหลด %s %s\n"
msgid "Some files failed to download"
msgstr "ดาวน์โหลดบางแฟ้มไม่สำเร็จ"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "ดาวน์โหลดสำเร็จแล้ว และอยู่ในโหมดดาวน์โหลดอย่างเดียว"
@@ -976,50 +977,50 @@ msgstr "ไม่พบรุ่น '%s' ของ '%s'"
msgid "Selected version %s (%s) for %s\n"
msgstr "เลือกรุ่น %s (%s) สำหรับ %s แล้ว\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "ไม่สามารถล็อคไดเรกทอรีรายชื่อแพกเกจ"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "apt ถูกกำหนดไม่ให้มีการลบใดๆ จึงไม่สามารถดำเนินการถอดถอนอัตโนมัติได้"
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "แพกเกจต่อไปนี้ถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "แพกเกจต่อไปนี้ถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "ใช้ 'apt-get autoremove' เพื่อลบแพกเกจดังกล่าวได้"
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1037,43 +1038,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "ข้อมูลต่อไปนี้อาจช่วยแก้ปัญหาได้:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr "เกิดข้อผิดพลาดภายใน: AutoRemover ทำความเสียหาย"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "เกิดข้อผิดพลาดภายใน: AllUpgrade ทำความเสียหาย"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "ไม่พบงาน %s"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "ไม่พบแพกเกจ %s"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "หมายเหตุ: จะเลือก %s สำหรับนิพจน์เรกิวลาร์ '%s'\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr "กำหนด %s ให้เป็นการติดตั้งแบบเลือกเองแล้ว\n"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "คุณอาจเรียก `apt-get -f install' เพื่อแก้ปัญหานี้ได้:"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1081,7 +1082,7 @@ msgstr ""
"มีปัญหาความขึ้นต่อกันระหว่างแพกเกจ กรุณาลองใช้ 'apt-get -f install' โดยไม่ระบุแพกเกจ "
"(หรือจะระบุทางแก้ก็ได้)"
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1092,122 +1093,122 @@ msgstr ""
"หรือถ้าคุณกำลังใช้รุ่น unstable ก็เป็นไปได้ว่าแพกเกจที่จำเป็นบางรายการ\n"
"ยังไม่ถูกสร้างขึ้น หรือถูกย้ายออกจาก Incoming"
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "แพกเกจมีปัญหา"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "จะติดตั้งแพกเกจเพิ่มเติมต่อไปนี้:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "แพกเกจที่แนะนำ:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "แพกเกจที่ควรใช้ร่วมกัน:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "กำลังคำนวณการปรับรุ่น... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "ล้มเหลว"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "เสร็จแล้ว"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "เกิดข้อผิดพลาดภายใน: กลไกการแก้ปัญหาทำความเสียหาย"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะดาวน์โหลดซอร์สโค้ด"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "ไม่พบแพกเกจซอร์สโค้ดสำหรับ %s"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "จะข้ามแฟ้ม '%s' ที่ดาวน์โหลดไว้แล้ว\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB/%sB\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "ดาวน์โหลดซอร์ส %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "ไม่สามารถดาวน์โหลดบางแฟ้ม"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "จะข้ามการแตกซอร์สของซอร์สที่แตกไว้แล้วใน %s\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "คำสั่งแตกแฟ้ม '%s' ล้มเหลว\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "กรุณาตรวจสอบว่าได้ติดตั้งแพกเกจ 'dpkg-dev' แล้ว\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "คำสั่ง build '%s' ล้มเหลว\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "โพรเซสลูกล้มเหลว"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะตรวจสอบสิ่งที่ต้องการสำหรับการ build"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "ไม่สามารถอ่านข้อมูลสิ่งที่ต้องการสำหรับการ build ของ %s"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s ไม่ต้องการสิ่งใดสำหรับ build\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่พบแพกเกจ %s"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1216,30 +1217,30 @@ msgstr ""
"ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่มีแพกเกจ %s "
"รุ่นที่จะสอดคล้องกับความต้องการรุ่นของแพกเกจได้"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: แพกเกจ %s ที่ติดตั้งไว้ใหม่เกินไป"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: %s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "ไม่สามารถติดตั้งสิ่งที่จำเป็นสำหรับการ build ของ %s ได้"
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับการ build ไม่สำเร็จ"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "มอดูลที่รองรับ:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1323,7 +1324,7 @@ msgstr ""
"และ apt.conf(5)\n"
" APT นี้มีพลังของ Super Cow\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1568,11 +1569,10 @@ msgstr "แฟ้ม %s/%s เขียนทับแฟ้มในแพก
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "ไม่สามารถอ่าน %s"
@@ -1602,9 +1602,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "ไดเรกทอรี info และ temp ต้องอยู่ในระบบแฟ้มเดียวกัน"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "กำลังอ่านรายชื่อแพกเกจ"
@@ -1736,11 +1736,11 @@ msgid "File not found"
msgstr "ไม่พบแฟ้ม"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "stat ไม่สำเร็จ"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "กำหนดเวลาแก้ไขไม่สำเร็จ"
@@ -1800,7 +1800,7 @@ msgstr "หมดเวลารอเชื่อมต่อ"
msgid "Server closed the connection"
msgstr "เซิร์ฟเวอร์ปิดการเชื่อมต่อ"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "การอ่านข้อมูลผิดพลาด"
@@ -1812,7 +1812,7 @@ msgstr "คำตอบท่วมบัฟเฟอร์"
msgid "Protocol corruption"
msgstr "มีความเสียหายของโพรโทคอล"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "การเขียนข้อมูลผิดพลาด"
@@ -1866,7 +1866,7 @@ msgstr "หมดเวลารอเชื่อมต่อซ็อกเก
msgid "Unable to accept connection"
msgstr "ไม่สามารถรับการเชื่อมต่อ"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "เกิดปัญหาขณะคำนวณค่าแฮชของแฟ้ม"
@@ -1930,58 +1930,63 @@ msgstr "ไม่สามารถเชื่อมต่อไปยัง %s
msgid "Connecting to %s"
msgstr "เชื่อมต่อไปยัง %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "ไม่สามารถเปิดหาที่อยู่ '%s'"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "เกิดข้อผิดพลาดชั่วคราวขณะเปิดหาที่อยู่ '%s'"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "เกิดปัญหาร้ายแรงบางอย่างขณะเปิดหาที่อยู่ '%s:%s' (%i)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "ไม่สามารถเชื่อมต่อไปยัง %s %s:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "ไม่สามารถเข้าใช้พวงกุญแจ: '%s'"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "จะล้มเลิกการติดตั้ง"
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "E: รายการอาร์กิวเมนต์ใน Acquire::gpgv::Options ยาวเกินไป จะจบการทำงาน"
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "ข้อผิดพลาดภายใน: ลายเซ็นใช้การได้ แต่ไม่สามารถระบุลายนิ้วมือของกุญแจ?!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "พบลายเซ็นที่ใช้การไม่ได้อย่างน้อยหนึ่งรายการ"
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr "ไม่สามารถเรียก '%s' เพื่อตรวจสอบลายเซ็น (ได้ติดตั้ง gpgv ไว้หรือไม่?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุขณะเรียก gpgv"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "ลายเซ็นต่อไปนี้ใช้การไม่ได้:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2030,47 +2035,47 @@ msgstr "การสนับสนุน Content-Range ที่เซิร์
msgid "Unknown date format"
msgstr "พบรูปแบบวันที่ที่ไม่รู้จัก"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "select ไม่สำเร็จ"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "หมดเวลารอเชื่อมต่อ"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้มผลลัพธ์"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์ ปลายทางอีกด้านหนึ่งปิดการเชื่อมต่อ"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr "ไม่สามารถตัดท้ายแฟ้ม"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "ข้อมูลส่วนหัวผิดพลาด"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "เชื่อมต่อไม่สำเร็จ"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "ข้อผิดพลาดภายใน"
@@ -2078,18 +2083,25 @@ msgstr "ข้อผิดพลาดภายใน"
msgid "Can't mmap an empty file"
msgstr "ไม่สามารถ mmap แฟ้มเปล่า"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "ไม่สามารถสร้าง mmap ขนาด %lu ไบต์"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2119,52 +2131,52 @@ msgstr ""
msgid "Selection %s not found"
msgstr "ไม่พบรายการเลือก %s"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "พบตัวย่อของชนิดที่ข้อมูลไม่รู้จัก: '%c'"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "ขณะเปิดแฟ้มค่าตั้ง %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "ไวยากรณ์ผิดพลาด %s:%u: เริ่มบล็อคโดยไม่มีชื่อ"
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "ไวยากรณ์ผิดพลาด %s:%u: แท็กผิดรูปแบบ"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "ไวยากรณ์ผิดพลาด %s:%u: มีขยะเกินหลังค่า"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "ไวยากรณ์ผิดพลาด %s:%u: สามารถใช้ directive ที่ระดับบนสุดได้เท่านั้น"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "ไวยากรณ์ผิดพลาด %s:%u: ใช้ include ซ้อนกันมากเกินไป"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "ไวยากรณ์ผิดพลาด %s:%u: include จากที่นี่"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "ไวยากรณ์ผิดพลาด %s:%u: พบ directive '%s' ที่ไม่รองรับ"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "ไวยากรณ์ผิดพลาด %s:%u: มีขยะเกินหลังจบแฟ้ม"
@@ -2240,75 +2252,75 @@ msgstr "ไม่สามารถเปลี่ยนไดเรกทอร
msgid "Failed to stat the cdrom"
msgstr "ไม่สามารถ stat ซีดีรอม"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่อ่านได้อย่างเดียว"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "ไม่สามารถเปิดแฟ้มล็อค %s"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่เมานท์ผ่าน nfs"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "ไม่สามารถล็อค %s"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม่อยู่"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "โพรเซสย่อย %s เกิดข้อผิดพลาดของการใช้ย่านหน่วยความจำ (segmentation fault)"
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "โพรเซสย่อย %s เกิดข้อผิดพลาดของการใช้ย่านหน่วยความจำ (segmentation fault)"
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "โพรเซสย่อย %s คืนค่าข้อผิดพลาด (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "โพรเซสย่อย %s จบการทำงานกระทันหัน"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "ไม่สามารถเปิดแฟ้ม %s"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "read: ยังเหลือ %lu ที่ยังไม่ได้อ่าน แต่ข้อมูลหมดแล้ว"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "write: ยังเหลือ %lu ที่ยังไม่ได้เขียน แต่ไม่สามารถเขียนได้"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "เกิดปัญหาขณะปิดแฟ้ม"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "เกิดปัญหาขณะลบแฟ้ม"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "เกิดปัญหาขณะ sync แฟ้ม"
@@ -2425,52 +2437,52 @@ msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (1
msgid "Unable to parse package file %s (2)"
msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist แบบสัมบูรณ์)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง dist)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "กำลังเปิด %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ยาวเกินไป"
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ชนิด)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (id ผู้ผลิต)"
@@ -2593,17 +2605,17 @@ msgstr "ไม่สามารถแจงหรือเปิดรายช
msgid "You may want to run apt-get update to correct these problems"
msgstr "คุณอาจเรียก `apt-get update' เพื่อแก้ปัญหาเหล่านี้ได้"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "ระเบียนผิดรูปแบบในแฟ้มค่าปรับแต่ง: ไม่มีข้อมูลส่วนหัว 'Package'"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "ไม่เข้าใจชนิดการตรึง %s"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "ไม่ได้ระบุลำดับความสำคัญ (หรือค่าศูนย์) สำหรับการตรึง"
@@ -2687,16 +2699,16 @@ msgstr "เกิดข้อผิดพลาดขณะประมวลผ
msgid "Package %s %s was not found while processing file dependencies"
msgstr "ไม่พบแพกเกจ %s %s ขณะประมวลผลความขึ้นต่อแฟ้ม"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "กำลังเก็บข้อมูลแฟ้มที่ตระเตรียมให้"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "เกิดข้อผิดพลาด IO ขณะบันทึกแคชของซอร์ส"
@@ -2705,39 +2717,39 @@ msgstr "เกิดข้อผิดพลาด IO ขณะบันทึ
msgid "rename failed, %s (%s -> %s)."
msgstr "เปลี่ยนชื่อไม่สำเร็จ: %s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "MD5Sum ไม่ตรงกัน"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "ผลรวมแฮชไม่ตรงกัน"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr "ไม่มีกุญแจสาธารณะสำหรับกุญแจหมายเลขต่อไปนี้:\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr "ไม่พบแฟ้มสำหรับแพกเกจ %s คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง (ไม่มี arch)"
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr "ไม่พบแฟ้มสำหรับแพกเกจ %s คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง"
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "แฟ้มดัชนีแพกเกจเสียหาย ไม่มีข้อมูล Filename: (ชื่อแฟ้ม) สำหรับแพกเกจ %s"
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "ขนาดไม่ตรงกัน"
@@ -2872,7 +2884,6 @@ msgstr "เขียนแล้ว %i ระเบียน โดยมีแ
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "ขณะเปิดแฟ้มค่าตั้ง %s"
@@ -2883,7 +2894,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:542
#, fuzzy, c-format
-#| msgid "Hash Sum mismatch"
msgid "Hash mismatch for: %s"
msgstr "ผลรวมแฮชไม่ตรงกัน"
@@ -2904,7 +2914,6 @@ msgstr "กำลังถอดถอน %s"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว"
@@ -2990,14 +2999,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "ไม่สามารถแพตช์แฟ้ม"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "การเชื่อมต่อถูกปิดก่อนเวลาอันควร"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "ไม่สามารถเข้าใช้พวงกุญแจ: '%s'"
+
+#~ msgid "Could not patch file"
+#~ msgstr "ไม่สามารถแพตช์แฟ้ม"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/tl.po b/po/tl.po
index 03799ebea..a44d44b07 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2007-03-29 21:36+0800\n"
"Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
"Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -152,7 +152,7 @@ msgstr " Talaang Bersyon:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s para sa %s %s kinompile noong %s %s\n"
@@ -309,7 +309,7 @@ msgstr ""
" -c=? Basahin ang talaksang pagkaayos na ito\n"
" -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "Hindi makapagsulat sa %s"
@@ -447,8 +447,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "Luma ang DB, sinusubukang maupgrade ang %s"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"Hindi tanggap ang anyo ng DB. Kung kayo ay nagsariwa mula sa nakaraang "
@@ -465,11 +466,11 @@ msgstr "Hindi mabuksan ang talaksang DB %s: %s"
msgid "Failed to stat %s"
msgstr "Bigo ang pag-stat ng %s"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Walang kontrol rekord ang arkibo"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Hindi makakuha ng cursor"
@@ -534,26 +535,26 @@ msgstr "*** Bigo ang pag-link ng %s sa %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink limit na %sB tinamaan.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "Walang field ng pakete ang arkibo"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s ay walang override entry\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " Tagapangalaga ng %s ay %s hindi %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s ay walang override entry para sa pinagmulan\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s ay wala ring override entry na binary\n"
@@ -657,7 +658,7 @@ msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
msgid "Y"
msgstr "O"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error sa pag-compile ng regex - %s"
@@ -822,11 +823,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "Hindi maaldaba ang directory ng download"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)."
@@ -858,8 +859,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Hindi matantsa ang libreng puwang sa %s"
@@ -896,7 +897,7 @@ msgstr "Abort."
msgid "Do you want to continue [Y/n]? "
msgstr "Nais niyo bang magpatuloy [O/h]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Bigo sa pagkuha ng %s %s\n"
@@ -905,7 +906,7 @@ msgstr "Bigo sa pagkuha ng %s %s\n"
msgid "Some files failed to download"
msgstr "May mga talaksang hindi nakuha"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang"
@@ -1003,51 +1004,51 @@ msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap"
msgid "Selected version %s (%s) for %s\n"
msgstr "Ang napiling bersyon %s (%s) para sa %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Hindi maaldaba ang directory ng talaan"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1063,46 +1064,46 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr ""
"Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Error na internal, may nasira ang problem resolver"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Hindi mahanap ang paketeng %s"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "Hindi mahanap ang paketeng %s"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Paunawa, pinili ang %s para sa regex '%s'\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "ngunit ang %s ay iluluklok"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Maaaring patakbuhin niyo ang `apt-get -f install' upang ayusin ang mga ito:"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1110,7 +1111,7 @@ msgstr ""
"May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang "
"mga pakete (o magtakda ng solusyon)."
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1121,115 +1122,115 @@ msgstr ""
"o kung kayo'y gumagamit ng pamudmod na unstable ay may ilang mga paketeng\n"
"kailangan na hindi pa nalikha o linipat mula sa Incoming."
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "Sirang mga pakete"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Mga paketeng mungkahi:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Mga paketeng rekomendado:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "Sinusuri ang pag-upgrade... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Bigo"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Tapos"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "Error na internal, may nasira ang problem resolver"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Hindi mahanap ang paketeng source para sa %s"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Linaktawan ang nakuha na na talaksan '%s'\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Kulang kayo ng libreng puwang sa %s"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Kailangang kumuha ng %sB ng arkibong source.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "Kunin ang Source %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "Bigo sa pagkuha ng ilang mga arkibo."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Bigo ang utos ng pagbuklat '%s'.\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Utos na build '%s' ay bigo.\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "Bigo ang prosesong anak"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr "Kailangang magtakda ng kahit isang pakete na susuriin ang builddeps"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Hindi makuha ang impormasyong build-dependency para sa %s"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "Walang build depends ang %s.\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1238,7 +1239,7 @@ msgstr ""
"Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
"mahanap"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1247,32 +1248,32 @@ msgstr ""
"Dependensiyang %s para sa %s ay hindi mabuo dahil walang magamit na bersyon "
"ng paketeng %s na tumutugon sa kinakailangang bersyon"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %"
"s ay bagong-bago pa lamang."
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Hindi mabuo ang build-dependencies para sa %s."
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "Bigo sa pagproseso ng build dependencies"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "Suportadong mga Module:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1355,7 +1356,7 @@ msgstr ""
"para sa karagdagang impormasyon at mga option.\n"
" Ang APT na ito ay may Kapangyarihan Super Kalabaw.\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1604,11 +1605,10 @@ msgstr "Ang talaksang %s/%s ay pumapatong sa isang talaksan sa paketeng %s"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "Hindi mabasa ang %s"
@@ -1638,9 +1638,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Ang info at temp directory ay kailangang nasa parehong filesystem"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "Binabasa ang Listahan ng mga Pakete"
@@ -1775,11 +1775,11 @@ msgid "File not found"
msgstr "Hindi Nahanap ang Talaksan"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "Bigo ang pag-stat"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "Bigo ang pagtakda ng oras ng pagbago"
@@ -1841,7 +1841,7 @@ msgstr "Lumipas ang koneksyon"
msgid "Server closed the connection"
msgstr "Sinarhan ng server ang koneksyon"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Error sa pagbasa"
@@ -1853,7 +1853,7 @@ msgstr "May sagot na bumubo sa buffer."
msgid "Protocol corruption"
msgstr "Sira ang protocol"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Error sa pagsulat"
@@ -1907,7 +1907,7 @@ msgstr "Nag-timeout ang socket ng datos"
msgid "Unable to accept connection"
msgstr "Hindi makatanggap ng koneksyon"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema sa pag-hash ng talaksan"
@@ -1971,63 +1971,68 @@ msgstr "Hindi maka-konekta sa %s:%s (%s)."
msgid "Connecting to %s"
msgstr "Kumokonekta sa %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "Hindi maresolba ang '%s'"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Pansamantalang kabiguan sa pagresolba ng '%s'"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Hindi maka-konekta sa %s %s:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "Hindi mabasa ang keyring: '%s'"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Ina-abort ang pag-instol."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"E: Sobrang haba ng talaan ng argumento mula sa Acquire::gpgv::Options. "
"Lalabas."
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Error na internal: Tanggap na lagda, ngunit hindi malaman ang key "
"fingerprint?!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "Hindi kukulang sa isang hindi tanggap na lagda ang na-enkwentro."
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Hindi maitakbo ang '%s' upang maberipika ang lagda (nakaluklok ba ang gpgv?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "Hindi kilalang error sa pag-execute ng gpgv"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "Ang sumusunod na mga lagda ay imbalido:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2078,48 +2083,48 @@ msgstr "Sira ang range support ng HTTP server na ito"
msgid "Unknown date format"
msgstr "Di kilalang anyo ng petsa"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "Bigo ang pagpili"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "Nag-timeout ang koneksyon"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "Error sa pagsulat ng talaksang output"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "Error sa pagsulat sa talaksan"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "Error sa pagsusulat sa talaksan"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "Error sa pagbasa mula sa server"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
#, fuzzy
msgid "Failed to truncate file"
msgstr "Bigo sa pagsulat ng talaksang %s"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "Maling datos sa panimula"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "Bigo ang koneksyon"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Internal na error"
@@ -2127,18 +2132,25 @@ msgstr "Internal na error"
msgid "Can't mmap an empty file"
msgstr "Hindi mai-mmap ang talaksang walang laman"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Hindi makagawa ng mmap ng %lu na byte"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2168,53 +2180,53 @@ msgstr ""
msgid "Selection %s not found"
msgstr "Piniling %s ay hindi nahanap"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Hindi kilalang katagang uri: '%c'"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "Binubuksan ang talaksang pagsasaayos %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Syntax error %s:%u: Nag-umpisa ang block na walang pangalan."
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntax error %s:%u: Maling anyo ng Tag"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Syntax error %s:%u: May basura matapos ng halaga"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Syntax error %s:%u: Maaari lamang gawin ang mga direktiba sa tuktok na antas"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Syntax error %s:%u: Labis ang pagkaka-nest ng mga include"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntax error %s:%u: Sinama mula dito"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Syntax error %s:%u: Di suportadong direktiba '%s'"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntax error %s:%u: May basura sa dulo ng talaksan"
@@ -2292,78 +2304,78 @@ msgstr "Di makalipat sa %s"
msgid "Failed to stat the cdrom"
msgstr "Bigo sa pag-stat ng cdrom"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr ""
"Hindi ginagamit ang pagaldaba para sa basa-lamang na talaksang aldaba %s"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "Hindi mabuksan ang talaksang aldaba %s"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr ""
"Hindi gumagamit ng pag-aldaba para sa talaksang aldaba %s na naka-mount sa "
"nfs"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "hindi makuha ang aldaba %s"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Naghintay, para sa %s ngunit wala nito doon"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Nakatanggap ang sub-process %s ng segmentation fault."
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "Nakatanggap ang sub-process %s ng segmentation fault."
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Naghudyat ang sub-process %s ng error code (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Ang sub-process %s ay lumabas ng di inaasahan"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "Hindi mabuksan ang talaksang %s"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "pagbasa, mayroong %lu na babasahin ngunit walang natira"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "pagsulat, mayroon pang %lu na isusulat ngunit hindi makasulat"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Problema sa pagsara ng talaksan"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "Problema sa pag-unlink ng talaksan"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "Problema sa pag-sync ng talaksan"
@@ -2481,52 +2493,52 @@ msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Hindi ma-parse ang talaksang pakete %s (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (absolute dist)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "Binubuksan %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Labis ang haba ng linyang %u sa talaksang pagkukunan %s."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (vendor id)"
@@ -2658,17 +2670,17 @@ msgstr ""
"Maaaring patakbuhin niyo ang apt-get update upang ayusin ang mga problemang "
"ito"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Di tanggap na record sa talaksang pagtatangi, walang Package header"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "Hindi naintindihan ang uri ng pin %s"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "Walang prioridad (o sero) na nakatakda para sa pin"
@@ -2755,16 +2767,16 @@ msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"Hindi nahanap ang paketeng %s %s habang prinoseso ang mga dependensiya."
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "Kinukuha ang Talaksang Provides"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "IO Error sa pag-imbak ng source cache"
@@ -2773,20 +2785,20 @@ msgstr "IO Error sa pag-imbak ng source cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "Di tugmang MD5Sum"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "Di tugmang MD5Sum"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr "Walang public key na magamit para sa sumusunod na key ID:\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2795,7 +2807,7 @@ msgstr ""
"Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
"niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)"
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2804,7 +2816,7 @@ msgstr ""
"Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
"niyong ayusin ng de kamay ang paketeng ito."
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2812,7 +2824,7 @@ msgstr ""
"Sira ang talaksang index ng mga pakete. Walang Filename: field para sa "
"paketeng %s."
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "Di tugmang laki"
@@ -2950,7 +2962,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "Binubuksan ang talaksang pagsasaayos %s"
@@ -2981,7 +2992,6 @@ msgstr "Tinatanggal ang %s"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "Natanggal ng lubusan ang %s"
@@ -3065,14 +3075,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Hindi mai-patch ang talaksan"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Nagsara ng maaga ang koneksyon"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Hindi mabasa ang keyring: '%s'"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Hindi mai-patch ang talaksan"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/uk.po b/po/uk.po
index 976b44b44..84ee8e0ce 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-all\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2006-07-29 15:57+0300\n"
"Last-Translator: Artem Bondarenko <artem.brz@gmail.com>\n"
"Language-Team: Українська <uk@li.org>\n"
@@ -148,7 +148,7 @@ msgstr " Таблиця версій:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s для %s %s скомпільовано %s %s\n"
@@ -302,7 +302,7 @@ msgstr ""
" -c=? Читати зазначений конфігураційний файл\n"
" -o=? Вказати довільну опцію, наприклад, -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "Неможливо записати в %s"
@@ -445,8 +445,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "DB застаріла, намагаюсь оновити %s"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"Формати DB не є правильним. Якщо ви оновилися зі старої версії apt, будь-"
@@ -463,11 +464,11 @@ msgstr "Не вдалося відкрити DB файл %s: %s"
msgid "Failed to stat %s"
msgstr "Не вдалося одержати атрибути %s"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "В архіві немає поля control"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Неможливо одержати курсор"
@@ -532,26 +533,26 @@ msgstr "*** Не вдалося створити посилання %s на %s"
msgid " DeLink limit of %sB hit.\n"
msgstr "Перевищено ліміт в %s в DeLink.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "В архіві немає поля package"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " Відсутній запис про перепризначення для %s\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " пакунок %s супроводжує %s, а не %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -655,7 +656,7 @@ msgstr "Не вдалося перейменувати %s в %s"
msgid "Y"
msgstr "Т"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "Помилка компіляції регулярного виразу - %s"
@@ -820,11 +821,11 @@ msgstr "Пакунки необхідно видалити, але видале
msgid "Internal error, Ordering didn't finish"
msgstr "Внутрішня помилка, Ordering не завершилася"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "Неможливо заблокувати теку для завантаження"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Неможливо прочитати перелік джерел."
@@ -854,8 +855,8 @@ msgid "After this operation, %sB disk space will be freed.\n"
msgstr ""
"Після розпакування об'єм зайнятого дискового простору зменшиться на %sB.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Не вдалося визначити кількість вільного місця в %s"
@@ -894,7 +895,7 @@ msgstr "Перервано."
msgid "Do you want to continue [Y/n]? "
msgstr "Бажаєте продовжити [Т/н]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Не вдалося завантажити %s %s\n"
@@ -903,7 +904,7 @@ msgstr "Не вдалося завантажити %s %s\n"
msgid "Some files failed to download"
msgstr "Деякі файли не вдалося завантажити"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "Вказано режим \"тільки завантаження\", і завантаження завершено"
@@ -1003,51 +1004,51 @@ msgstr "Версія '%s' для '%s' не знайдена"
msgid "Selected version %s (%s) for %s\n"
msgstr "Обрана версія %s (%s) для %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Не вдалося прочитати атрибути переліку вихідних текстів%s"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "Команді update не потрібні аргументи"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Неможливо заблокувати теку з переліками пакунків"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "НОВІ пакунки були встановлені автоматично і більше не потрібні:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "НОВІ пакунки були встановлені автоматично і більше не потрібні:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Використовуйте 'apt-get autoremove' щоб видалити їх."
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1065,46 +1066,46 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "Наступна інформація можливо допоможе Вам:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Внутрішня помилка, вирішувач проблем все поламав"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Внутрішня помилка, AllUpgrade все поламав"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Не можу знайти пакунок %s"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "Не можу знайти пакунок %s"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Помітьте, регулярний вираз %2$s призводить до вибору %1$s\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "але %s буде встановлений"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Можливо, для виправлення цих помилок Ви захочете скористатися 'apt-get -f "
"install':"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1112,7 +1113,7 @@ msgstr ""
"Незадоволені залежності. Спробуйте виконати 'apt-get -f install', не "
"вказуючи імені пакунка (або знайдіть інше рішення)."
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1123,121 +1124,121 @@ msgstr ""
"або ж використаєте нестабільний дистрибутив, і запитані Вами пакунки\n"
"ще не створені або були вилучені з Incoming."
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "Зламані пакунки"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "Будуть встановлені наступні додаткові пакунки:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Пропоновані пакунки:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Рекомендовані пакунки:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "Обчислення оновлень... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Невдача"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Виконано"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "Внутрішня помилка, вирішувач проблем все поламав"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні "
"тексти"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Неможливо знайти пакунок з вихідними текстами для %s"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Пропускаємо вже завантажений файл '%s'\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Недостатньо місця в %s"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Необхідно завантажити %sB/%sB з архівів вихідних текстів.\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Потрібно завантажити %sB архівів з вихідними текстами.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "Завантаження вихідних текстів %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "Деякі архіви не вдалося завантажити."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"Розпакування вихідних текстів пропущено, тому що в %s вже перебувають "
"розпаковані вихідні тексти\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Команда розпакування '%s' завершилася невдало.\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Команда побудови '%s' закінчилася невдало.\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "Породжений процес завершився невдало"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Для перевірки залежностей для побудови необхідно вказати як мінімум один "
"пакунок"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Неможливо одержати інформацію про залежності для побудови %s"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s не має залежностей для побудови.\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1245,7 +1246,7 @@ msgid ""
msgstr ""
"Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1254,32 +1255,32 @@ msgstr ""
"Залежність типу %s для %s не може бути задоволена, бо ні одна з версій "
"пакунка %s не задовольняє умови"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Не вдалося задовольнити залежність типу %s для пакунка %s: Встановлений "
"пакунок %s новіше, аніж треба"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Неможливо задовольнити залежність типу %s для пакунка %s: %s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Залежності для побудови %s не можуть бути задоволені."
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "Обробка залежностей для побудови закінчилася невдало"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "Підтримувані модулі:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1366,7 +1367,7 @@ msgstr ""
"містять більше інформації.\n"
" This APT has Super Cow Powers.\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1617,11 +1618,10 @@ msgstr "Файл %s/%s перезаписує інший з пакету %s"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "Неможливо прочитати %s"
@@ -1651,9 +1651,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Теки info і temp повинні бути на тій самій файловій системі"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "Читання переліків пакетів"
@@ -1790,11 +1790,11 @@ msgid "File not found"
msgstr "Файл не знайдено"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "Не вдалося одержати атрибути"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "Не вдалося встановити час модифікації"
@@ -1856,7 +1856,7 @@ msgstr "Час з'єднання вичерпався"
msgid "Server closed the connection"
msgstr "Сервер закрив з'єднання"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Помилка читання"
@@ -1868,7 +1868,7 @@ msgstr "Відповідь переповнила буфер."
msgid "Protocol corruption"
msgstr "Спотворений протокол"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Помилка запису"
@@ -1924,7 +1924,7 @@ msgstr "Час з'єднання з сокетом даних вичерпавс
msgid "Unable to accept connection"
msgstr "Неможливо прийняти з'єднання"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Проблема хешування файла"
@@ -1988,61 +1988,66 @@ msgstr "Не можливо під'єднатися до %s:%s (%s)."
msgid "Connecting to %s"
msgstr "З'єднання з %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "Не можу знайти IP адрес для %s"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Тимчасова помилка при отриманні IP адреси '%s'"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Сталося щось дивне при спробі отримати IP адрес для '%s:%s' (%i)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Не можливо під'єднатися до %s %s:"
-#: methods/gpgv.cc:71
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
#, fuzzy, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "Неможливо отримати доступ до keyring: '%s'"
+msgid "No keyring installed in %s."
+msgstr "Переривається встановлення."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"E: Перелік аргументів з Acquire::gpgv::Options занадто довгий. Відміна."
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Внутрішня помилка: Вірний підпис (signature), але не можливо визначити його "
"відбиток?!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "Знайдено як мінімум один невірний підпис."
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr "Неможливо виконати '%s' для перевірки підпису, gpgv встановлено?"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "Невідома помилка виконання gpgv"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "Слідуючі підписи були невірними:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2093,50 +2098,50 @@ msgstr "Цей HTTP сервер має поламану підтримку 'ran
msgid "Unknown date format"
msgstr "Невідомий формат дати"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "Вибір не вдався"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "Час очікування з'єднання вийшов"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "Помилка запису в вихідний файл"
-#: methods/http.cc:849
+#: methods/http.cc:850
#, fuzzy
msgid "Error writing to file"
msgstr "Помилка запису в файл"
-#: methods/http.cc:877
+#: methods/http.cc:878
#, fuzzy
msgid "Error writing to the file"
msgstr "Помилка запису в файл"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "Помилка читання з сервера. Віддалена сторона закрила з'єднання"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "Помилка читання з сервера"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
#, fuzzy
msgid "Failed to truncate file"
msgstr "Не вдалося записати файл %s"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "Погана заголовкова інформація"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "З'єднання не вдалося"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Внутрішня помилка"
@@ -2144,18 +2149,25 @@ msgstr "Внутрішня помилка"
msgid "Can't mmap an empty file"
msgstr "Неможливо відобразити в пам'яті пустий файл"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Неможливо відобразити в пам'яті %lu байт"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2185,54 +2197,54 @@ msgstr ""
msgid "Selection %s not found"
msgstr "Вибір %s не знайдено"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Нерозпізнаваний тип абревіатури: '%c'"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "Відкривається конфігураційний файл %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Синтаксова помилка %s:%u: Блок починається без назви."
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Синтаксова помилка %s:%u: спотворений тег"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Синтаксова помилка %s:%u: зайві символи після величини"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, fuzzy, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Синтаксова помилка %s:%u: Директиви можуть бути виконані тільки на "
"найвищому рівні"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Синтаксова помилка %s:%u: Забагато вмонтованих включень"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Синтаксова помилка %s:%u: Включена звідси"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Синтаксова помилка %s:%u: Директива '%s' не підтримується"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Синтаксова помилка %s:%u: зайві символи в кінці файла"
@@ -2308,80 +2320,80 @@ msgstr "Неможливо зробити зміни у %s"
msgid "Failed to stat the cdrom"
msgstr "Не вдалося прочитати атрибути cdrom"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr ""
"Блокування не використовується, так як файл блокування %s доступний тільки "
"для читання"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "Не можливо відкрити lock файл %s"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr ""
"Блокування не використовується, так як файл блокування %s знаходиться на "
"файловій системі nfs"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, fuzzy, c-format
msgid "Could not get lock %s"
msgstr "Не можливо отримати lock %s"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Очікується на %s але його тут немає"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Підпроцес %s отримав segmentation fault."
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "Підпроцес %s отримав segmentation fault."
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Підпроцес %s повернув код помилки (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Підпроцес %s раптово завершився"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "Не можливо відкрити файл %s"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr ""
"помилка при читанні. мали прочитати ще %lu байт, але нічого більше нема"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "помилка при записі, мали прочитати ще %lu байт, але не змогли"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Проблема з закриттям файла"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "Проблема з роз'єднанням файла"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "Проблема з синхронізацією файла"
@@ -2499,53 +2511,53 @@ msgstr "Неможливо обробити файл %s пакунку (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Неможливо обробити файл %s пакунку (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Спотворена лінія %lu у переліку джерел %s (проблема в URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
"Спотворена лінія %lu у переліку джерел %s (проблема в назві дистрибутиву)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Спотворена лінія %lu у переліку джерел %s (обробка URI)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Спотворена лінія %lu у переліку джерел %s (absolute dist)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Спотворена лінія %lu у переліку джерел %s (dist parse)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "Відкриття %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Лінія %u занадто довга в переліку джерел %s."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Спотворена лінія %u у переліку джерел %s (тип)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Невідомий тип '%s' в лінії %u в переліку джерел %s"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Спотворена лінія %u у переліку джерел %s (vendor id)"
@@ -2673,17 +2685,17 @@ msgstr "Не можу обробити чи відкрити перелік па
msgid "You may want to run apt-get update to correct these problems"
msgstr "Можливо, для виправлення цих помилок Ви захочете запустити apt-get"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Невірний запис в preferences файлі, відсутній заголовок Package"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "Не зрозумів тип %s для pin"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "Не встановлено пріоритету (або встановлено 0) для pin"
@@ -2768,17 +2780,17 @@ msgstr "Помилка, яка була викликана внаслідок о
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Пакунок %s %s не був знайдений під час обробки залежностей файла"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Не вдалося прочитати атрибути переліку вихідних текстів%s"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
#, fuzzy
msgid "Collecting File Provides"
msgstr "Збирання інформації про файлів "
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "Помилка IO під час збереження джерельного кешу"
@@ -2787,21 +2799,21 @@ msgstr "Помилка IO під час збереження джерельно
msgid "rename failed, %s (%s -> %s)."
msgstr "Не вдалося перейменувати, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "Невідповідність MD5Sum"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "Невідповідність MD5Sum"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
#, fuzzy
msgid "There is no public key available for the following key IDs:\n"
msgstr "Відсутній публічний ключ для заданих ID ключа:\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2810,7 +2822,7 @@ msgstr ""
"Я не можу знайти файл для пакунку %s. Можливо, Ви захочете власноруч "
"виправити цей пакунок. (due to missing arch)"
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2819,14 +2831,14 @@ msgstr ""
"Я не можу знайти файл для пакунку %s. Можливо, Ви захочете власноруч "
"виправити цей пакунок."
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Індексні файли пакунків пошкоджені. Немає поля Filename для пакунку %s."
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "Невідповідність розміру"
@@ -2960,7 +2972,6 @@ msgstr "Записано %i записів з %i відсутніми і %i не
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "Відкривається конфігураційний файл %s"
@@ -2991,7 +3002,6 @@ msgstr "Видаляється %s"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "Повністю видалено %s"
@@ -3076,14 +3086,31 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Неможливо накласти латку на файл"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "З'єднання завершено передчасно"
+#, fuzzy
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Неможливо отримати доступ до keyring: '%s'"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Неможливо накласти латку на файл"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/vi.po b/po/vi.po
index 07e7870fe..eb509c29b 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.14\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2008-12-22 19:04+1030\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -148,7 +148,7 @@ msgstr " Bảng phiên bản:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s cho %s được biên dịch trên %s %s\n"
@@ -314,7 +314,7 @@ msgstr ""
" -c=? \t\tĐọc tập tin cấu hình này\n"
" -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "Không thể ghi vào %s"
@@ -463,8 +463,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "Cơ sở dữ liệu cũ nên đang cố nâng cấp lên %s"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"Dạng thức co sở dữ liệu không hợp lệ. Nếu bạn đã nâng cấp từ một phiên bản "
@@ -481,11 +482,11 @@ msgstr "Không thể mở tập tin cơ sở dữ liệu %s: %s."
msgid "Failed to stat %s"
msgstr "Việc lấy thông tin toàn bộ cho %s bị lỗi"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Kho không có mục ghi điều khiển"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Không thể lấy con chạy"
@@ -550,26 +551,26 @@ msgstr "*** Việc liên kết %s đến %s bị lỗi"
msgid " DeLink limit of %sB hit.\n"
msgstr " Hết hạn bỏ liên kết của %sB.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "Kho không có trường gói"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s không có mục ghi đè\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " người bảo quản %s là %s không phải %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s không có mục ghi đè nguồn\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s cũng không có mục ghi đè nhị phân\n"
@@ -673,7 +674,7 @@ msgstr "Việc đổi tên %s thành %s bị lỗi"
msgid "Y"
msgstr "C"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "Lỗi biên dich biểu thức chính quy - %s"
@@ -836,11 +837,11 @@ msgstr "Cần phải gỡ bỏ một số gói, nhưng mà khả năng Gỡ bỏ
msgid "Internal error, Ordering didn't finish"
msgstr "Gặp lỗi nội bộ: tiến trình Sắp xếp chưa xong"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "Không thể khóa thư mục tải về"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Không thể đọc danh sách nguồn."
@@ -870,8 +871,8 @@ msgstr "Sau thao tác này, %sB sức chứa đĩa thêm sẽ được chiếm.\
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Sau thao tác này, %sB sức chứa đĩa thêm sẽ được giải phóng.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Không thể quyết định chỗ rảnh trong %s"
@@ -909,7 +910,7 @@ msgstr "Hủy bỏ."
msgid "Do you want to continue [Y/n]? "
msgstr "Bạn có muốn tiếp tục không? [Y/n] [C/k] "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Việc gói %s bị lỗi %s\n"
@@ -918,7 +919,7 @@ msgstr "Việc gói %s bị lỗi %s\n"
msgid "Some files failed to download"
msgstr "Một số tập tin không tải về được"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "Mới tải về xong và trong chế độ chỉ tải về"
@@ -1017,52 +1018,52 @@ msgstr "Không tìm thấy phiên bản « %s » cho « %s »"
msgid "Selected version %s (%s) for %s\n"
msgstr "Đã chọn phiên bản %s (%s) cho %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Không thể lấy các thông tin về danh sách gói nguồn %s"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "Lệnh cập nhật không chấp nhật đối số"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Không thể khóa thư mục danh sách"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Không nên xoá gì thì không thể khởi chạy Bộ Gỡ bỏ Tự động"
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr ""
"Theo đây có những gói đã được cài đặt tự động nên không còn cần thiết lại:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"Theo đây có những gói đã được cài đặt tự động nên không còn cần thiết lại:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Hãy sử dụng lệnh « apt-get autoremove » để gỡ bỏ chúng."
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1080,43 +1081,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ quyết định trường hợp:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Lỗi nội bộ : Bộ Gỡ bỏ Tự động đã làm hư gì."
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Lỗi nội bộ: AllUpgrade (toàn bộ nâng cấp) đã ngắt gì"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "Không tìm thấy tác vụ %s"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "Không tìm thấy gói %s"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Ghi chú : đang chọn %s cho biểu thức chính quy « %s »\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s được đặt thành « được cài đặt bằng tay ».\n"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Có lẽ bạn hãy chạy lênh « apt-get -f install » để sửa hết:"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1124,7 +1125,7 @@ msgstr ""
"Gói còn phụ thuộc vào phần mềm chưa có. Hãy cố chạy lệnh « apt-get -f install "
"» mà không có gói nào (hoặc ghi rõ cách quyết định)."
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1136,123 +1137,123 @@ msgstr ""
"bất định, có lẽ chưa tạo một số gói cần thiết,\n"
"hoặc chưa di chuyển chúng ra phần Incoming (Đến)."
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "Gói bị ngắt"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "Những gói thêm theo đây sẽ được cài đặt:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Gói được đệ nghị:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Gói được khuyên:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "Đang tính nâng cấp... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Bị lỗi"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Xong"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr "Phải ghi rõ ít nhất một gói cần lấy nguồn cho nó"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
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:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Đang bỏ qua tập tin đã được tải về « %s »\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Không đủ sức chứa còn rảnh trong %s"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Cần phải lấy %sB/%sB kho nguồn.\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Cần phải lấy %sB kho nguồn.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "Lấy nguồn %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "Việc lấy một số kho bị lỗi."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Đang bỏ qua giải nén nguồn đã giải nén trong %s\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Lệnh giải nén « %s » bị lỗi.\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Hãy kiểm tra xem gói « dpkg-dev » có được cài đặt chưa.\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Lệnh xây dụng « %s » bị lỗi.\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "Tiến trình con bị lỗi"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Phải ghi rõ ít nhất một gói cần kiểm tra cách phụ thuộc khi xây dụng cho nó"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Không thể lấy thông tin về cách phụ thuộc khi xây dụng cho %s"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s không phụ thuộc vào gì khi xây dụng.\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "cách phụ thuộc %s cho %s không thể được thỏa vì không tìm thấy gọi %s"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1261,31 +1262,31 @@ msgstr ""
"cách phụ thuộc %s cho %s không thể được thỏa vì không có phiên bản sẵn sàng "
"của gói %s có thể thỏa điều kiện phiên bản."
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s quá mới"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi: %s."
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Không thể thỏa cách phụ thuộc khi xây dụng cho %s."
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "Việc xử lý cách phụ thuộc khi xây dụng bị lỗi"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "Mô-đun đã hỗ trợ :"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1377,7 +1378,7 @@ msgstr ""
"sources.list(5) và apt.conf(5).\n"
" Trình APT này có năng lực của siêu bò.\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1628,11 +1629,10 @@ msgstr "Tập tin %s/%s ghi đè lên điều trong gói %s"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "Không thể đọc %s"
@@ -1664,9 +1664,9 @@ msgstr ""
"thống tập tin"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "Đang đọc các danh sách gói..."
@@ -1802,11 +1802,11 @@ msgid "File not found"
msgstr "Không tìm thấy tập tin"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "Việc lấy các thông tin bị lỗi"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "Việc lập giờ sửa đổi bị lỗi"
@@ -1868,7 +1868,7 @@ msgstr "Thời hạn kết nối"
msgid "Server closed the connection"
msgstr "Máy phục vụ đã đóng kết nối"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Lỗi đọc"
@@ -1880,7 +1880,7 @@ msgstr "Một trả lời đã tràn bộ đệm."
msgid "Protocol corruption"
msgstr "Giao thức bị hỏng"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Lỗi ghi"
@@ -1934,7 +1934,7 @@ msgstr "Kết nối ổ cắm dữ liệu đã quá giờ"
msgid "Unable to accept connection"
msgstr "Không thể chấp nhận kết nối"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Gặp khó khăn băm tập tin"
@@ -1998,59 +1998,64 @@ msgstr "Không thể kết nối đến %s:%s (%s)."
msgid "Connecting to %s"
msgstr "Đang kết nối đến %s..."
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "Không thể tháo gỡ « %s »"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Việc tháo gỡ « %s » bị lỗi tạm thời"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Gặp lỗi nghiệm trọng khi tháo gỡ « %s:%s » (%i)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Không thể kết nối đến %s %s:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "Không thể truy cập vòng khoá « %s »"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Đang hủy bỏ cài đặt."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "E: Danh sách lệnh từ « Acquire::gpgv::Options » quá dài nên thoát."
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "Lỗi nội bộ: chữ ký đúng, nhưng không thể quyết định vân tay khóa ?!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "Gặp ít nhất một chữ ký không hợp lệ."
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Không thể thực hiện « %s » để kiểm chứng chữ ký (gpgv có được cài đặt chưa?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "Gặp lỗi lạ khi thực hiện gpgv"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "Những chữ ký theo đây là không hợp lệ:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2104,47 +2109,47 @@ msgstr "Máy phục vụ HTTP đã ngắt cách hỗ trợ phạm vị"
msgid "Unknown date format"
msgstr "Không biết dạng ngày"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "Việc chọn bị lỗi"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "Kết nối đã quá giờ"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "Gặp lỗi khi ghi vào tập tin xuất"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "Gặp lỗi khi ghi vào tập tin"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "Gặp lỗi khi ghi vào tập tin đó"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "Gặp lỗi khi đọc từ máy phục vụ : cuối ở xa đã đóng kết nối"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "Gặp lỗi khi đọc từ máy phục vụ"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr "Lỗi cắt ngắn tập tin"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "Dữ liệu dòng đầu sai"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "Kết nối bị ngắt"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Gặp lỗi nội bộ"
@@ -2152,18 +2157,25 @@ msgstr "Gặp lỗi nội bộ"
msgid "Can't mmap an empty file"
msgstr "Không thể mmap (ảnh xạ bộ nhớ) tâp tin rỗng"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Không thể tạo mmap (ảnh xạ bộ nhớ) kích cỡ %lu byte"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2193,52 +2205,52 @@ msgstr ""
msgid "Selection %s not found"
msgstr "Không tìm thấy vùng chọn %s"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Không nhận biết viết tắt kiểu: « %c »"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "Đang mở tập tin cấu hình %s..."
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Gặp lỗi cú pháp %s:%u: khối bắt đầu không có tên."
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Gặp lỗi cú pháp %s:%u: thẻ dạng sai"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Gặp lỗi cú pháp %s:%u: có rác thêm sau giá trị"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "Gặp lỗi cú pháp %s:%u: có thể thực hiện chỉ thị chỉ tại mức đầu"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Gặp lỗi cú pháp %s:%u: quá nhiều điều bao gồm lồng nhau"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Gặp lỗi cú pháp %s:%u: đã bao gồm từ đây"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Gặp lỗi cú pháp %s:%u: chưa hỗ trợ chỉ thị « %s »"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Gặp lỗi cú pháp %s:%u: rác thêm tại kết thúc tập tin"
@@ -2314,75 +2326,75 @@ msgstr "Không thể chuyển đổi sang %s"
msgid "Failed to stat the cdrom"
msgstr "Việc lấy cac thông tin cho đĩa CD-ROM bị lỗi"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "Không dùng khả năng khóa cho tập tin khóa chỉ đọc %s"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "Không thể mở tập tin khóa %s"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "Không dùng khả năng khóa cho tập tin khóa đã lắp kiểu NFS %s"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "Không thể lấy khóa %s"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Đã đợi %s nhưng mà chưa gặp nó"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Tiến trình con %s đã nhận một lỗi chia ra từng đoạn."
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "Tiến trình con %s đã nhận một lỗi chia ra từng đoạn."
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Tiến trình con %s đã trả lời mã lỗi (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Tiến trình con %s đã thoát bất ngờ"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "Không thể mở tập tin %s"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "đọc, còn cần đọc %lu nhưng mà không có điều còn lại"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "ghi, còn cần ghi %lu nhưng mà không thể"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Gặp lỗi khi đóng tập tin đó"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "Gặp lỗi khi bỏ liên kết tập tin đó"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "Gặp lỗi khi đồng bộ hóa tập tin đó"
@@ -2499,55 +2511,55 @@ msgstr "Không thể phân tách tập tin gói %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Không thể phân tách tập tin gói %s (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Gặp dòng dạng sai %lu trong danh sách nguồn %s (địa chỉ URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Gặp dòng dạng sai %lu trong danh sách nguồn %s (bản phân phối)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
"Gặp dòng dạng sai %lu trong danh sách nguồn %s (phân tách địa chỉ URI)."
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
"Gặp dòng dạng sai %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
"Gặp dòng dạng sai %lu trong danh sách nguồn %s (phân tách bản phân phối)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "Đang mở %s..."
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Dòng %u quá dài trong danh sách nguồn %s."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Gặp dòng dạng sai %u trong danh sách nguồn %s (kiểu)."
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Không biết kiểu « %s » trên dòng %u trong danh sách nguồn %s."
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Gặp dòng dạng sai %u trong danh sách nguồn %s (mã nhận biết nhà bán)"
@@ -2674,19 +2686,19 @@ msgid "You may want to run apt-get update to correct these problems"
msgstr ""
"Có lẽ bạn muốn chạy « apt-get update » (lấy cập nhật) để sửa các vấn đề này"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
"Gặp mục ghi không hợp lệ trong tập tin tùy thích: không có phần đầu Package "
"(Gói)."
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "Không hiểu kiểu ghim %s"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim"
@@ -2772,16 +2784,16 @@ msgstr ""
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Không tìm thấy gói %s %s khi xử lý cách phụ thuộc của/vào tập tin"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Không thể lấy các thông tin về danh sách gói nguồn %s"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "Đang tập hợp các trường hợp « tập tin miễn là »"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn"
@@ -2790,19 +2802,19 @@ msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn"
msgid "rename failed, %s (%s -> %s)."
msgstr "việc thay đổi tên bị lỗi, %s (%s → %s)."
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "MD5Sum (tổng kiểm) không khớp được"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "Sai khớp tổng băm (hash sum)"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
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:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2811,7 +2823,7 @@ msgstr ""
"Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói "
"này, do thiếu kiến trúc."
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2820,7 +2832,7 @@ msgstr ""
"Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói "
"này."
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2828,7 +2840,7 @@ msgstr ""
"Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập "
"tin:) cho gói %s."
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "Kích cỡ không khớp được"
@@ -2964,7 +2976,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "Đang mở tập tin cấu hình %s..."
@@ -2975,7 +2986,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:542
#, fuzzy, c-format
-#| msgid "Hash Sum mismatch"
msgid "Hash mismatch for: %s"
msgstr "Sai khớp tổng băm (hash sum)"
@@ -2996,7 +3006,6 @@ msgstr "Đang gỡ bỏ %s..."
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "Mới gỡ bỏ hoàn toàn %s"
@@ -3080,14 +3089,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Không thể vá lỗi trong tập tin %s"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Kết nối bị đóng quá sớm."
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Không thể truy cập vòng khoá « %s »"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Không thể vá lỗi trong tập tin %s"
+
# Variable: do not translate/ biến: đừng dịch
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8f4e1440c..56c64e451 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2009-12-02 01:00+0800\n"
"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
"Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
@@ -148,7 +148,7 @@ msgstr " 版本列表:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s,用于 %s 构架,编译于 %s %s\n"
@@ -300,7 +300,7 @@ msgstr ""
" -c=? 读指定的配置文件\n"
" -o=? 设置任意指定的配置选项,例如 -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "无法写入 %s"
@@ -433,8 +433,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "数据库已过期,现尝试进行升级 %s"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"数据库格式无效。如果您是从一个老版本的 apt 升级而来,请删除数据库并重建它。"
@@ -450,11 +451,11 @@ msgstr "无法打开数据库文件 %s:%s"
msgid "Failed to stat %s"
msgstr "无法获得 %s 的状态"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "归档文件没有包含控制字段"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "无法获得游标"
@@ -519,26 +520,26 @@ msgstr "*** 无法将 %s 链接到 %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " 达到了 DeLink 的上限 %sB。\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "归档文件没有包含 package 字段"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s 中没有 override 项\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 的维护者 %s 并非 %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s 没有源代码的 override 项\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s 中没有二进制文件的 override 项\n"
@@ -642,7 +643,7 @@ msgstr "无法将 %s 重命名为 %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "编译正则表达式时出错 - %s"
@@ -803,11 +804,11 @@ msgstr "有软件包需要被卸载,但是卸载动作被程序设置所禁止
msgid "Internal error, Ordering didn't finish"
msgstr "内部错误,Ordering 未能完成"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "无法锁定下载目录"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "无法读取源列表。"
@@ -836,8 +837,8 @@ msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "解压缩后将会空出 %sB 的空间。\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "无法获知您在 %s 上的可用空间"
@@ -874,7 +875,7 @@ msgstr "中止执行。"
msgid "Do you want to continue [Y/n]? "
msgstr "您希望继续执行吗?[Y/n]"
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "无法下载 %s %s\n"
@@ -883,7 +884,7 @@ msgstr "无法下载 %s %s\n"
msgid "Some files failed to download"
msgstr "有一些文件无法下载"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "下载完毕,目前是“仅下载”模式"
@@ -980,51 +981,50 @@ msgstr "未找到“%2$s”的“%1$s”版本"
msgid "Selected version %s (%s) for %s\n"
msgstr "选定了版本为 %s (%s) 的 %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
-#| msgid "Couldn't stat source package list %s"
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "无法获取源软件包列表 %s 的状态"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr " update 命令不需要参数"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "无法对状态列表目录加锁"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "我们不应该进行删除,无法启动自动删除器"
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "下列软件包是自动安装的并且现在不需要了:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "%lu 个自动安装的的软件包现在不需要了\n"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "使用'apt-get autoremove'来删除它们"
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1040,43 +1040,43 @@ msgstr "似乎自动删除工具损坏了一些软件,这不应该发生。请
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "下列信息可能会对解决问题有所帮助:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr "内部错误,自动删除工具坏事了"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "内部错误,全部升级工具坏事了"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "无法找到任务 %s"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "无法找到软件包 %s"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "注意,根据正则表达式“%2$s”选中了 %1$s\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s 被设置为手动安装。\n"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "您可能需要运行“apt-get -f install”来纠正下列错误:"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1084,7 +1084,7 @@ msgstr ""
"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
"以指定一个解决办法)。"
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1095,122 +1095,122 @@ msgstr ""
"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
"包尚未被创建或是它们已被从新到(Incoming)目录移出。"
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "破损的软件包"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "将会安装下列额外的软件包:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "建议安装的软件包:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "推荐安装的软件包:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "正在对升级进行计算... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "失败"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "完成"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "内部错误,问题解决工具坏事了"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr "要下载源代码,必须指定至少一个对应的软件包"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "无法找到与 %s 对应的源代码包"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "忽略已下载过的文件“%s”\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "您在 %s 上没有足够的可用空间"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需要下载 %sB/%sB 的源代码包。\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下载 %sB 的源代码包。\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "下载源代码 %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "有一些包文件无法下载。"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "忽略已经被解包到 %s 目录的源代码包\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "运行解包的命令“%s”出错。\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "执行构造软件包命令“%s”失败。\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "子进程出错"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr "要检查生成软件包的构建依赖关系,必须指定至少一个软件包"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "无法获得 %s 的构建依赖关系信息"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr " %s 没有构建依赖关系信息。\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "由于无法找到软件包 %3$s ,因此不能满足 %2$s 所要求的 %1$s 依赖关系"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1219,30 +1219,30 @@ msgstr ""
"由于无法找到符合要求的软件包 %3$s 的可用版本,因此不能满足 %2$s 所要求的 %1"
"$s 依赖关系"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系:已安装的软件包 %3$s 太新"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系:%3$s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "无法处理构建依赖关系"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "支持的模块:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1325,7 +1325,7 @@ msgstr ""
"以获取更多信息和选项。\n"
" 本 APT 具有超级牛力。\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1571,11 +1571,10 @@ msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "无法读取 %s"
@@ -1605,9 +1604,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "info 和 temp 目录要求处于同一文件系统之下"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "正在读取软件包列表"
@@ -1740,11 +1739,11 @@ msgid "File not found"
msgstr "无法找到该文件"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "无法读取状态"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "无法设置文件的修改日期"
@@ -1805,7 +1804,7 @@ msgstr "连接超时"
msgid "Server closed the connection"
msgstr "服务器关闭了连接"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "读错误"
@@ -1817,7 +1816,7 @@ msgstr "回应超出了缓存区大小。"
msgid "Protocol corruption"
msgstr "协议有误"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "写出错"
@@ -1871,7 +1870,7 @@ msgstr "数据套接字连接超时"
msgid "Unable to accept connection"
msgstr "无法接受连接"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "把文件加入哈希表时出错"
@@ -1935,59 +1934,63 @@ msgstr "无法连接上 %s:%s (%s)。"
msgid "Connecting to %s"
msgstr "正在连接 %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "无法解析域名“%s”"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "暂时不能解析域名“%s”"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
-#| msgid "Something wicked happened resolving '%s:%s' (%i)"
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "解析“%s:%s”时,出现了某些故障(%i)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "不能连接到 %s:%s:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "无法访问密钥环:“%s”"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "中止安装。"
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "错误:Acquire::gpgv::Options 的参数列表太长。结束运行。"
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "内部错误:签名正确无误,但是无法确认密钥指纹?!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "至少发现一个无效的签名。"
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr "无法运行“%s”以验证签名(您安装了 gpgv 吗?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "运行 gpgv 时发生未知错误"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "下列签名无效:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2036,47 +2039,47 @@ msgstr "该 HTTP 服务器的 range 支持不正常"
msgid "Unknown date format"
msgstr "无法识别的日期格式"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "select 调用出错"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "连接超时"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "写输出文件时出错"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "写入文件出错"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "写入文件出错"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "从服务器读取数据时出错,对方关闭了连接"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "从服务器读取数据出错"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr "无法截断文件"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "错误的报头数据"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "连接失败"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "内部错误"
@@ -2084,12 +2087,12 @@ msgstr "内部错误"
msgid "Can't mmap an empty file"
msgstr "无法 mmap 一个空文件"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "无法 mmap %lu 字节的数据"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2098,6 +2101,13 @@ msgstr ""
"动态 MMap 没有空间了。请增大 APT::Cache-Limit 的大小。当前值:%lu。(man 5 "
"apt.conf)"
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2127,52 +2137,52 @@ msgstr "%li秒"
msgid "Selection %s not found"
msgstr "找不到您选则的 %s"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "无法识别的类型缩写:“%c”"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "正在打开配置文件 %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "语法错误 %s:%u:配置小节没有以名字开头"
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "语法错误 %s:%u:标签格式有误"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "语法错误 %s:%u: 配置值后有多余的无意义数据"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "语法错误 %s:%u: 只能在顶层配置文件中使用指示"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "语法错误 %s:%u:太多的嵌套 include 命令"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "语法错误 %s:%u: Included from here"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "语法错误 %s:%u: 不支持的指令“%s”"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "语法错误 %s:%u: 文件尾部有多余的无意义的数据"
@@ -2248,75 +2258,75 @@ msgstr "无法切换工作目录到 %s"
msgid "Failed to stat the cdrom"
msgstr "无法读取盘片的状态"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "由于文件系统为只读,因而无法使用文件锁 %s"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "无法打开锁文件 %s"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "无法在 nfs 文件系统上使用文件锁 %s"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "无法获得锁 %s"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "等待子进程 %s 的退出,但是它并不存在"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "子进程 %s 发生了段错误"
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, c-format
msgid "Sub-process %s received signal %u."
msgstr "子进程 %s 收到信号 %u。"
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "子进程 %s 返回了一个错误号 (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "子进程 %s 异常退出"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "无法打开文件 %s"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "读取文件出错,还剩 %lu 字节没有读出"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "写入文件出错,还剩 %lu 字节没有保存"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "关闭文件出错"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "用 unlink 删除文件出错"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "同步文件出错"
@@ -2433,52 +2443,52 @@ msgstr "无法解析软件包文件 %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "无法解析软件包文件 %s (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(独立发行版)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "正在打开 %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "源列表 %2$s 的第 %1$u 行太长了。"
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "无法识别在源列表 %3$s 里,第 %2$u 行中的软件包类别“%1$s”"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "在源列表中 %2$s 中第 %1$u 行的格式有误(供应商 ID)"
@@ -2603,17 +2613,17 @@ msgstr "无法解析或打开软件包的列表或是状态文件。"
msgid "You may want to run apt-get update to correct these problems"
msgstr "您可能需要运行 apt-get update 来解决这些问题"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "首选项文件 %s 中发现有无效的记录,无 Package 字段头"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "无法识别锁定的类型 %s"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "没有为版本锁定指定优先级(或为零)"
@@ -2697,16 +2707,16 @@ msgstr "处理 %s (CollectFileProvides)时出错"
msgid "Package %s %s was not found while processing file dependencies"
msgstr "当处理文件依赖关系时,无法找到软件包 %s %s"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "无法获取源软件包列表 %s 的状态"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "正在收集文件所提供的软件包"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "无法读取或写入软件源缓存"
@@ -2715,19 +2725,19 @@ msgstr "无法读取或写入软件源缓存"
msgid "rename failed, %s (%s -> %s)."
msgstr "无法重命名文件,%s (%s -> %s)。"
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "MD5 校验和不符"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "Hash 校验和不符"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下 ID 的密钥没有可用的公钥:\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2736,7 +2746,7 @@ msgstr ""
"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2744,13 +2754,13 @@ msgid ""
msgstr ""
"我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "大小不符"
@@ -3000,14 +3010,30 @@ msgstr "dpkg 被中断,您必须手工运行 'dpkg --configure -a' 解决此
msgid "Not locked"
msgstr "未锁定"
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "无法打开补丁文件"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "连接被永久关闭"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "无法访问密钥环:“%s”"
+
+#~ msgid "Could not patch file"
+#~ msgstr "无法打开补丁文件"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2a5c87e59..7033d8d7b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.5.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: 2009-01-28 10:41+0800\n"
"Last-Translator: Tetralet <tetralet@gmail.com>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
@@ -148,7 +148,7 @@ msgstr " 版本列表:"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s 是用於 %s 並在 %s %s 上編譯的\n"
@@ -301,7 +301,7 @@ msgstr ""
" -c=? 讀取指定的設定檔\n"
" -o=? 指定任意的設定選項,例如:-o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "無法寫入 %s"
@@ -432,8 +432,9 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "DB 過舊,嘗試升級 %s"
#: ftparchive/cachedb.cc:72
+#, fuzzy
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"資料庫格式不正確。如果您是由舊版的 apt 升級上來的,請移除並重新建立資料庫。"
@@ -449,11 +450,11 @@ msgstr "無法開啟 DB 檔 %s: %s"
msgid "Failed to stat %s"
msgstr "無法取得 %s 的狀態"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "套件檔沒有 control 記錄"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "無法取得遊標"
@@ -518,26 +519,26 @@ msgstr "*** 無法將 %s 連結到 %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " 達到了 DeLink 的上限 %sB。\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "套件檔裡沒有套件資訊"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s 沒有重新定義項目\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 的維護者是 %s,而非 %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s 沒有原始碼重新定義項目\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s 也沒有二元碼重新定義項目\n"
@@ -641,7 +642,7 @@ msgstr "無法將 %s 更名為 %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "編譯正規表示式時發生錯誤 - %s"
@@ -802,11 +803,11 @@ msgstr "有套件需要被移除,但卻被禁止移除。"
msgid "Internal error, Ordering didn't finish"
msgstr "內部錯誤,排序未能完成"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "無法鎖定下載目錄"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "無法讀取來源列表。"
@@ -835,8 +836,8 @@ msgstr "此操作完成之後,會多佔用 %sB 的磁碟空間。\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "此操作完成之後,會空出 %sB 的磁碟空間。\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "無法確認 %s 的未使用空間"
@@ -873,7 +874,7 @@ msgstr "放棄執行。"
msgid "Do you want to continue [Y/n]? "
msgstr "是否繼續進行 [Y/n]?"
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "無法取得 %s,%s\n"
@@ -882,7 +883,7 @@ msgstr "無法取得 %s,%s\n"
msgid "Some files failed to download"
msgstr "有部份檔案無法下載"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "下載完成,且這是『僅下載』模式"
@@ -978,50 +979,50 @@ msgstr "找不到 '%s' 版的 '%s'"
msgid "Selected version %s (%s) for %s\n"
msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1352
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "無法取得來源套件列表 %s 的狀態"
-#: cmdline/apt-get.cc:1395
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "update 指令不需任何參數"
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "無法鎖定列表目錄"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "我們沒有計劃要刪除任何東西,無法啟動 AutoRemover"
-#: cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "以下套件是被自動安裝進來的,且已不再會被用到了:"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1525
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "以下套件是被自動安裝進來的,且已不再會被用到了:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "使用 'apt-get autoremove' 來將其移除。"
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1039,43 +1040,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "以下的資訊或許有助於解決當前的情況:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr "內部錯誤,AutoRemover 處理失敗"
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "內部錯誤,AllUpgrade 造成了損壞"
-#: cmdline/apt-get.cc:1602
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "無法找到主題 %s"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "無法找到套件 %s"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "注意,根據正規表示式 '%2$s' 而選擇了 %1$s\n"
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s 被設定為手動安裝。\n"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "您也許得執行 `apt-get -f install' 以修正這些問題:"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1083,7 +1084,7 @@ msgstr ""
"未能滿足相依關係。請試著不指定套件來執行 'apt-get -f install'(或採取其它的解"
"決方案)。"
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1093,122 +1094,122 @@ msgstr ""
"有些套件無法安裝。這可能意謂著您的要求難以解決,或是若您使用的是\n"
"unstable 發行版,可能有些必要的套件尚未建立,或是被移出 Incoming 了。"
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "損毀的套件"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "下列的額外套件將被安裝:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "建議套件:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "推薦套件:"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "籌備升級中... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "失敗"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "完成"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "內部錯誤,問題排除器造成了損壞"
-#: cmdline/apt-get.cc:2148
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr "在取得原始碼時必須至少指定一個套件"
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "無法找到 %s 的原始碼套件"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "略過已下載的檔案 '%s'\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "在 %s 裡沒有足夠的的未使用空間"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需要下載 %sB/%sB 的原始套件檔。\n"
-#: cmdline/apt-get.cc:2271
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下載 %sB 的原始套件檔。\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "取得原始碼 %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "無法取得某些套件檔。"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "不解開,因原始碼已解開至 %s\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "解開指令 '%s' 失敗。\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "編譯指令 '%s' 失敗。\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "子程序失敗"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr "在檢查編譯相依關係時必須至少指定一個套件"
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "無法取得 %s 的編譯相依關係資訊"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s 沒有編譯相依關係。\n"
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係,因為找不到套件 %3$s"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1216,30 +1217,30 @@ msgid ""
msgstr ""
"無法滿足 %2$s 所要求的 %1$s 相依關係,因為套件 %3$s 沒有版本符合其版本需求"
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "無法滿足 %2$s 的相依關係 %1$s:已安裝的套件 %3$s 太新了"
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "無法滿足 %2$s 的相依關係 %1$s:%3$s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "無法滿足套件 %s 的編譯相依關係。"
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "無法處理編譯相依關係"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "已支援模組:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2721
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1323,7 +1324,7 @@ msgstr ""
"以取得更多資訊和選項。\n"
" 該 APT 有著超級牛力。\n"
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1567,11 +1568,10 @@ msgstr "檔案 %s/%s 覆寫了套件 %s 中的相同檔案"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "無法讀取 %s"
@@ -1601,9 +1601,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "資料目錄與暫存目錄需位於同一檔案系統中"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "正在讀取套件清單"
@@ -1735,11 +1735,11 @@ msgid "File not found"
msgstr "找不到檔案"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "無法取得狀態"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "無法設定修改時間"
@@ -1800,7 +1800,7 @@ msgstr "連線逾時"
msgid "Server closed the connection"
msgstr "伺服器已關閉連線"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "讀取錯誤"
@@ -1812,7 +1812,7 @@ msgstr "回應超過緩衝區長度。"
msgid "Protocol corruption"
msgstr "協定失敗"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "寫入錯誤"
@@ -1866,7 +1866,7 @@ msgstr "Data socket 連線逾時"
msgid "Unable to accept connection"
msgstr "無法接受連線"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "有問題的雜湊檔"
@@ -1930,58 +1930,63 @@ msgstr "無法和 %s:%s (%s) 連線。"
msgid "Connecting to %s"
msgstr "正連線至 %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "無法解析 '%s'"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "暫時無法解析 '%s'"
-#: methods/connect.cc:193
+#: methods/connect.cc:194
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "在解析 '%s:%s' (%i) 時出了怪事"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "無法連線至 %s %s:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "無法存取鑰匙圈:'%s'"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "放棄安裝。"
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "錯誤:Acquire::gpgv::Options 的參數列表過長。結束執行。"
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "內部錯誤:簽章無誤,但卻無法辨識密鑰的指紋碼?!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "至少發現一個無效的簽章。"
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr "無法執行 '%s' 來驗證簽章(gpgv 是否安裝了?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "在執行 gpgv 時發生未知的錯誤"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "以下簽名無效:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2030,47 +2035,47 @@ msgstr "這個 HTTP 伺服器的範圍支援有問題"
msgid "Unknown date format"
msgstr "未知的資料格式"
-#: methods/http.cc:790
+#: methods/http.cc:791
msgid "Select failed"
msgstr "選擇失敗"
-#: methods/http.cc:795
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "連線逾時"
-#: methods/http.cc:818
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "在寫入輸出檔時發生錯誤"
-#: methods/http.cc:849
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "在寫入檔案時發生錯誤"
-#: methods/http.cc:877
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "在寫入該檔時發生錯誤"
-#: methods/http.cc:891
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "在讀取伺服器時發生錯誤,遠端主機已關閉連線"
-#: methods/http.cc:893
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "在讀取伺服器時發生錯誤"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr "無法截短檔案"
-#: methods/http.cc:1149
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "錯誤的標頭資料"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "連線失敗"
-#: methods/http.cc:1313
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "內部錯誤"
@@ -2078,12 +2083,12 @@ msgstr "內部錯誤"
msgid "Can't mmap an empty file"
msgstr "不能 mmap 空白檔案"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "無法 mmap 到 %lu 位元組"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2092,6 +2097,13 @@ msgstr ""
"動態 MMap 已用完所有空間。請增加 APT::Cache-Limit 的大小。目前大小為:%lu。"
"(man 5 apt.conf)"
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2121,52 +2133,52 @@ msgstr ""
msgid "Selection %s not found"
msgstr "選項 %s 找不到"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "無法辨識的縮寫類型:'%c'"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "開啟設定檔 %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "語法錯誤 %s:%u:區塊開頭沒有名稱。"
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "語法錯誤 %s:%u:標籤格式錯誤"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "語法錯誤 %s:%u:數值後有多餘的垃圾"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "語法錯誤 %s:%u:指令只能於最高層級執行"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "語法錯誤 %s:%u: 太多巢狀引入檔"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "語法錯誤 %s:%u:從此引入"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "語法錯誤 %s:%u:不支援的指令 '%s'"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "語法錯誤 %s:%u:在檔案結尾有多餘的垃圾"
@@ -2242,75 +2254,75 @@ msgstr "無法切換至 %s"
msgid "Failed to stat the cdrom"
msgstr "無法取得 CD-ROM 的狀態"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "不在唯讀檔案 %s 上使用檔案鎖定"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "無法開啟鎖定檔 %s"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "不在以 nfs 掛載的檔案 %s 上使用檔案鎖定"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "無法將 %s 鎖定"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "等待 %s 但是它並不存在"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "子程序 %s 收到一個記憶體錯誤。"
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "子程序 %s 收到一個記憶體錯誤。"
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "子程序 %s 傳回錯誤碼 (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "子程序 %s 不預期得結束"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "無法開啟檔案 %s"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "讀取,仍有 %lu 未讀但已無空間"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "寫入,仍有 %lu 待寫入但已沒辨法"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "在關閉檔案時發生問題"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "在刪除檔案時發生問題"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "在同步檔案時發生問題"
@@ -2427,52 +2439,52 @@ msgstr "無法辨識套件檔 %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "無法辨識套件檔 %s (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤 (URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(發行版)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(URI 分析)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(絕對發行版)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(發行版分析)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "正在開啟 %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "來源列表 %2$s 中的第 %1$u 行太長。"
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤(類型)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "未知的類型 '%1$s',位於在來源列表 %3$s 中的第 %2$u 行"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤(提供者 ID)"
@@ -2593,17 +2605,17 @@ msgstr "無法分析或開啟套件清單或狀況檔。"
msgid "You may want to run apt-get update to correct these problems"
msgstr "您也許得執行 apt-get update 以修正這些問題"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "個人設定檔中有些不正確資料,沒有以 Package 開頭"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "無法分析鎖定類型 %s"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "銷定並沒有優先順序之分(或零)"
@@ -2687,16 +2699,16 @@ msgstr "在處理 %s 時發生錯誤 (CollectFileProvides)"
msgid "Package %s %s was not found while processing file dependencies"
msgstr "在計算檔案相依性時找不到套件 %s %s"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "無法取得來源套件列表 %s 的狀態"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "正在收集檔案提供者"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "在儲存來源快取時 IO 錯誤"
@@ -2705,19 +2717,19 @@ msgstr "在儲存來源快取時 IO 錯誤"
msgid "rename failed, %s (%s -> %s)."
msgstr "無法重新命名,%s (%s -> %s)。"
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "MD5Sum 不符"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "Hash Sum 不符"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr "無法取得以下的密鑰 ID 的公鑰:\n"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2726,20 +2738,20 @@ msgstr ""
"找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。(因為找不到平"
"台)"
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。"
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "這個套件的索引檔損壞了。沒有套件 %s 的 Filename: 欄位。"
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "大小不符"
@@ -2872,7 +2884,6 @@ msgstr "寫入 %i 筆紀綠,其中有 %i 個檔案遺失了,有 %i 個檔案
#: apt-pkg/indexcopy.cc:530
#, fuzzy, c-format
-#| msgid "Opening configuration file %s"
msgid "Skipping nonexistent file %s"
msgstr "開啟設定檔 %s"
@@ -2883,7 +2894,6 @@ msgstr ""
#: apt-pkg/indexcopy.cc:542
#, fuzzy, c-format
-#| msgid "Hash Sum mismatch"
msgid "Hash mismatch for: %s"
msgstr "Hash Sum 不符"
@@ -2904,7 +2914,6 @@ msgstr "正在移除 %s"
#: apt-pkg/deb/dpkgpm.cc:52
#, fuzzy, c-format
-#| msgid "Completely removed %s"
msgid "Completely removing %s"
msgstr "已完整移除 %s"
@@ -2988,14 +2997,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "無法修補檔案"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "連線突然終止"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "無法存取鑰匙圈:'%s'"
+
+#~ msgid "Could not patch file"
+#~ msgstr "無法修補檔案"
+
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"