* merged/removed conflicts with apt--main--0

[apt.git] / po / he.po

diff --git a/po/he.po b/po/he.po
index ff3001825699829f0a4c8c2a7eb93f38d26f6360..ebab198ec5d5881856b6f6c1400250463067a822 100644 (file)
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.25\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt 0.5.25\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2004-12-23 12:36+0100\n"
+"POT-Creation-Date: 2005-03-05 12:06+0100\n"

 "PO-Revision-Date: 2004-06-10 19:58+0300\n"
 "Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n"
 "Language-Team: Hebrew\n"
 "PO-Revision-Date: 2004-06-10 19:58+0300\n"
 "Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n"
 "Language-Team: Hebrew\n"


@@ -28,23 +28,23 @@ msgid "Unable to locate package %s"
 msgstr "לא מצליח לאתר את החבילה %s"
 
 #: cmdline/apt-cache.cc:232
 msgstr "לא מצליח לאתר את החבילה %s"
 
 #: cmdline/apt-cache.cc:232

-msgid "Total Package Names : "
+msgid "Total package names : "

 msgstr ""
 
 #: cmdline/apt-cache.cc:272
 msgstr ""
 
 #: cmdline/apt-cache.cc:272

-msgid "  Normal Packages: "
+msgid "  Normal packages: "

 msgstr "חבילות נורמליות:"
 
 #: cmdline/apt-cache.cc:273
 msgstr "חבילות נורמליות:"
 
 #: cmdline/apt-cache.cc:273

-msgid "  Pure Virtual Packages: "
+msgid "  Pure virtual packages: "

 msgstr "חבילות וירטואליות לחלוטין:"
 
 #: cmdline/apt-cache.cc:274
 msgstr "חבילות וירטואליות לחלוטין:"
 
 #: cmdline/apt-cache.cc:274

-msgid "  Single Virtual Packages: "
+msgid "  Single virtual packages: "

 msgstr ""
 
 #: cmdline/apt-cache.cc:275
 msgstr ""
 
 #: cmdline/apt-cache.cc:275

-msgid "  Mixed Virtual Packages: "
+msgid "  Mixed virtual packages: "

 msgstr ""
 
 #: cmdline/apt-cache.cc:276
 msgstr ""
 
 #: cmdline/apt-cache.cc:276


@@ -52,35 +52,35 @@ msgid "  Missing: "
 msgstr "חסרות:"
 
 #: cmdline/apt-cache.cc:278
 msgstr "חסרות:"
 
 #: cmdline/apt-cache.cc:278

-msgid "Total Distinct Versions: "
+msgid "Total distinct versions: "

 msgstr ""
 
 #: cmdline/apt-cache.cc:280
 msgstr ""
 
 #: cmdline/apt-cache.cc:280

-msgid "Total Dependencies: "
+msgid "Total dependencies: "

 msgstr ""
 
 #: cmdline/apt-cache.cc:283
 msgstr ""
 
 #: cmdline/apt-cache.cc:283

-msgid "Total Ver/File relations: "
+msgid "Total ver/file relations: "

 msgstr ""
 
 #: cmdline/apt-cache.cc:285
 msgstr ""
 
 #: cmdline/apt-cache.cc:285

-msgid "Total Provides Mappings: "
+msgid "Total Provides mappings: "

 msgstr ""
 
 #: cmdline/apt-cache.cc:297
 msgstr ""
 
 #: cmdline/apt-cache.cc:297

-msgid "Total Globbed Strings: "
+msgid "Total globbed strings: "

 msgstr ""
 
 #: cmdline/apt-cache.cc:311
 msgstr ""
 
 #: cmdline/apt-cache.cc:311

-msgid "Total Dependency Version space: "
+msgid "Total dependency version space: "

 msgstr ""
 
 #: cmdline/apt-cache.cc:316
 msgstr ""
 
 #: cmdline/apt-cache.cc:316

-msgid "Total Slack space: "
+msgid "Total slack space: "

 msgstr ""
 
 #: cmdline/apt-cache.cc:324
 msgstr ""
 
 #: cmdline/apt-cache.cc:324

-msgid "Total Space Accounted for: "
+msgid "Total space accounted for: "

 msgstr ""
 
 #: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
 msgstr ""
 
 #: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189


@@ -97,7 +97,7 @@ msgid "No packages found"
 msgstr "לא נמצאו חבילות"
 
 #: cmdline/apt-cache.cc:1462
 msgstr "לא נמצאו חבילות"
 
 #: cmdline/apt-cache.cc:1462

-msgid "Package Files:"
+msgid "Package files:"

 msgstr "קבצי חבילה:"
 
 #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
 msgstr "קבצי חבילה:"
 
 #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555


@@ -111,7 +111,7 @@ msgstr "%4i %s\n"
 
 #. Show any packages have explicit pins
 #: cmdline/apt-cache.cc:1482
 
 #. Show any packages have explicit pins
 #: cmdline/apt-cache.cc:1482

-msgid "Pinned Packages:"
+msgid "Pinned packages:"

 msgstr "חבילות נעוצות:"
 
 #: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
 msgstr "חבילות נעוצות:"
 
 #: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535


@@ -133,12 +133,12 @@ msgid "  Candidate: "
 msgstr "מועמדים:"
 
 #: cmdline/apt-cache.cc:1532
 msgstr "מועמדים:"
 
 #: cmdline/apt-cache.cc:1532

-msgid "  Package Pin: "
+msgid "  Package pin: "

 msgstr "נעץ חבילה:"
 
 #. Show the priority tables
 #: cmdline/apt-cache.cc:1541
 msgstr "נעץ חבילה:"
 
 #. Show the priority tables
 #: cmdline/apt-cache.cc:1541

-msgid "  Version Table:"
+msgid "  Version table:"

 msgstr ""
 
 #: cmdline/apt-cache.cc:1556
 msgstr ""
 
 #: cmdline/apt-cache.cc:1556


@@ -146,7 +146,7 @@ msgstr ""
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 

-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70

 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
 #: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
 #, c-format
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
 #: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
 #, c-format


@@ -188,7 +188,7 @@ msgid ""
 "  -q   Disable progress indicator.\n"
 "  -i   Show only important deps for the unmet command.\n"
 "  -c=? Read this configuration file\n"
 "  -q   Disable progress indicator.\n"
 "  -i   Show only important deps for the unmet command.\n"
 "  -c=? Read this configuration file\n"

-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"

 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 


@@ -209,7 +209,7 @@ msgid ""
 "Options:\n"
 "  -h   This help text.\n"
 "  -c=? Read this configuration file\n"
 "Options:\n"
 "  -h   This help text.\n"
 "  -c=? Read this configuration file\n"

-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"

 msgstr ""
 
 #: cmdline/apt-extracttemplates.cc:98
 msgstr ""
 
 #: cmdline/apt-extracttemplates.cc:98


@@ -228,7 +228,7 @@ msgid ""
 "  -h   This help text\n"
 "  -t   Set the temp dir\n"
 "  -c=? Read this configuration file\n"
 "  -h   This help text\n"
 "  -t   Set the temp dir\n"
 "  -c=? Read this configuration file\n"

-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"

 msgstr ""
 
 #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
 msgstr ""
 
 #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710


@@ -248,7 +248,7 @@ msgstr ""
 #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252
 #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288
 #, c-format
 #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252
 #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288
 #, c-format

-msgid "Error Processing directory %s"
+msgid "Error processing directory %s"

 msgstr "שגיאה בעיבוד ספריה %s"
 
 #: ftparchive/apt-ftparchive.cc:250
 msgstr "שגיאה בעיבוד ספריה %s"
 
 #: ftparchive/apt-ftparchive.cc:250


@@ -261,7 +261,7 @@ msgstr ""
 
 #: ftparchive/apt-ftparchive.cc:397
 #, c-format
 
 #: ftparchive/apt-ftparchive.cc:397
 #, c-format

-msgid "Error Processing Contents %s"
+msgid "Error processing contents %s"

 msgstr ""
 
 #: ftparchive/apt-ftparchive.cc:551
 msgstr ""
 
 #: ftparchive/apt-ftparchive.cc:551


@@ -426,7 +426,7 @@ msgstr "המתחזק של %s הוא %s ולא %s\n"
 
 #: ftparchive/contents.cc:317
 #, c-format
 
 #: ftparchive/contents.cc:317
 #, c-format

-msgid "Internal Error, could not locate member %s"
+msgid "Internal error, could not locate member %s"

 msgstr ""
 
 #: ftparchive/contents.cc:353 ftparchive/contents.cc:384
 msgstr ""
 
 #: ftparchive/contents.cc:353 ftparchive/contents.cc:384


@@ -460,7 +460,7 @@ msgstr ""
 
 #: ftparchive/multicompress.cc:75
 #, c-format
 
 #: ftparchive/multicompress.cc:75
 #, c-format

-msgid "Unknown Compresison Algorithm '%s'"
+msgid "Unknown compression algorithm '%s'"

 msgstr "'%s' אלגוריתם דחיה לא ידוע"
 
 #: ftparchive/multicompress.cc:105
 msgstr "'%s' אלגוריתם דחיה לא ידוע"
 
 #: ftparchive/multicompress.cc:105


@@ -481,12 +481,12 @@ msgid "Failed to fork"
 msgstr "כשלון בביצוע fork"
 
 #: ftparchive/multicompress.cc:215
 msgstr "כשלון בביצוע fork"
 
 #: ftparchive/multicompress.cc:215

-msgid "Compress Child"
+msgid "Compress child"

 msgstr ""
 
 #: ftparchive/multicompress.cc:238
 #, c-format
 msgstr ""
 
 #: ftparchive/multicompress.cc:238
 #, c-format

-msgid "Internal Error, Failed to create %s"
+msgid "Internal error, failed to create %s"

 msgstr "שגיאה פנימית, כלשון ביצירת %s"
 
 #: ftparchive/multicompress.cc:289
 msgstr "שגיאה פנימית, כלשון ביצירת %s"
 
 #: ftparchive/multicompress.cc:289


@@ -668,7 +668,7 @@ msgid "There are problems and -y was used without --force-yes"
 msgstr "היו בעיות והאפשרות -y היתה בשימוש ללא האפשרות --force-yes"
 
 #: cmdline/apt-get.cc:762
 msgstr "היו בעיות והאפשרות -y היתה בשימוש ללא האפשרות --force-yes"
 
 #: cmdline/apt-get.cc:762

-msgid "Packages need to be removed but Remove is disabled."
+msgid "Packages need to be removed but remove is disabled."

 msgstr ""
 
 #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
 msgstr ""
 
 #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802


@@ -757,7 +757,7 @@ msgid "Unable to correct missing packages."
 msgstr ""
 
 #: cmdline/apt-get.cc:993
 msgstr ""
 
 #: cmdline/apt-get.cc:993

-msgid "Aborting Install."
+msgid "Aborting install."

 msgstr ""
 
 #: cmdline/apt-get.cc:1026
 msgstr ""
 
 #: cmdline/apt-get.cc:1026


@@ -845,7 +845,7 @@ msgid ""
 msgstr ""
 
 #: cmdline/apt-get.cc:1372
 msgstr ""
 
 #: cmdline/apt-get.cc:1372

-msgid "Internal Error, AllUpgrade broke stuff"
+msgid "Internal error, AllUpgrade broke stuff"

 msgstr ""
 
 #: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
 msgstr ""
 
 #: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498


@@ -904,7 +904,7 @@ msgid "Recommended packages:"
 msgstr ""
 
 #: cmdline/apt-get.cc:1664
 msgstr ""
 
 #: cmdline/apt-get.cc:1664

-msgid "Calculating Upgrade... "
+msgid "Calculating upgrade... "

 msgstr ""
 
 #: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
 msgstr ""
 
 #: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99


@@ -941,7 +941,7 @@ msgstr ""
 
 #: cmdline/apt-get.cc:1933
 #, c-format
 
 #: cmdline/apt-get.cc:1933
 #, c-format

-msgid "Fetch Source %s\n"
+msgid "Fetch source %s\n"

 msgstr ""
 
 #: cmdline/apt-get.cc:1964
 msgstr ""
 
 #: cmdline/apt-get.cc:1964


@@ -1015,7 +1015,7 @@ msgid "Failed to process build dependencies"
 msgstr ""
 
 #: cmdline/apt-get.cc:2318
 msgstr ""
 
 #: cmdline/apt-get.cc:2318

-msgid "Supported Modules:"
+msgid "Supported modules:"

 msgstr ""
 
 #: cmdline/apt-get.cc:2359
 msgstr ""
 
 #: cmdline/apt-get.cc:2359


@@ -1054,7 +1054,7 @@ msgid ""
 "  -b  Build the source package after fetching it\n"
 "  -V  Show verbose version numbers\n"
 "  -c=? Read this configuration file\n"
 "  -b  Build the source package after fetching it\n"
 "  -V  Show verbose version numbers\n"
 "  -c=? Read this configuration file\n"

-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"

 "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"


@@ -1089,7 +1089,7 @@ msgstr ""
 #: cmdline/acqprogress.cc:271
 #, c-format
 msgid ""
 #: cmdline/acqprogress.cc:271
 #, c-format
 msgid ""

-"Media Change: Please insert the disc labeled\n"
+"Media change: please insert the disc labeled\n"

 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""


@@ -1109,7 +1109,7 @@ msgid ""
 "  -h   This help text\n"
 "  -s   Use source file sorting\n"
 "  -c=? Read this configuration file\n"
 "  -h   This help text\n"
 "  -s   Use source file sorting\n"
 "  -c=? Read this configuration file\n"

-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"

 msgstr ""
 
 #: dselect/install:32
 msgstr ""
 
 #: dselect/install:32


@@ -1139,7 +1139,7 @@ msgid ""
 msgstr ""
 
 #: dselect/update:30
 msgstr ""
 
 #: dselect/update:30

-msgid "Merging Available information"
+msgid "Merging available information"

 msgstr ""
 
 #: apt-inst/contrib/extracttar.cc:117
 msgstr ""
 
 #: apt-inst/contrib/extracttar.cc:117


@@ -1155,7 +1155,7 @@ msgid "Corrupted archive"
 msgstr ""
 
 #: apt-inst/contrib/extracttar.cc:195
 msgstr ""
 
 #: apt-inst/contrib/extracttar.cc:195

-msgid "Tar Checksum failed, archive corrupted"
+msgid "Tar checksum failed, archive corrupted"

 msgstr ""
 
 #: apt-inst/contrib/extracttar.cc:298
 msgstr ""
 
 #: apt-inst/contrib/extracttar.cc:298


@@ -1196,7 +1196,7 @@ msgid "Failed to allocate diversion"
 msgstr ""
 
 #: apt-inst/filelist.cc:468
 msgstr ""
 
 #: apt-inst/filelist.cc:468

-msgid "Internal Error in AddDiversion"
+msgid "Internal error in AddDiversion"

 msgstr ""
 
 #: apt-inst/filelist.cc:481
 msgstr ""
 
 #: apt-inst/filelist.cc:481


@@ -1305,7 +1305,7 @@ msgstr ""
 #: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
 #: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
 #: apt-pkg/pkgcachegen.cc:840
 #: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
 #: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
 #: apt-pkg/pkgcachegen.cc:840

-msgid "Reading Package Lists"
+msgid "Reading package lists"

 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:180
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:180


@@ -1315,11 +1315,11 @@ msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
 #: apt-inst/deb/dpkgdb.cc:448
 
 #: 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"
+msgid "Internal error getting a package name"

 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:205
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:205

-msgid "Reading File Listing"
+msgid "Reading file listing"

 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:216
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:216


@@ -1336,7 +1336,7 @@ msgid "Failed reading the list file %sinfo/%s"
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:266
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:266

-msgid "Internal Error getting a Node"
+msgid "Internal error getting a node"

 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:309
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:309


@@ -1355,7 +1355,7 @@ msgid "Invalid line in the diversion file: %s"
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:362
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:362

-msgid "Internal Error adding a diversion"
+msgid "Internal error adding a diversion"

 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:383
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:383


@@ -1363,12 +1363,12 @@ msgid "The pkg cache must be initialize first"
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:386
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:386

-msgid "Reading File List"
+msgid "Reading file list"

 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format

-msgid "Failed to find a Package: Header, offset %lu"
+msgid "Failed to find a Package: header, offset %lu"

 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:465
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:465


@@ -1397,7 +1397,7 @@ msgid "Couldn't change to %s"
 msgstr ""
 
 #: apt-inst/deb/debfile.cc:138
 msgstr ""
 
 #: apt-inst/deb/debfile.cc:138

-msgid "Internal Error, could not locate member"
+msgid "Internal error, could not locate member"

 msgstr ""
 
 #: apt-inst/deb/debfile.cc:171
 msgstr ""
 
 #: apt-inst/deb/debfile.cc:171


@@ -1405,7 +1405,7 @@ msgid "Failed to locate a valid control file"
 msgstr ""
 
 #: apt-inst/deb/debfile.cc:256
 msgstr ""
 
 #: apt-inst/deb/debfile.cc:256

-msgid "Unparsible control file"
+msgid "Unparsable control file"

 msgstr ""
 
 #: methods/cdrom.cc:113
 msgstr ""
 
 #: methods/cdrom.cc:113


@@ -1415,8 +1415,8 @@ msgstr ""
 
 #: methods/cdrom.cc:122
 msgid ""
 
 #: methods/cdrom.cc:122
 msgid ""

-"Please use apt-cdrom to make this CD recognized by APT. apt-get update "
-"cannot be used to add new CDs"
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"

 msgstr ""
 
 #: methods/cdrom.cc:130 methods/cdrom.cc:168
 msgstr ""
 
 #: methods/cdrom.cc:130 methods/cdrom.cc:168


@@ -1428,7 +1428,7 @@ msgstr ""
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr ""
 
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr ""
 

-#: methods/cdrom.cc:177 methods/file.cc:77
+#: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264

 msgid "File not found"
 msgstr ""
 
 msgid "File not found"
 msgstr ""
 


@@ -1459,7 +1459,7 @@ msgstr ""
 
 #: methods/ftp.cc:204 methods/ftp.cc:232
 #, c-format
 
 #: methods/ftp.cc:204 methods/ftp.cc:232
 #, c-format

-msgid "Server refused our connection and said: %s"
+msgid "The server refused the connection and said: %s"

 msgstr ""
 
 #: methods/ftp.cc:210
 msgstr ""
 
 #: methods/ftp.cc:210


@@ -1496,7 +1496,7 @@ msgstr ""
 msgid "Server closed the connection"
 msgstr ""
 
 msgid "Server closed the connection"
 msgstr ""
 

-#: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:452
+#: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453

 msgid "Read error"
 msgstr ""
 
 msgid "Read error"
 msgstr ""
 


@@ -1508,8 +1508,8 @@ msgstr ""
 msgid "Protocol corruption"
 msgstr ""
 
 msgid "Protocol corruption"
 msgstr ""
 

-#: methods/ftp.cc:446 methods/rsh.cc:232
-msgid "Write Error"
+#: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492
+msgid "Write error"

 msgstr ""
 
 #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
 msgstr ""
 
 #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729


@@ -1670,19 +1670,19 @@ msgid "Bad header line"
 msgstr ""
 
 #: methods/http.cc:517 methods/http.cc:524
 msgstr ""
 
 #: methods/http.cc:517 methods/http.cc:524

-msgid "The http server sent an invalid reply header"
+msgid "The HTTP server sent an invalid reply header"

 msgstr ""
 
 #: methods/http.cc:553
 msgstr ""
 
 #: methods/http.cc:553

-msgid "The http server sent an invalid Content-Length header"
+msgid "The HTTP server sent an invalid Content-Length header"

 msgstr ""
 
 #: methods/http.cc:568
 msgstr ""
 
 #: methods/http.cc:568

-msgid "The http server sent an invalid Content-Range header"
+msgid "The HTTP server sent an invalid Content-Range header"

 msgstr ""
 
 #: methods/http.cc:570
 msgstr ""
 
 #: methods/http.cc:570

-msgid "This http server has broken range support"
+msgid "This HTTP server has broken range support"

 msgstr ""
 
 #: methods/http.cc:594
 msgstr ""
 
 #: methods/http.cc:594


@@ -1710,7 +1710,7 @@ msgid "Error writing to the file"
 msgstr ""
 
 #: methods/http.cc:832
 msgstr ""
 
 #: methods/http.cc:832

-msgid "Error reading from server Remote end closed connection"
+msgid "Error reading from server. Remote end closed connection"

 msgstr ""
 
 #: methods/http.cc:834
 msgstr ""
 
 #: methods/http.cc:834


@@ -1718,7 +1718,7 @@ msgid "Error reading from server"
 msgstr ""
 
 #: methods/http.cc:1065
 msgstr ""
 
 #: methods/http.cc:1065

-msgid "Bad header Data"
+msgid "Bad header data"

 msgstr ""
 
 #: methods/http.cc:1082
 msgstr ""
 
 #: methods/http.cc:1082


@@ -1729,10 +1729,6 @@ msgstr ""
 msgid "Internal error"
 msgstr ""
 
 msgid "Internal error"
 msgstr ""
 

-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr ""
-

 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr ""
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr ""


@@ -1773,7 +1769,7 @@ msgstr ""
 
 #: apt-pkg/contrib/configuration.cc:586
 #, c-format
 
 #: apt-pkg/contrib/configuration.cc:586
 #, c-format

-msgid "Syntax error %s:%u: Malformed Tag"
+msgid "Syntax error %s:%u: Malformed tag"

 msgstr ""
 
 #: apt-pkg/contrib/configuration.cc:603
 msgstr ""
 
 #: apt-pkg/contrib/configuration.cc:603


@@ -1896,54 +1892,50 @@ msgstr ""
 msgid "Could not get lock %s"
 msgstr ""
 
 msgid "Could not get lock %s"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359

 #, c-format
 #, c-format

-msgid "Waited, for %s but it wasn't there"
+msgid "Waited for %s but it wasn't there"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369

 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372

 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374

 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418

 #, c-format
 msgid "Could not open file %s"
 msgstr ""
 
 #, c-format
 msgid "Could not open file %s"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:473
+#: apt-pkg/contrib/fileutl.cc:474

 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr ""
 
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:491
-msgid "Write error"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:504

 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr ""
 
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579

 msgid "Problem closing the file"
 msgstr ""
 
 msgid "Problem closing the file"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585

 msgid "Problem unlinking the file"
 msgstr ""
 
 msgid "Problem unlinking the file"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596

 msgid "Problem syncing the file"
 msgstr ""
 
 msgid "Problem syncing the file"
 msgstr ""
 


@@ -1961,7 +1953,7 @@ msgstr ""
 
 #: apt-pkg/pkgcache.cc:142
 #, c-format
 
 #: apt-pkg/pkgcache.cc:142
 #, c-format

-msgid "This APT does not support the Versioning System '%s'"
+msgid "This APT does not support the versioning system '%s'"

 msgstr ""
 
 #: apt-pkg/pkgcache.cc:147
 msgstr ""
 
 #: apt-pkg/pkgcache.cc:147


@@ -2017,15 +2009,15 @@ msgid "extra"
 msgstr ""
 
 #: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
 msgstr ""
 
 #: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89

-msgid "Building Dependency Tree"
+msgid "Building dependency tree"

 msgstr ""
 
 #: apt-pkg/depcache.cc:61
 msgstr ""
 
 #: apt-pkg/depcache.cc:61

-msgid "Candidate Versions"
+msgid "Candidate versions"

 msgstr ""
 
 #: apt-pkg/depcache.cc:90
 msgstr ""
 
 #: apt-pkg/depcache.cc:90

-msgid "Dependency Generation"
+msgid "Dependency generation"

 msgstr ""
 
 #: apt-pkg/tagfile.cc:73
 msgstr ""
 
 #: apt-pkg/tagfile.cc:73


@@ -2055,7 +2047,7 @@ msgstr ""
 
 #: apt-pkg/sourcelist.cc:98
 #, c-format
 
 #: apt-pkg/sourcelist.cc:98
 #, c-format

-msgid "Malformed line %lu in source list %s (Absolute dist)"
+msgid "Malformed line %lu in source list %s (absolute dist)"

 msgstr ""
 
 #: apt-pkg/sourcelist.cc:105
 msgstr ""
 
 #: apt-pkg/sourcelist.cc:105


@@ -2260,31 +2252,31 @@ msgstr ""
 msgid "rename failed, %s (%s -> %s)."
 msgstr ""
 
 msgid "rename failed, %s (%s -> %s)."
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:897
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894

 msgid "MD5Sum mismatch"
 msgstr ""
 
 msgid "MD5Sum mismatch"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:711
+#: apt-pkg/acquire-item.cc:708

 #, 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 ""
 
 #, 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:764
+#: apt-pkg/acquire-item.cc:761

 #, 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 ""
 
 #, 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:800
+#: apt-pkg/acquire-item.cc:797

 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:887
+#: apt-pkg/acquire-item.cc:884

 msgid "Size mismatch"
 msgstr ""
 
 msgid "Size mismatch"
 msgstr ""
 


@@ -2292,3 +2284,93 @@ msgstr ""
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr ""

+
+#: apt-pkg/cdrom.cc:504
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:538
+#, c-format
+msgid "Stored label: %s \n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:558
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:576
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:580
+msgid "Waiting for disc...\n"
+msgstr ""
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:588
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:606
+msgid "Scanning disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:644
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:701
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:717
+#, c-format
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:721
+msgid "Copying package lists..."
+msgstr ""
+
+#: apt-pkg/cdrom.cc:745
+msgid "Writing new source list\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:754
+msgid "Source list entries for this disc are:\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:788
+msgid "Unmounting CD-ROM..."
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:261
+#, c-format
+msgid "Wrote %i records.\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:263
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:266
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr ""