* fix problematic use of tolower() when calculating the version

  hash by using locale independant tolower_ascii() function.
  Thanks to M. Vefa Bicakci (LP: #80248)
* build fixes for g++-4.4
* include dmesg output in apport package failures

diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 38944bb..2e6bd34 100644 (file)
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -24,7 +24,8 @@
 
 #include <iostream>
 #include <sstream>
-    
+#include <stdio.h>
+
 #include <dirent.h>
 #include <sys/time.h>
 #include <errno.h>

diff --git a/apt-pkg/contrib/sha256.h b/apt-pkg/contrib/sha256.h
index 1951f05..5934b56 100644 (file)
--- a/apt-pkg/contrib/sha256.h
+++ b/apt-pkg/contrib/sha256.h
@@ -17,6 +17,7 @@
 #include <string>
 #include <cstring>
 #include <algorithm>
+#include <stdint.h>
 
 using std::string;
 using std::min;

diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index fe9082f..3b7a67d 100644 (file)
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -1074,6 +1074,17 @@ char *safe_snprintf(char *Buffer,char *End,const char *Format,...)
 }
                                                                        /*}}}*/
 
+// tolower_ascii - tolower() function that ignores the locale          /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+int tolower_ascii(int c)
+{
+   if (c >= 'A' and c <= 'Z')
+      return c + 32;
+   return c;
+}
+                                                                       /*}}}*/
+
 // CheckDomainList - See if Host is in a , seperate list               /*{{{*/
 // ---------------------------------------------------------------------
 /* The domain list is a comma seperate list of domains that are suffix

diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index d9972ab..51416a2 100644 (file)
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -62,6 +62,7 @@ void ioprintf(ostream &out,const char *format,...) APT_FORMAT2;
 void strprintf(string &out,const char *format,...) APT_FORMAT2;
 char *safe_snprintf(char *Buffer,char *End,const char *Format,...) APT_FORMAT3;
 bool CheckDomainList(const string &Host, const string &List);
+int tolower_ascii(int c);
 
 #define APT_MKSTRCMP(name,func) \
 inline int name(const char *A,const char *AEnd,const char *B) {return func(A,AEnd,B,B+strlen(B));}; \

diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 896d4d6..55ba1f8 100644 (file)
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -213,7 +213,7 @@ unsigned short debListParser::VersionHash()
       for (; Start != End; Start++)
       {
         if (isspace(*Start) == 0)
-           *I++ = tolower(*Start);
+           *I++ = tolower_ascii(*Start);
         if (*Start == '<' && Start[1] != '<' && Start[1] != '=')
            *I++ = '=';
         if (*Start == '>' && Start[1] != '>' && Start[1] != '=')

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index d8c3842..f57bff3 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -1123,6 +1123,23 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
         fclose(log);
       }
    }
+
+   // attach dmesg log (to learn about segfaults)
+   if (FileExists("/bin/dmesg"))
+   {
+      FILE *log = NULL;
+      char buf[1024];
+
+      fprintf(report, "Dmesg:\n");
+      log = popen("/bin/dmesg","r");
+      if(log != NULL)
+      {
+        while( fgets(buf, sizeof(buf), log) != NULL)
+           fprintf(report, " %s", buf);
+        fclose(log);
+      }
+   }
    fclose(report);
+
 }
                                                                        /*}}}*/

diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 4fbf42c..6687864 100644 (file)
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -163,7 +163,7 @@ unsigned long pkgCache::sHash(const string &Str) const
 {
    unsigned long Hash = 0;
    for (string::const_iterator I = Str.begin(); I != Str.end(); I++)
-      Hash = 5*Hash + tolower(*I);
+      Hash = 5*Hash + tolower_ascii(*I);
    return Hash % _count(HeaderP->HashTable);
 }
 
@@ -171,7 +171,7 @@ unsigned long pkgCache::sHash(const char *Str) const
 {
    unsigned long Hash = 0;
    for (const char *I = Str; *I != 0; I++)
-      Hash = 5*Hash + tolower(*I);
+      Hash = 5*Hash + tolower_ascii(*I);
    return Hash % _count(HeaderP->HashTable);
 }
 

diff --git a/debian/changelog b/debian/changelog
index 07e2505..a62e13b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+apt (0.7.20.2ubuntu7) karmic; urgency=low
+
+  * fix problematic use of tolower() when calculating the version 
+    hash by using locale independant tolower_ascii() function. 
+    Thanks to M. Vefa Bicakci (LP: #80248)
+  * build fixes for g++-4.4
+  * include dmesg output in apport package failures
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 24 Apr 2009 10:14:01 +0200
+
 apt (0.7.20.2ubuntu6) jaunty; urgency=low
 
   [ Jamie Strandboge ]

diff --git a/po/apt-all.pot b/po/apt-all.pot
index 804c23b..55f35ca 100644 (file)
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -252,6 +252,7 @@ msgid ""
 msgstr ""
 
 #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815
+#: apt-pkg/pkgcachegen.cc:827
 #, c-format
 msgid "Unable to write to %s"
 msgstr ""
@@ -718,7 +719,7 @@ msgid "Unable to lock the download directory"
 msgstr ""
 
 #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2076 cmdline/apt-get.cc:2312
-#: apt-pkg/cachefile.cc:63
+#: apt-pkg/cachefile.cc:63 apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr ""
 
@@ -781,6 +782,7 @@ msgid "Do you want to continue [Y/n]? "
 msgstr ""
 
 #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2209
+#: apt-pkg/algorithms.cc:1348
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr ""
@@ -889,7 +891,8 @@ msgstr ""
 msgid "Unable to lock the list directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 apt-pkg/algorithms.cc:1374
+#: apt-pkg/algorithms.cc:1376
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -993,6 +996,7 @@ msgid "Calculating upgrade... "
 msgstr ""
 
 #: cmdline/apt-get.cc:1891 methods/ftp.cc:702 methods/connect.cc:101
+#: methods/connect.cc:111
 msgid "Failed"
 msgstr ""
 
@@ -1373,6 +1377,8 @@ msgstr ""
 #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:753
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
 #: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/contrib/configuration.cc:821 apt-pkg/acquire.cc:419
+#: methods/mirror.cc:85
 #, c-format
 msgid "Unable to read %s"
 msgstr ""
@@ -1404,7 +1410,9 @@ msgstr ""
 #. Build the status cache
 #: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:748
 #: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822
-#: apt-pkg/pkgcachegen.cc:945
+#: apt-pkg/pkgcachegen.cc:945 apt-pkg/pkgcachegen.cc:760
+#: apt-pkg/pkgcachegen.cc:829 apt-pkg/pkgcachegen.cc:834
+#: apt-pkg/pkgcachegen.cc:957
 msgid "Reading package lists"
 msgstr ""
 
@@ -1598,6 +1606,7 @@ msgid "Server closed the connection"
 msgstr ""
 
 #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
+#: apt-pkg/contrib/fileutl.cc:538
 msgid "Read error"
 msgstr ""
 
@@ -1610,6 +1619,7 @@ msgid "Protocol corruption"
 msgstr ""
 
 #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
+#: apt-pkg/contrib/fileutl.cc:577
 msgid "Write error"
 msgstr ""
 
@@ -1664,6 +1674,7 @@ msgid "Unable to accept connection"
 msgstr ""
 
 #: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/http.cc:993
 msgid "Problem hashing file"
 msgstr ""
 
@@ -1690,78 +1701,78 @@ msgstr ""
 msgid "Unable to invoke "
 msgstr ""
 
-#: methods/connect.cc:64
+#: methods/connect.cc:64 methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr ""
 
-#: methods/connect.cc:71
+#: methods/connect.cc:71 methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr ""
 
-#: methods/connect.cc:80
+#: methods/connect.cc:80 methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr ""
 
-#: methods/connect.cc:86
+#: methods/connect.cc:86 methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr ""
 
-#: methods/connect.cc:93
+#: methods/connect.cc:93 methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr ""
 
-#: methods/connect.cc:108
+#: methods/connect.cc:108 methods/connect.cc:118
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr ""
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425 methods/connect.cc:146
 #, c-format
 msgid "Connecting to %s"
 msgstr ""
 
-#: methods/connect.cc:167
+#: methods/connect.cc:167 methods/connect.cc:164 methods/connect.cc:183
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr ""
 
-#: methods/connect.cc:173
+#: methods/connect.cc:173 methods/connect.cc:189
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr ""
 
-#: methods/connect.cc:176
+#: methods/connect.cc:176 methods/connect.cc:192
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr ""
 
-#: methods/connect.cc:223
+#: methods/connect.cc:223 methods/connect.cc:239
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr ""
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:65 methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr ""
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:101 methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:205 methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:210 methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
@@ -1770,15 +1781,15 @@ msgstr ""
 msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:219 methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:250 methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr ""
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:257 methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1794,76 +1805,78 @@ msgstr ""
 msgid "Read error from %s process"
 msgstr ""
 
-#: methods/http.cc:377
+#: methods/http.cc:377 methods/http.cc:378
 msgid "Waiting for headers"
 msgstr ""
 
-#: methods/http.cc:523
+#: methods/http.cc:523 methods/http.cc:524
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr ""
 
-#: methods/http.cc:531
+#: methods/http.cc:531 methods/http.cc:532
 msgid "Bad header line"
 msgstr ""
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:550 methods/http.cc:557 methods/http.cc:551
+#: methods/http.cc:558
 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
-#: methods/http.cc:586
+#: methods/http.cc:586 methods/http.cc:587
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
-#: methods/http.cc:601
+#: methods/http.cc:601 methods/http.cc:602
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
-#: methods/http.cc:603
+#: methods/http.cc:603 methods/http.cc:604
 msgid "This HTTP server has broken range support"
 msgstr ""
 
-#: methods/http.cc:627
+#: methods/http.cc:627 methods/http.cc:628
 msgid "Unknown date format"
 msgstr ""
 
-#: methods/http.cc:774
+#: methods/http.cc:774 methods/http.cc:781
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:779
+#: methods/http.cc:779 methods/http.cc:786
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:802
+#: methods/http.cc:802 methods/http.cc:809
 msgid "Error writing to output file"
 msgstr ""
 
-#: methods/http.cc:833
+#: methods/http.cc:833 methods/http.cc:840
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:861
+#: methods/http.cc:861 methods/http.cc:868
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:875
+#: methods/http.cc:875 methods/http.cc:882
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:877
+#: methods/http.cc:877 methods/http.cc:884
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:1104
+#: methods/http.cc:1104 methods/http.cc:1143
 msgid "Bad header data"
 msgstr ""
 
-#: methods/http.cc:1121 methods/http.cc:1176
+#: methods/http.cc:1121 methods/http.cc:1176 methods/http.cc:1160
+#: methods/http.cc:1215
 msgid "Connection failed"
 msgstr ""
 
-#: methods/http.cc:1228
+#: methods/http.cc:1228 methods/http.cc:1307
 msgid "Internal error"
 msgstr ""
 
@@ -1876,7 +1889,7 @@ msgstr ""
 msgid "Couldn't make mmap of %lu bytes"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:978
+#: apt-pkg/contrib/strutl.cc:978 apt-pkg/contrib/strutl.cc:1018
 #, c-format
 msgid "Selection %s not found"
 msgstr ""
@@ -1896,42 +1909,43 @@ msgstr ""
 msgid "Line %d too long (max %u)"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:611
+#: apt-pkg/contrib/configuration.cc:611 apt-pkg/contrib/configuration.cc:662
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:630 apt-pkg/contrib/configuration.cc:681
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:647
+#: apt-pkg/contrib/configuration.cc:647 apt-pkg/contrib/configuration.cc:698
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:687
+#: apt-pkg/contrib/configuration.cc:687 apt-pkg/contrib/configuration.cc:738
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:694
+#: apt-pkg/contrib/configuration.cc:694 apt-pkg/contrib/configuration.cc:745
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
 #: apt-pkg/contrib/configuration.cc:698 apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:707
+#: apt-pkg/contrib/configuration.cc:707 apt-pkg/contrib/configuration.cc:758
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:741
+#: apt-pkg/contrib/configuration.cc:741 apt-pkg/contrib/configuration.cc:809
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
@@ -1998,78 +2012,80 @@ msgid "Unable to stat the mount point %s"
 msgstr ""
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: apt-pkg/contrib/cdromutl.cc:180 apt-pkg/acquire.cc:425
+#: apt-pkg/acquire.cc:450 methods/mirror.cc:91
 #, c-format
 msgid "Unable to change to %s"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:187
+#: apt-pkg/contrib/cdromutl.cc:187 apt-pkg/contrib/cdromutl.cc:188
 msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:82
+#: apt-pkg/contrib/fileutl.cc:82 apt-pkg/contrib/fileutl.cc:149
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:87
+#: apt-pkg/contrib/fileutl.cc:87 apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Could not open lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:105
+#: apt-pkg/contrib/fileutl.cc:105 apt-pkg/contrib/fileutl.cc:172
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:109
+#: apt-pkg/contrib/fileutl.cc:109 apt-pkg/contrib/fileutl.cc:176
 #, c-format
 msgid "Could not get lock %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:377
+#: apt-pkg/contrib/fileutl.cc:377 apt-pkg/contrib/fileutl.cc:444
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:387
+#: apt-pkg/contrib/fileutl.cc:387 apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:390
+#: apt-pkg/contrib/fileutl.cc:390 apt-pkg/contrib/fileutl.cc:457
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:392
+#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:459
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:436
+#: apt-pkg/contrib/fileutl.cc:436 apt-pkg/contrib/fileutl.cc:503
 #, c-format
 msgid "Could not open file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:492
+#: apt-pkg/contrib/fileutl.cc:492 apt-pkg/contrib/fileutl.cc:559
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:522
+#: apt-pkg/contrib/fileutl.cc:522 apt-pkg/contrib/fileutl.cc:589
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:597
+#: apt-pkg/contrib/fileutl.cc:597 apt-pkg/contrib/fileutl.cc:664
 msgid "Problem closing the file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:603
+#: apt-pkg/contrib/fileutl.cc:603 apt-pkg/contrib/fileutl.cc:670
 msgid "Problem unlinking the file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:614
+#: apt-pkg/contrib/fileutl.cc:614 apt-pkg/contrib/fileutl.cc:681
 msgid "Problem syncing the file"
 msgstr ""
 
@@ -2245,40 +2261,40 @@ msgstr ""
 msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:247 apt-pkg/algorithms.cc:248
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1105
+#: apt-pkg/algorithms.cc:1105 apt-pkg/algorithms.cc:1107
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1107 apt-pkg/algorithms.cc:1109
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:59 apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:63 apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr ""
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:827
+#: apt-pkg/acquire.cc:827 apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/acquire.cc:829
+#: apt-pkg/acquire.cc:829 apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr ""
@@ -2293,17 +2309,17 @@ msgstr ""
 msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:398
+#: apt-pkg/acquire-worker.cc:398 apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 
-#: apt-pkg/init.cc:124
+#: apt-pkg/init.cc:124 apt-pkg/init.cc:125
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:140 apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
@@ -2316,11 +2332,11 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:69
+#: apt-pkg/cachefile.cc:69 apt-pkg/cachefile.cc:71
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 
-#: apt-pkg/cachefile.cc:73
+#: apt-pkg/cachefile.cc:73 apt-pkg/cachefile.cc:75
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 
@@ -2351,123 +2367,125 @@ msgstr ""
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:153
+#: apt-pkg/pkgcachegen.cc:153 apt-pkg/pkgcachegen.cc:164
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:178
+#: apt-pkg/pkgcachegen.cc:178 apt-pkg/pkgcachegen.cc:189
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:182
+#: apt-pkg/pkgcachegen.cc:182 apt-pkg/pkgcachegen.cc:193
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:213 apt-pkg/pkgcachegen.cc:224
 #, c-format
 msgid "Error occurred while processing %s (NewVersion1)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:217
+#: apt-pkg/pkgcachegen.cc:217 apt-pkg/pkgcachegen.cc:228
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:221
+#: apt-pkg/pkgcachegen.cc:221 apt-pkg/pkgcachegen.cc:232
 #, c-format
 msgid "Error occurred while processing %s (NewVersion2)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:245
+#: apt-pkg/pkgcachegen.cc:245 apt-pkg/pkgcachegen.cc:256
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:251 apt-pkg/pkgcachegen.cc:262
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:254 apt-pkg/pkgcachegen.cc:265
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:257 apt-pkg/pkgcachegen.cc:268
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:260 apt-pkg/pkgcachegen.cc:271
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:288
+#: apt-pkg/pkgcachegen.cc:288 apt-pkg/pkgcachegen.cc:299
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:301
+#: apt-pkg/pkgcachegen.cc:301 apt-pkg/pkgcachegen.cc:312
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:307
+#: apt-pkg/pkgcachegen.cc:307 apt-pkg/pkgcachegen.cc:318
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:678
+#: apt-pkg/pkgcachegen.cc:678 apt-pkg/pkgcachegen.cc:690
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:763
+#: apt-pkg/pkgcachegen.cc:763 apt-pkg/pkgcachegen.cc:775
 msgid "Collecting File Provides"
 msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897
+#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909
 msgid "IO Error saving source cache"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:127 apt-pkg/acquire-item.cc:134
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:401
+#: apt-pkg/acquire-item.cc:401 apt-pkg/acquire-item.cc:451
 msgid "MD5Sum mismatch"
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408
+#: apt-pkg/acquire-item.cc:707 apt-pkg/acquire-item.cc:1478
 msgid "Hash Sum mismatch"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1100
+#: apt-pkg/acquire-item.cc:1100 apt-pkg/acquire-item.cc:1170
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1213
+#: apt-pkg/acquire-item.cc:1213 apt-pkg/acquire-item.cc:1283
 #, 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:1272
+#: apt-pkg/acquire-item.cc:1272 apt-pkg/acquire-item.cc:1342
 #, 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:1313
+#: apt-pkg/acquire-item.cc:1313 apt-pkg/acquire-item.cc:1383
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1400
+#: apt-pkg/acquire-item.cc:1400 apt-pkg/acquire-item.cc:1470
 msgid "Size mismatch"
 msgstr ""
 
@@ -2553,88 +2571,92 @@ msgstr ""
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 apt-pkg/indexcopy.cc:832
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 apt-pkg/indexcopy.cc:834
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 apt-pkg/indexcopy.cc:837
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831 apt-pkg/indexcopy.cc:840
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:513
+#: apt-pkg/deb/dpkgpm.cc:513 apt-pkg/deb/dpkgpm.cc:532
 #, c-format
 msgid "Directory '%s' missing"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:596
+#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:621
 #, c-format
 msgid "Preparing %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:597
+#: apt-pkg/deb/dpkgpm.cc:597 apt-pkg/deb/dpkgpm.cc:622
 #, c-format
 msgid "Unpacking %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:602
+#: apt-pkg/deb/dpkgpm.cc:602 apt-pkg/deb/dpkgpm.cc:627
 #, c-format
 msgid "Preparing to configure %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:603
+#: apt-pkg/deb/dpkgpm.cc:603 apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:628
 #, c-format
 msgid "Configuring %s"
 msgstr ""
 
 #: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:630 apt-pkg/deb/dpkgpm.cc:631
 #, c-format
 msgid "Processing triggers for %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:608
+#: apt-pkg/deb/dpkgpm.cc:608 apt-pkg/deb/dpkgpm.cc:633
 #, c-format
 msgid "Installed %s"
 msgstr ""
 
 #: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615
-#: apt-pkg/deb/dpkgpm.cc:616
+#: apt-pkg/deb/dpkgpm.cc:616 apt-pkg/deb/dpkgpm.cc:638
+#: apt-pkg/deb/dpkgpm.cc:640 apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:618
+#: apt-pkg/deb/dpkgpm.cc:618 apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Removing %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:619
+#: apt-pkg/deb/dpkgpm.cc:619 apt-pkg/deb/dpkgpm.cc:644
 #, c-format
 msgid "Removed %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:624
+#: apt-pkg/deb/dpkgpm.cc:624 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:625 apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Completely removed %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:775
+#: apt-pkg/deb/dpkgpm.cc:775 apt-pkg/deb/dpkgpm.cc:805
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
@@ -2645,3 +2667,143 @@ msgstr ""
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr ""
+
+#: methods/gpgv.cc:232
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+msgstr ""
+
+#: methods/http.cc:978 apt-pkg/contrib/mmap.cc:196
+msgid "Failed to truncate file"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, 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 ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1244
+#, c-format
+msgid ""
+"A error occurred during the signature verification. The repository is not "
+"updated and the previous index files will be used.GPG error: %s: %s\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1253
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:40
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:47
+#, c-format
+msgid "No sections in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:678
+#, c-format
+msgid ""
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
+"zu signatures\n"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:51
+#, c-format
+msgid "Installing %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:54
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1011
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1016
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1018
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1024
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1030
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'sudo dpkg --configure -a' to "
+"correct the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
+#. FIXME: fallback to a default mirror here instead
+#. and provide a config option to define that default
+#: methods/mirror.cc:172
+#, c-format
+msgid "No mirror file '%s' found "
+msgstr ""

diff --git a/po/ar.po b/po/ar.po
index 22cb495..afc52c7 100644 (file)
--- 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: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2007-06-07 00:57+0200\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"
@@ -31,7 +31,8 @@ msgid "Unable to locate package %s"
 msgstr "تعذر العثور على الحزمة %s"
 
 #: cmdline/apt-cache.cc:247
-msgid "Total package names: "
+#, fuzzy
+msgid "Total package names : "
 msgstr "أسماء الحزم الكلية :"
 
 #: cmdline/apt-cache.cc:287
@@ -60,7 +61,7 @@ msgstr "مجموع النسخ الفريدة:"
 
 #: cmdline/apt-cache.cc:295
 #, fuzzy
-msgid "Total distinct descriptions: "
+msgid "Total Distinct Descriptions: "
 msgstr "مجموع النسخ الفريدة:"
 
 #: cmdline/apt-cache.cc:297
@@ -160,10 +161,10 @@ msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
+#: cmdline/apt-get.cc:2564 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
-msgid "%s %s for %s compiled on %s %s\n"
+msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s لـ%s %s مُجمّع على %s %s\n"
 
 #: cmdline/apt-cache.cc:1721
@@ -189,8 +190,8 @@ msgid ""
 "   show - Show a readable record for the package\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
+"   pkgnames - List the names of all packages\n"
+"   dotty - Generate package graphs for GraphVis\n"
 "   xvcg - Generate package graphs for xvcg\n"
 "   policy - Show policy settings\n"
 "\n"
@@ -256,7 +257,8 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815
+#: apt-pkg/pkgcachegen.cc:827
 #, c-format
 msgid "Unable to write to %s"
 msgstr "تعذرت الكتابة إلى %s"
@@ -265,31 +267,31 @@ msgstr "تعذرت الكتابة إلى %s"
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "تعذر الحصول على نسخة debconf. هل هي مثبتة؟"
 
-#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338
+#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
 msgid "Package extension list is too long"
 msgstr "قائمة توسيعات الحزمة طويلة جداً"
 
-#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180
-#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253
-#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289
+#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183
+#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256
+#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292
 #, c-format
 msgid "Error processing directory %s"
 msgstr "خطأ في معالجة الدليل %s"
 
-#: ftparchive/apt-ftparchive.cc:251
+#: ftparchive/apt-ftparchive.cc:254
 msgid "Source extension list is too long"
 msgstr "قائمة توسيعات المصدر طويلة جداً"
 
-#: ftparchive/apt-ftparchive.cc:368
+#: ftparchive/apt-ftparchive.cc:371
 msgid "Error writing header to contents file"
 msgstr "خطأ في كتابة الترويسة إلى ملف المحتويات"
 
-#: ftparchive/apt-ftparchive.cc:398
+#: ftparchive/apt-ftparchive.cc:401
 #, c-format
 msgid "Error processing contents %s"
 msgstr "خطأ في معالجة المحتويات %s"
 
-#: ftparchive/apt-ftparchive.cc:553
+#: ftparchive/apt-ftparchive.cc:556
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -331,303 +333,303 @@ msgid ""
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:759
+#: ftparchive/apt-ftparchive.cc:762
 msgid "No selections matched"
 msgstr "لم تُطابق أية تحديدات"
 
-#: ftparchive/apt-ftparchive.cc:832
+#: ftparchive/apt-ftparchive.cc:835
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "بعض الملفات مفقودة في مجموعة ملف الحزمة `%s'"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:47
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "قاعدة البيانات كانت فاسدة، فتم تغيير اسمها إلى %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:65
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "قاعدة البيانات قديمة، محاولة ترقية %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:76
 msgid ""
 "DB format is invalid. If you upgraded from a older version of apt, please "
 "remove and re-create the database."
 msgstr ""
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:81
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
 
-#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
-#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 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 ""
 
-#: ftparchive/writer.cc:76
+#: ftparchive/writer.cc:79
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: تعذرت قراءة الدليل %s\n"
 
-#: ftparchive/writer.cc:81
+#: ftparchive/writer.cc:84
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:132
+#: ftparchive/writer.cc:135
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:137
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:144
 msgid "E: Errors apply to file "
 msgstr ""
 
-#: ftparchive/writer.cc:158 ftparchive/writer.cc:188
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
 #, c-format
 msgid "Failed to resolve %s"
 msgstr ""
 
-#: ftparchive/writer.cc:170
+#: ftparchive/writer.cc:173
 msgid "Tree walking failed"
 msgstr ""
 
-#: ftparchive/writer.cc:195
+#: ftparchive/writer.cc:198
 #, c-format
 msgid "Failed to open %s"
 msgstr "فشل فتح %s"
 
-#: ftparchive/writer.cc:254
+#: ftparchive/writer.cc:257
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:262
+#: ftparchive/writer.cc:265
 #, c-format
 msgid "Failed to readlink %s"
 msgstr ""
 
-#: ftparchive/writer.cc:266
+#: ftparchive/writer.cc:269
 #, c-format
 msgid "Failed to unlink %s"
 msgstr ""
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:276
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** فشل ربط %s بـ%s"
 
-#: ftparchive/writer.cc:283
+#: ftparchive/writer.cc:286
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 
-#: ftparchive/writer.cc:387
+#: ftparchive/writer.cc:390
 msgid "Archive had no package field"
 msgstr ""
 
-#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:620
+#: ftparchive/writer.cc:623
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:624
+#: ftparchive/writer.cc:627
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr ""
 
-#: ftparchive/contents.cc:321
+#: ftparchive/contents.cc:317
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "خطأ داخلي، تعذر العثور على العضو %s"
 
-#: ftparchive/contents.cc:358 ftparchive/contents.cc:389
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - فشل تعيين الذاكرة"
 
-#: ftparchive/override.cc:34 ftparchive/override.cc:142
+#: ftparchive/override.cc:38 ftparchive/override.cc:146
 #, c-format
 msgid "Unable to open %s"
 msgstr "تعذر فتح %s"
 
-#: ftparchive/override.cc:60 ftparchive/override.cc:166
+#: ftparchive/override.cc:64 ftparchive/override.cc:170
 #, c-format
 msgid "Malformed override %s line %lu #1"
 msgstr ""
 
-#: ftparchive/override.cc:74 ftparchive/override.cc:178
+#: ftparchive/override.cc:78 ftparchive/override.cc:182
 #, c-format
 msgid "Malformed override %s line %lu #2"
 msgstr ""
 
-#: ftparchive/override.cc:88 ftparchive/override.cc:191
+#: ftparchive/override.cc:92 ftparchive/override.cc:195
 #, c-format
 msgid "Malformed override %s line %lu #3"
 msgstr ""
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: ftparchive/override.cc:131 ftparchive/override.cc:205
 #, c-format
 msgid "Failed to read the override file %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:72
+#: ftparchive/multicompress.cc:75
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr ""
 
-#: ftparchive/multicompress.cc:102
+#: ftparchive/multicompress.cc:105
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr ""
 
-#: ftparchive/multicompress.cc:169 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:172 methods/rsh.cc:91
 msgid "Failed to create IPC pipe to subprocess"
 msgstr ""
 
-#: ftparchive/multicompress.cc:195
+#: ftparchive/multicompress.cc:198
 msgid "Failed to create FILE*"
 msgstr ""
 
-#: ftparchive/multicompress.cc:198
+#: ftparchive/multicompress.cc:201
 msgid "Failed to fork"
 msgstr ""
 
-#: ftparchive/multicompress.cc:212
+#: ftparchive/multicompress.cc:215
 msgid "Compress child"
 msgstr ""
 
-#: ftparchive/multicompress.cc:235
+#: ftparchive/multicompress.cc:238
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "خطأ داخلي، تعذر إنشاء %s"
 
-#: ftparchive/multicompress.cc:286
+#: ftparchive/multicompress.cc:289
 msgid "Failed to create subprocess IPC"
 msgstr ""
 
-#: ftparchive/multicompress.cc:321
+#: ftparchive/multicompress.cc:324
 msgid "Failed to exec compressor "
 msgstr ""
 
-#: ftparchive/multicompress.cc:360
+#: ftparchive/multicompress.cc:363
 msgid "decompressor"
 msgstr ""
 
-#: ftparchive/multicompress.cc:403
+#: ftparchive/multicompress.cc:406
 msgid "IO to subprocess/file failed"
 msgstr ""
 
-#: ftparchive/multicompress.cc:455
+#: ftparchive/multicompress.cc:458
 msgid "Failed to read while computing MD5"
 msgstr ""
 
-#: ftparchive/multicompress.cc:472
+#: ftparchive/multicompress.cc:475
 #, c-format
 msgid "Problem unlinking %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "فشل تغيير اسم %s إلى %s"
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:121
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1655
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:238
 msgid "The following packages have unmet dependencies:"
 msgstr ""
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:328
 #, c-format
 msgid "but %s is installed"
 msgstr "إلا أن %s مثبت"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:330
 #, c-format
 msgid "but %s is to be installed"
 msgstr "إلا أنه سيتم تثبيت %s"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:337
 msgid "but it is not installable"
 msgstr "إلا أنه غير قابل للتثبيت"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:339
 msgid "but it is a virtual package"
 msgstr "إلا أنها حزمة وهمية"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:342
 msgid "but it is not installed"
 msgstr "إلا أنها غير مثبتة"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:342
 msgid "but it is not going to be installed"
 msgstr "إلا أنه لن يتم تثبيتها"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:347
 msgid " or"
 msgstr " أو"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:376
 msgid "The following NEW packages will be installed:"
 msgstr "سيتم تثبيت الحزم الجديدة التالية:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:402
 msgid "The following packages will be REMOVED:"
 msgstr "سيتم إزالة الحزم التالية:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:424
 msgid "The following packages have been kept back:"
 msgstr "سيتم الإبقاء على الحزم التالية:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:445
 msgid "The following packages will be upgraded:"
 msgstr "ستتم ترقية الحزم التالية:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:466
 msgid "The following packages will be DOWNGRADED:"
 msgstr "سيتم تثبيط الحزم التالية:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:486
 msgid "The following held packages will be changed:"
 msgstr "سيتم تغيير الحزم المبقاة التالية:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:539
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (بسبب %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:547
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -635,143 +637,143 @@ msgstr ""
 "تحذير: ستتم إزالة الحزم الأساسية التالية.\n"
 "لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!"
 
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:578
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً،  "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:582
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu أعيد تثبيتها، "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu مثبطة، "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:586
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu غير مثبتة بالكامل أو مزالة.\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:664
 msgid "Correcting dependencies..."
 msgstr "تصحيح المعتمدات..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:667
 msgid " failed."
 msgstr " فشل."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:670
 msgid "Unable to correct dependencies"
 msgstr "لم يمكن تصحيح المعتمدات"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:673
 msgid "Unable to minimize the upgrade set"
 msgstr "لم يمكن تقليص مجموعة الترقية"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:675
 msgid " Done"
 msgstr " تم"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:679
 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr "قد ترغب بتنفيذ الأمر `apt-get -f install' لتصحيح هذه."
 
-#: cmdline/apt-get.cc:685
+#: cmdline/apt-get.cc:682
 msgid "Unmet dependencies. Try using -f."
 msgstr "مُعتمدات غير مستوفاة. حاول استخدام -f."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:704
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "تحذير: تعذرت المصادقة على الحزم التالية!"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:708
 msgid "Authentication warning overridden.\n"
 msgstr "تم غض النظر عن تحذير المصادقة.\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:715
 msgid "Install these packages without verification [y/N]? "
 msgstr "تثبيت هذه الحزم دون التحقق منها [y/N]؟ "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:717
 msgid "Some packages could not be authenticated"
 msgstr "تعذرت المصادقة على بعض الحزم"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
 msgid "There are problems and -y was used without --force-yes"
 msgstr "هناك مشاكل وتم استخدام -y دون --force-yes"
 
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:770
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "خطأ داخلي، تم طلب InstallPackages مع وجود حزم معطوبة!"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:779
 msgid "Packages need to be removed but remove is disabled."
 msgstr "حزم بحاجة للإزالة لكن الإزالة مُعطّلة."
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:790
 msgid "Internal error, Ordering didn't finish"
 msgstr "خطأ داخلي، لم تنته عملية الترتيب"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1995 cmdline/apt-get.cc:2028
 msgid "Unable to lock the download directory"
 msgstr "تعذر قَفْل دليل التنزيل"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2076 cmdline/apt-get.cc:2312
+#: apt-pkg/cachefile.cc:63 apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "تعذرت قراءة قائمة المصادر."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:831
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "يا للغرابة.. لم تتطابق الأحجام، الرجاء مراسلة apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "بحاجة إلى جلب %sب/%sب من الأرشيف.\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "بحاجة إلى جلب %sب من الأرشيف.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:844
 #, fuzzy, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
+msgid "After unpacking %sB of additional disk space will be used.\n"
 msgstr "بعد الاستخراج %sب من المساحة الإضافيّة سيتمّ استخدامها.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:847
 #, fuzzy, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
+msgid "After unpacking %sB disk space will be freed.\n"
 msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2166
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "تعذر حساب المساحة الحرة في %s"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:864
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "ليس هناك مساحة كافية في %s."
 
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:881
 msgid "Yes, do as I say!"
 msgstr "نعم، افعل ما أقوله!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -782,28 +784,29 @@ msgstr ""
 "كي تستمر اكتب العبارة '%s'\n"
 " ؟] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
 msgid "Abort."
 msgstr "إجهاض."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:904
 msgid "Do you want to continue [Y/n]? "
 msgstr "هل تريد الاستمرار [Y/n]؟"
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2209
+#: apt-pkg/algorithms.cc:1348
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "فشل إحضار %s  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:994
 msgid "Some files failed to download"
 msgstr "فشل تنزيل بعض الملفات"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2218
 msgid "Download complete and in download only mode"
 msgstr "اكتمل التنزيل وفي وضع التنزيل فقط"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1001
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -811,47 +814,47 @@ msgstr ""
 "تعذر إحضار بعض الأرشيف، ربما يمكنك محاولة تنفيذ apt-get update أو إضافة --"
 "fix-missing؟"
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1005
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing وتبديل الأوساط غير مدعومة حالياً"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1010
 msgid "Unable to correct missing packages."
 msgstr "تعذر تصحيح الحزم المفقودة."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1011
 msgid "Aborting install."
 msgstr "إجهاض التثبيت."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1045
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "لاحظ، تحديد %s بدلاً من %s\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n"
 
-#: cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1073
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n"
 
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1084
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "الحزمة %s وهميّة وتوفّرها:\n"
 
-#: cmdline/apt-get.cc:1104
+#: cmdline/apt-get.cc:1096
 msgid " [Installed]"
 msgstr " [مُثبّتة]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1101
 msgid "You should explicitly select one to install."
 msgstr "يجب اختيار واحدة بالتحديد لتثبيتها."
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1106
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -859,124 +862,121 @@ msgid ""
 "is only available from another source\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1125
 msgid "However the following packages replace it:"
 msgstr "على أيّ فإن الحزم التالية تحلّ مكانها:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1128
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "الحزمة %s ليس لها مرشح تثبيت"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1148
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "إعادة تثبيت  %s غير ممكنة، حيث أنّه لا يمكن تنزيلها.\n"
 
-#: cmdline/apt-get.cc:1164
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s هي النسخة الأحدث.\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1185
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1187
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1193
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1330
 msgid "The update command takes no arguments"
 msgstr "لا يقبل الأمر update أية مُعطيات"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1343
 msgid "Unable to lock the list directory"
 msgstr "تعذر قفل دليل القائمة"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 apt-pkg/algorithms.cc:1374
+#: apt-pkg/algorithms.cc:1376
+msgid ""
+"Some index files failed to download, they have been ignored, or old ones "
+"used instead."
+msgstr ""
+
+#: cmdline/apt-get.cc:1433
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1465
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "سيتم تثبيت الحزم الجديدة التالية:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1467
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1472
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgstr ""
 
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << endl;
-#. }
-#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1736
 msgid "The following information may help to resolve the situation:"
 msgstr "قد تساعد المعلومات التالية في حل المشكلة:"
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1479
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1498
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1543
 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "تعذر العثور على الحزمة %s"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1642 cmdline/apt-get.cc:1678
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "تعذر العثور على الحزمة %s"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1665
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "لاحظ، تحديد %s بسبب صيغة regex '%s'\n"
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1695
 #, fuzzy, c-format
-msgid "%s set to manually installed.\n"
+msgid "%s set to manual installed.\n"
 msgstr "إلا أنه سيتم تثبيت %s"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1708
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "قد ترغب بتشغيل `apt-get -f install' لتصحيح هذه:"
 
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1711
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 "مُعتمدات غير مستوفاة. جرب 'apt-get -f install' بدون أسماء حزم (أو حدّد حلاً)."
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1723
 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"
@@ -984,152 +984,160 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1731
+msgid ""
+"Since you only requested a single operation it is extremely likely that\n"
+"the package is simply not installable and a bug report against\n"
+"that package should be filed."
+msgstr ""
+
+#: cmdline/apt-get.cc:1739
 msgid "Broken packages"
 msgstr "حزم معطوبة"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1770
 msgid "The following extra packages will be installed:"
 msgstr "سيتم تثبيت الحزم الإضافيّة التالية:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1859
 msgid "Suggested packages:"
 msgstr "الحزم المقترحة:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1860
 msgid "Recommended packages:"
 msgstr "الحزم المستحسنة:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1888
 msgid "Calculating upgrade... "
 msgstr "حساب الترقية..."
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1891 methods/ftp.cc:702 methods/connect.cc:101
+#: methods/connect.cc:111
 msgid "Failed"
 msgstr "فشل"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1896
 msgid "Done"
 msgstr "تمّ"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1963 cmdline/apt-get.cc:1971
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2071
 msgid "Must specify at least one package to fetch source for"
 msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2330
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "تعذر العثور على مصدر الحزمة %s"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2145
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "تخطي الملف '%s' المنزل مسبقاً\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2169
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "ليس هناك مساحة كافية في %s"
 
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2174
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "يجب جلب %sب/%sب من الأرشيفات المصدرية.\n"
 
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2177
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2183
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "إحضار المصدر %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2214
 msgid "Failed to fetch some archives."
 msgstr "فشل إحضار بعض الأرشيفات."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2242
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2254
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "أمر فك الحزمة '%s' فشل.\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2255
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "أمر البناء '%s' فشل.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2291
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2307
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2335
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2355
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2407
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2459
 #, 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:2503
+#: cmdline/apt-get.cc:2494
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2519
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2533
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2537
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2569
 msgid "Supported modules:"
 msgstr "الوحدات المدعومة:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2610
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1144,8 +1152,6 @@ msgid ""
 "   upgrade - Perform an upgrade\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1161,7 +1167,7 @@ msgid ""
 "  -d  Download only - do NOT install or unpack archives\n"
 "  -s  No-act. Perform ordering simulation\n"
 "  -y  Assume Yes to all queries and do not prompt\n"
-"  -f  Attempt to correct a system with broken dependencies in place\n"
+"  -f  Attempt to continue if the integrity check fails\n"
 "  -m  Attempt to continue if archives are unlocatable\n"
 "  -u  Show a list of upgraded packages as well\n"
 "  -b  Build the source package after fetching it\n"
@@ -1232,28 +1238,24 @@ msgstr ""
 msgid "Bad default setting!"
 msgstr "إعداد افتراضيّ سيّء!"
 
-#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
-#: dselect/install:105 dselect/update:45
+#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93
+#: dselect/install:104 dselect/update:45
 msgid "Press enter to continue."
 msgstr "اضغط مفتاح الإدخال للاستمرار."
 
-#: dselect/install:91
-msgid "Do you want to erase any previously downloaded .deb files?"
-msgstr ""
-
-#: dselect/install:101
+#: dselect/install:100
 msgid "Some errors occurred while unpacking. I'm going to configure the"
 msgstr "حدثت بعض الأخطاء أثناء فك الحزمة. سأقوم بتهيئة "
 
-#: dselect/install:102
+#: dselect/install:101
 msgid "packages that were installed. This may result in duplicate errors"
 msgstr "الحزم التي تم تثبيتها. قد يتسبب هذا بظهر أخطاء متكررة"
 
-#: dselect/install:103
+#: dselect/install:102
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
 msgstr "أو أخطاء سبّبتها المُعتمدات المفقودة. لا بأس بهذا، فقط الأخطاء"
 
-#: dselect/install:104
+#: dselect/install:103
 msgid ""
 "above this message are important. Please fix them and run [I]nstall again"
 msgstr "أعلى هذه الرسالة مهمّة. الرجاء تصحيحها وتشغيل التثبيت مجدداً"
@@ -1262,188 +1264,192 @@ msgstr "أعلى هذه الرسالة مهمّة. الرجاء تصحيحها 
 msgid "Merging available information"
 msgstr "دمج المعلومات المتوفرة"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "فشل تنفيذ gzip"
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
 msgid "Corrupted archive"
 msgstr "أرشيف فاسد"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "فشل تحقّق Checksum لملف Tar، الأرشيف فاسد"
 
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:299
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:73
 msgid "Invalid archive signature"
 msgstr "توقيع الأرشيف غير صالح"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:81
 msgid "Error reading archive member header"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105
 msgid "Invalid archive member header"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:131
 msgid "Archive is too short"
 msgstr "الأرشيف قصير جداً"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:135
 msgid "Failed to read the archive headers"
 msgstr "فشلت قراءة ترويسات الأرشيف"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:384
 msgid "DropNode called on still linked node"
 msgstr ""
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:416
 msgid "Failed to locate the hash element!"
 msgstr ""
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:463
 msgid "Failed to allocate diversion"
 msgstr ""
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:468
 msgid "Internal error in AddDiversion"
 msgstr "خطأ داخلي في AddDiversion"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:481
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr ""
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:510
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr ""
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:553
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "ملف تهيئة مُزدوج %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49
+#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
 #, c-format
 msgid "Failed to write file %s"
 msgstr "فشلت كتابة الملف %s"
 
-#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
 #, c-format
 msgid "Failed to close file %s"
 msgstr "فشل إغلاق الملف %s"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "المسار %s طويل جداً"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "فكّ تحزيم %s أكثر من مرّة"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr ""
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr ""
 
-#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr ""
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr ""
 
-#: apt-inst/extract.cc:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr ""
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "المسار طويل جداً"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:417
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr ""
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:434
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:753
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
 #: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/contrib/configuration.cc:821 apt-pkg/acquire.cc:419
+#: methods/mirror.cc:85
 #, c-format
 msgid "Unable to read %s"
 msgstr "تعذرت قراءة %s"
 
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:494
 #, c-format
 msgid "Unable to stat %s"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "تعذرت إزالة %s"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "تعذر إنشاء %s"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 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:760
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:748
+#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822
+#: apt-pkg/pkgcachegen.cc:945 apt-pkg/pkgcachegen.cc:760
 #: apt-pkg/pkgcachegen.cc:829 apt-pkg/pkgcachegen.cc:834
 #: apt-pkg/pkgcachegen.cc:957
 msgid "Reading package lists"
 msgstr "قراءة قوائم الحزم"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "فشل تغيير دليل الإدارة إلى %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "خطأ داخلي أثناء الحصول على اسم الحزمة"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "قراءة سرد الملفات"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1451,77 +1457,77 @@ msgid ""
 "package!"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "فشلت قراءة ملف القائمة %sinfo/%s"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "خطأ داخلي أثناء الحصول على node"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:50
+#: apt-inst/deb/debfile.cc:52
 #, c-format
-msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
+msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:110
+#: apt-inst/deb/debfile.cc:112
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "تعذر التغيير إلى %s"
 
-#: apt-inst/deb/debfile.cc:140
+#: apt-inst/deb/debfile.cc:138
 msgid "Internal error, could not locate member"
 msgstr "خطأ داخلي، تعذر العثور على العضو"
 
-#: apt-inst/deb/debfile.cc:173
+#: apt-inst/deb/debfile.cc:171
 msgid "Failed to locate a valid control file"
 msgstr "فشل العثور على ملف تحكّم صالح"
 
-#: apt-inst/deb/debfile.cc:258
+#: apt-inst/deb/debfile.cc:256
 msgid "Unparsable control file"
 msgstr ""
 
@@ -1622,7 +1628,8 @@ msgstr "انتهى وقت الاتصال"
 msgid "Server closed the connection"
 msgstr "أغلق الخادم الاتصال"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
+#: apt-pkg/contrib/fileutl.cc:538
 msgid "Read error"
 msgstr "خطأ في القراءة"
 
@@ -1634,7 +1641,8 @@ msgstr ""
 msgid "Protocol corruption"
 msgstr ""
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
+#: apt-pkg/contrib/fileutl.cc:577
 msgid "Write error"
 msgstr "خطأ في الكتابة"
 
@@ -1688,7 +1696,8 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr "تعذر قبول الاتصال"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/http.cc:993
 msgid "Problem hashing file"
 msgstr ""
 
@@ -1715,95 +1724,95 @@ msgstr "استعلام"
 msgid "Unable to invoke "
 msgstr ""
 
-#: methods/connect.cc:70
+#: methods/connect.cc:64 methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "الاتصال بـ%s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:71 methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:80 methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr ""
 
-#: methods/connect.cc:96
+#: methods/connect.cc:86 methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "تعذر تمهيد الاتصال بـ%s:%s (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:93 methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "تعذر الاتصال بـ%s:%s (%s)، انتهى وقت الاتصال"
 
-#: methods/connect.cc:119
+#: methods/connect.cc:108 methods/connect.cc:118
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "تعذر الاتصال بـ%s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:147 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425 methods/connect.cc:146
 #, c-format
 msgid "Connecting to %s"
 msgstr "الاتصال بـ%s"
 
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:167 methods/connect.cc:164 methods/connect.cc:183
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr ""
 
-#: methods/connect.cc:190
+#: methods/connect.cc:173 methods/connect.cc:189
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr ""
 
-#: methods/connect.cc:193
+#: methods/connect.cc:176 methods/connect.cc:192
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr ""
 
-#: methods/connect.cc:240
+#: methods/connect.cc:223 methods/connect.cc:239
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "تعذر الاتصال بـ%s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:65 methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr ""
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:101 methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:205 methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:210 methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
 #: methods/gpgv.cc:214
 #, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:219 methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:250 methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr ""
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:257 methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1819,81 +1828,78 @@ msgstr ""
 msgid "Read error from %s process"
 msgstr ""
 
-#: methods/http.cc:377
+#: methods/http.cc:377 methods/http.cc:378
 msgid "Waiting for headers"
 msgstr "بانتظار الترويسات"
 
-#: methods/http.cc:523
+#: methods/http.cc:523 methods/http.cc:524
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr ""
 
-#: methods/http.cc:531
+#: methods/http.cc:531 methods/http.cc:532
 msgid "Bad header line"
 msgstr "سطر ترويسة سيء"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:550 methods/http.cc:557 methods/http.cc:551
+#: methods/http.cc:558
 msgid "The HTTP server sent an invalid reply header"
 msgstr "أرسل خادم http ترويسة ردّ غير صالحة"
 
-#: methods/http.cc:586
+#: methods/http.cc:586 methods/http.cc:587
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "أرسل خادم http ترويسة طول محتويات (ِContent-Length) غير صالحة"
 
-#: methods/http.cc:601
+#: methods/http.cc:601 methods/http.cc:602
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "أرسل خادم http ترويسة مدى محتويات (ِContent-Range) غير صالحة"
 
-#: methods/http.cc:603
+#: methods/http.cc:603 methods/http.cc:604
 msgid "This HTTP server has broken range support"
 msgstr "خادم http له دعم مدى معطوب"
 
-#: methods/http.cc:627
+#: methods/http.cc:627 methods/http.cc:628
 msgid "Unknown date format"
 msgstr "نسق تاريخ مجهول"
 
-#: methods/http.cc:774
+#: methods/http.cc:774 methods/http.cc:781
 msgid "Select failed"
 msgstr "فشل التحديد"
 
-#: methods/http.cc:779
+#: methods/http.cc:779 methods/http.cc:786
 msgid "Connection timed out"
 msgstr "انتهى وقت الاتصال"
 
-#: methods/http.cc:802
+#: methods/http.cc:802 methods/http.cc:809
 msgid "Error writing to output file"
 msgstr "خطأ في الكتابة إلى ملف المُخرجات"
 
-#: methods/http.cc:833
+#: methods/http.cc:833 methods/http.cc:840
 msgid "Error writing to file"
 msgstr "خطأ في الكتابة إلى الملف"
 
-#: methods/http.cc:861
+#: methods/http.cc:861 methods/http.cc:868
 msgid "Error writing to the file"
 msgstr "خطأ في الكتابة إلى الملف"
 
-#: methods/http.cc:875
+#: methods/http.cc:875 methods/http.cc:882
 msgid "Error reading from server. Remote end closed connection"
 msgstr "خطأ في القراءة من الخادم. أقفل الطرف الآخر الاتصال"
 
-#: methods/http.cc:877
+#: methods/http.cc:877 methods/http.cc:884
 msgid "Error reading from server"
 msgstr "خطأ في القراءة من الخادم"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
-#, fuzzy
-msgid "Failed to truncate file"
-msgstr "فشلت كتابة الملف %s"
-
-#: methods/http.cc:1105
+#: methods/http.cc:1104 methods/http.cc:1143
 msgid "Bad header data"
 msgstr "بيانات ترويسة سيئة"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1121 methods/http.cc:1176 methods/http.cc:1160
+#: methods/http.cc:1215
 msgid "Connection failed"
 msgstr "فشل الاتصال"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1228 methods/http.cc:1307
 msgid "Internal error"
 msgstr "خطأ داخلي"
 
@@ -1906,11 +1912,7 @@ msgstr ""
 msgid "Couldn't make mmap of %lu bytes"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1014
+#: apt-pkg/contrib/strutl.cc:978 apt-pkg/contrib/strutl.cc:1018
 #, c-format
 msgid "Selection %s not found"
 msgstr "تعذر العثور على التحديد %s"
@@ -1925,42 +1927,48 @@ msgstr "اختصار نوع مجهول: '%c'"
 msgid "Opening configuration file %s"
 msgstr "فتح ملف التهيئة %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:515
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
+msgstr "السطر %d طويل جداً (أقصاه %d)"
+
+#: apt-pkg/contrib/configuration.cc:611 apt-pkg/contrib/configuration.cc:662
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:630 apt-pkg/contrib/configuration.cc:681
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:647 apt-pkg/contrib/configuration.cc:698
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:687 apt-pkg/contrib/configuration.cc:738
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:694 apt-pkg/contrib/configuration.cc:745
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
+#: apt-pkg/contrib/configuration.cc:698 apt-pkg/contrib/configuration.cc:703
 #: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:707 apt-pkg/contrib/configuration.cc:758
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:741 apt-pkg/contrib/configuration.cc:809
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
@@ -2026,80 +2034,81 @@ msgstr "عمليّة غير صالحة %s"
 msgid "Unable to stat the mount point %s"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: apt-pkg/contrib/cdromutl.cc:180 apt-pkg/acquire.cc:425
+#: apt-pkg/acquire.cc:450 methods/mirror.cc:91
 #, c-format
 msgid "Unable to change to %s"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:188
+#: apt-pkg/contrib/cdromutl.cc:187 apt-pkg/contrib/cdromutl.cc:188
 msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:82 apt-pkg/contrib/fileutl.cc:149
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:87 apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Could not open lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:105 apt-pkg/contrib/fileutl.cc:172
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:109 apt-pkg/contrib/fileutl.cc:176
 #, c-format
 msgid "Could not get lock %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:377 apt-pkg/contrib/fileutl.cc:444
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:387 apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:457
+#: apt-pkg/contrib/fileutl.cc:390 apt-pkg/contrib/fileutl.cc:457
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:459
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:436 apt-pkg/contrib/fileutl.cc:503
 #, c-format
 msgid "Could not open file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:492 apt-pkg/contrib/fileutl.cc:559
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:522 apt-pkg/contrib/fileutl.cc:589
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:597 apt-pkg/contrib/fileutl.cc:664
 msgid "Problem closing the file"
 msgstr "مشكلة في إغلاق الملف"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:603 apt-pkg/contrib/fileutl.cc:670
 msgid "Problem unlinking the file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:614 apt-pkg/contrib/fileutl.cc:681
 msgid "Problem syncing the file"
 msgstr "مشكلة في مزامنة الملف"
 
@@ -2276,46 +2285,40 @@ msgstr ""
 msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:248
+#: apt-pkg/algorithms.cc:247 apt-pkg/algorithms.cc:248
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1105 apt-pkg/algorithms.cc:1107
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1107 apt-pkg/algorithms.cc:1109
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
-msgid ""
-"Some index files failed to download, they have been ignored, or old ones "
-"used instead."
-msgstr ""
-
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:59 apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:63 apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr ""
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:827 apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:829 apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr ""
@@ -2330,17 +2333,17 @@ msgstr ""
 msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:398 apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "الرجاء إدخال القرص المُسمّى  '%s' في السوّاقة '%s' وضغط مفتاح الإدخال."
 
-#: apt-pkg/init.cc:124
+#: apt-pkg/init.cc:124 apt-pkg/init.cc:125
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "نظام الحزم '%s' غير مدعوم"
 
-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:140 apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
@@ -2353,11 +2356,11 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:69 apt-pkg/cachefile.cc:71
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:73 apt-pkg/cachefile.cc:75
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "قد يساعدك تنفيذ الأمر apt-get update في تصحيح هذه المشاكل"
 
@@ -2388,124 +2391,126 @@ msgstr "حدث خطأ أثناء معالجة %s (NewPackage)"
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "حدث خطأ أثناء معالجة %s (UserPackage1)"
 
-#: apt-pkg/pkgcachegen.cc:164
+#: apt-pkg/pkgcachegen.cc:153 apt-pkg/pkgcachegen.cc:164
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:189
+#: apt-pkg/pkgcachegen.cc:178 apt-pkg/pkgcachegen.cc:189
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "حدث خطأ أثناء معالجة %s (UserPackage2)"
 
-#: apt-pkg/pkgcachegen.cc:193
+#: apt-pkg/pkgcachegen.cc:182 apt-pkg/pkgcachegen.cc:193
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:224
+#: apt-pkg/pkgcachegen.cc:213 apt-pkg/pkgcachegen.cc:224
 #, c-format
 msgid "Error occurred while processing %s (NewVersion1)"
 msgstr "حدث خطأ أثناء معالجة %s (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:228
+#: apt-pkg/pkgcachegen.cc:217 apt-pkg/pkgcachegen.cc:228
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "حدث خطأ أثناء معالجة %s (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:232
+#: apt-pkg/pkgcachegen.cc:221 apt-pkg/pkgcachegen.cc:232
 #, c-format
 msgid "Error occurred while processing %s (NewVersion2)"
 msgstr "حدث خطأ أثناء معالجة %s (NewVersion2)"
 
-#: apt-pkg/pkgcachegen.cc:256
+#: apt-pkg/pkgcachegen.cc:245 apt-pkg/pkgcachegen.cc:256
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:262
+#: apt-pkg/pkgcachegen.cc:251 apt-pkg/pkgcachegen.cc:262
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:265
+#: apt-pkg/pkgcachegen.cc:254 apt-pkg/pkgcachegen.cc:265
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:268
+#: apt-pkg/pkgcachegen.cc:257 apt-pkg/pkgcachegen.cc:268
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:271
+#: apt-pkg/pkgcachegen.cc:260 apt-pkg/pkgcachegen.cc:271
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:288 apt-pkg/pkgcachegen.cc:299
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:312
+#: apt-pkg/pkgcachegen.cc:301 apt-pkg/pkgcachegen.cc:312
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:318
+#: apt-pkg/pkgcachegen.cc:307 apt-pkg/pkgcachegen.cc:318
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:690
+#: apt-pkg/pkgcachegen.cc:678 apt-pkg/pkgcachegen.cc:690
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:775
+#: apt-pkg/pkgcachegen.cc:763 apt-pkg/pkgcachegen.cc:775
 msgid "Collecting File Provides"
 msgstr ""
 
+#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897
 #: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909
 msgid "IO Error saving source cache"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:127 apt-pkg/acquire-item.cc:134
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "فشل إعادة التسمية ، %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:401
+#: apt-pkg/acquire-item.cc:401 apt-pkg/acquire-item.cc:451
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum غير متطابقة"
 
-#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408
+#: apt-pkg/acquire-item.cc:707 apt-pkg/acquire-item.cc:1478
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "MD5Sum غير متطابقة"
 
-#: apt-pkg/acquire-item.cc:1118
+#: apt-pkg/acquire-item.cc:1100 apt-pkg/acquire-item.cc:1170
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1231
+#: apt-pkg/acquire-item.cc:1213 apt-pkg/acquire-item.cc:1283
 #, 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:1290
+#: apt-pkg/acquire-item.cc:1272 apt-pkg/acquire-item.cc:1342
 #, 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:1331
+#: apt-pkg/acquire-item.cc:1313 apt-pkg/acquire-item.cc:1383
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1418
+#: apt-pkg/acquire-item.cc:1400 apt-pkg/acquire-item.cc:1470
 msgid "Size mismatch"
 msgstr "الحجم غير متطابق"
 
@@ -2560,8 +2565,8 @@ msgstr ""
 #: apt-pkg/cdrom.cc:678
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %u package indexes, %u source indexes, %u translation indexes and %u "
+"signatures\n"
 msgstr ""
 
 #: apt-pkg/cdrom.cc:715
@@ -2594,98 +2599,92 @@ msgstr "كتابة لائحة المصادر الجديدة\n"
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 apt-pkg/indexcopy.cc:832
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 apt-pkg/indexcopy.cc:834
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 apt-pkg/indexcopy.cc:837
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831 apt-pkg/indexcopy.cc:840
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:49
-#, fuzzy, c-format
-msgid "Installing %s"
-msgstr "تم تثبيت %s"
-
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
-#, c-format
-msgid "Configuring %s"
-msgstr "تهيئة %s"
-
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
-#, c-format
-msgid "Removing %s"
-msgstr "إزالة %s"
-
-#: apt-pkg/deb/dpkgpm.cc:52
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:513 apt-pkg/deb/dpkgpm.cc:532
 #, c-format
 msgid "Directory '%s' missing"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:621
 #, c-format
 msgid "Preparing %s"
 msgstr "تحضير %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:597 apt-pkg/deb/dpkgpm.cc:622
 #, c-format
 msgid "Unpacking %s"
 msgstr "فتح %s"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:602 apt-pkg/deb/dpkgpm.cc:627
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "التحضير لتهيئة %s"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
+#: apt-pkg/deb/dpkgpm.cc:603 apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:628
+#, c-format
+msgid "Configuring %s"
+msgstr "تهيئة %s"
+
+#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:630 apt-pkg/deb/dpkgpm.cc:631
 #, fuzzy, c-format
 msgid "Processing triggers for %s"
 msgstr "خطأ في معالجة الدليل %s"
 
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:608 apt-pkg/deb/dpkgpm.cc:633
 #, c-format
 msgid "Installed %s"
 msgstr "تم تثبيت %s"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615
+#: apt-pkg/deb/dpkgpm.cc:616 apt-pkg/deb/dpkgpm.cc:638
+#: apt-pkg/deb/dpkgpm.cc:640 apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "التحضير لإزالة %s"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:618 apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:643
+#, c-format
+msgid "Removing %s"
+msgstr "إزالة %s"
+
+#: apt-pkg/deb/dpkgpm.cc:619 apt-pkg/deb/dpkgpm.cc:644
 #, c-format
 msgid "Removed %s"
 msgstr "تم إزالة %s"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:624 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "التحضير لإزالة %s بالكامل"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:625 apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Completely removed %s"
 msgstr "تمت إزالة %s بالكامل"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:775 apt-pkg/deb/dpkgpm.cc:805
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
@@ -2697,9 +2696,146 @@ msgstr ""
 msgid "Connection closed prematurely"
 msgstr ""
 
+#: methods/gpgv.cc:232
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+msgstr ""
+
+#: methods/http.cc:978 apt-pkg/contrib/mmap.cc:196
 #, fuzzy
-#~ msgid "Line %d too long (max %lu)"
-#~ msgstr "السطر %d طويل جداً (أقصاه %d)"
+msgid "Failed to truncate file"
+msgstr "فشلت كتابة الملف %s"
+
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, 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 ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1244
+#, c-format
+msgid ""
+"A error occurred during the signature verification. The repository is not "
+"updated and the previous index files will be used.GPG error: %s: %s\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1253
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "لاحظ، تحديد %s بدلاً من %s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:678
+#, c-format
+msgid ""
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
+"zu signatures\n"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:51
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr "تم تثبيت %s"
+
+#: apt-pkg/deb/dpkgpm.cc:54
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1011
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1016
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1018
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1024
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1030
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "تعذر قفل دليل القائمة"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'sudo dpkg --configure -a' to "
+"correct the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
+#. FIXME: fallback to a default mirror here instead
+#. and provide a config option to define that default
+#: methods/mirror.cc:172
+#, c-format
+msgid "No mirror file '%s' found "
+msgstr ""
 
 #, fuzzy
 #~ msgid "Line %d too long (max %d)"