summaryrefslogtreecommitdiff
path: root/po/en_GB.po
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2007-07-26 10:43:07 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2007-07-26 10:43:07 +0200
commit94bdf40722a406f66383261d36e500213b0c2c38 (patch)
tree22739e87f31bbad88214853c5f0e45040403ec25 /po/en_GB.po
parentf0efdda074effd4b8d668c1adfd6ddc4be698ae9 (diff)
parentdfd1a56e88c068f0085140630306901d01ed0f98 (diff)
* merged from apt--mvo
Diffstat (limited to 'po/en_GB.po')
-rw-r--r--po/en_GB.po170
1 files changed, 77 insertions, 93 deletions
diff --git a/po/en_GB.po b/po/en_GB.po
index 3cdaaa82c..76d443ee7 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6.46.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-12 16:50+0100\n"
+"POT-Creation-Date: 2007-07-06 06:51+0200\n"
"PO-Revision-Date: 2006-10-12 11:07+0100\n"
"Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
"Language-Team: en_GB <en_gb@li.org>\n"
@@ -158,7 +158,7 @@ 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:2614 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s for %s %s compiled on %s %s\n"
@@ -818,7 +818,7 @@ msgstr "Internal error, Ordering didn't finish"
msgid "Unable to lock the download directory"
msgstr "Unable to lock the download directory"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "The list of sources could not be read."
@@ -847,7 +847,7 @@ msgstr "After unpacking %sB of additional disk space will be used.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "After unpacking %sB disk space will be freed.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Couldn't determine free space in %s"
@@ -876,7 +876,7 @@ msgstr ""
"To continue type in the phrase ‘%s’\n"
" ?] "
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
msgid "Abort."
msgstr "Abort."
@@ -884,7 +884,7 @@ msgstr "Abort."
msgid "Do you want to continue [Y/n]? "
msgstr "Do you want to continue [Y/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Failed to fetch %s %s\n"
@@ -893,7 +893,7 @@ msgstr "Failed to fetch %s %s\n"
msgid "Some files failed to download"
msgstr "Some files failed to download"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
msgid "Download complete and in download only mode"
msgstr "Download complete and in download only mode"
@@ -1114,7 +1114,7 @@ msgstr "Recommended packages:"
msgid "Calculating upgrade... "
msgstr "Calculating upgrade... "
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Failed"
@@ -1130,94 +1130,79 @@ msgstr "Internal error, problem resolver broke stuff"
msgid "Must specify at least one package to fetch source for"
msgstr "Must specify at least one package for which to fetch source"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Unable to find a source package for %s"
-#: cmdline/apt-get.cc:2132
-#, c-format
-msgid ""
-"WARNING: '%s' is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2137
-#, c-format
-msgid ""
-"Please use:\n"
-"bzr get %s\n"
-"to modify the package.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2165
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Skipping already downloaded file '%s'\n"
-#: cmdline/apt-get.cc:2219
+#: cmdline/apt-get.cc:2189
#, c-format
msgid "You don't have enough free space in %s"
msgstr "You don't have enough free space in %s"
-#: cmdline/apt-get.cc:2224
+#: cmdline/apt-get.cc:2194
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Need to get %sB/%sB of source archives.\n"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Need to get %sB of source archives.\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2203
#, c-format
msgid "Fetch source %s\n"
msgstr "Fetch source %s\n"
-#: cmdline/apt-get.cc:2264
+#: cmdline/apt-get.cc:2234
msgid "Failed to fetch some archives."
msgstr "Failed to fetch some archives."
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Skipping unpack of already unpacked source in %s\n"
-#: cmdline/apt-get.cc:2304
+#: cmdline/apt-get.cc:2274
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Unpack command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Check if the 'dpkg-dev' package is installed.\n"
-#: cmdline/apt-get.cc:2322
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:2341
+#: cmdline/apt-get.cc:2311
msgid "Child process failed"
msgstr "Child process failed"
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2327
msgid "Must specify at least one package to check builddeps for"
msgstr "Must specify at least one package to check builddeps for"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2355
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Unable to get build-dependency information for %s"
-#: cmdline/apt-get.cc:2405
+#: cmdline/apt-get.cc:2375
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s has no build depends.\n"
-#: cmdline/apt-get.cc:2457
+#: cmdline/apt-get.cc:2427
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1226,7 +1211,7 @@ msgstr ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
-#: cmdline/apt-get.cc:2509
+#: cmdline/apt-get.cc:2479
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1235,31 +1220,31 @@ msgstr ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
-#: cmdline/apt-get.cc:2544
+#: cmdline/apt-get.cc:2514
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Failed to satisfy %s dependency for %s: Installed package %s is too new"
-#: cmdline/apt-get.cc:2569
+#: cmdline/apt-get.cc:2539
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Failed to satisfy %s dependency for %s: %s"
-#: cmdline/apt-get.cc:2583
+#: cmdline/apt-get.cc:2553
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Build-dependencies for %s could not be satisfied."
-#: cmdline/apt-get.cc:2587
+#: cmdline/apt-get.cc:2557
msgid "Failed to process build dependencies"
msgstr "Failed to process build dependencies"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2589
msgid "Supported modules:"
msgstr "Supported modules:"
-#: cmdline/apt-get.cc:2660
+#: cmdline/apt-get.cc:2630
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1568,7 +1553,7 @@ msgstr "File %s/%s overwrites the one in the package %s"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
#, c-format
msgid "Unable to read %s"
msgstr "Unable to read %s"
@@ -1867,7 +1852,7 @@ msgstr "Data socket connect timed out"
msgid "Unable to accept connection"
msgstr "Unable to accept connection"
-#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem hashing file"
@@ -1894,39 +1879,39 @@ msgstr "Query"
msgid "Unable to invoke "
msgstr "Unable to invoke"
-#: methods/connect.cc:65
+#: methods/connect.cc:64
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Connecting to %s (%s)"
-#: methods/connect.cc:72
+#: methods/connect.cc:71
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:79
+#: methods/connect.cc:80
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Could not create a socket for %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:85
+#: methods/connect.cc:86
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Cannot initiate the connection to %s:%s (%s)."
-#: methods/connect.cc:92
+#: methods/connect.cc:93
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Could not connect to %s:%s (%s), connection timed out"
-#: methods/connect.cc:107
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Could not connect to %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:135 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Connecting to %s"
@@ -2001,76 +1986,76 @@ msgstr "Couldn't open pipe for %s"
msgid "Read error from %s process"
msgstr "Read error from %s process"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Waiting for headers"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Got a single header line over %u chars"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Bad header line"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "The HTTP server sent an invalid reply header"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "The HTTP server sent an invalid Content-Length header"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "The HTTP server sent an invalid Content-Range header"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "This HTTP server has broken range support"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Unknown date format"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Select failed"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Connection timed out"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Error writing to output file"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Error writing to file"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Error writing to the file"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Error reading from server. Remote end closed connection"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Error reading from server"
-#: methods/http.cc:1110
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Bad header data"
-#: methods/http.cc:1127
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Connection failed"
-#: methods/http.cc:1218
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Internal error"
@@ -2100,7 +2085,7 @@ msgstr "Opening configuration file %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %u)"
+msgid "Line %d too long (max %lu)"
msgstr "Line %d too long (max %d)"
#: apt-pkg/contrib/configuration.cc:606
@@ -2205,7 +2190,6 @@ msgid "Unable to stat the mount point %s"
msgstr "Unable to stat the mount point %s"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
-#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "Unable to change to %s"
@@ -2647,21 +2631,21 @@ msgstr "Collecting File Provides"
msgid "IO Error saving source cache"
msgstr "IO Error saving source cache"
-#: apt-pkg/acquire-item.cc:134
+#: apt-pkg/acquire-item.cc:127
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "rename failed, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
-#: apt-pkg/acquire-item.cc:1462
+#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
+#: apt-pkg/acquire-item.cc:1411
msgid "MD5Sum mismatch"
msgstr "MD5Sum mismatch"
-#: apt-pkg/acquire-item.cc:1156
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr "There is no public key available for the following key IDs:\n"
-#: apt-pkg/acquire-item.cc:1270
+#: apt-pkg/acquire-item.cc:1219
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2670,7 +2654,7 @@ msgstr ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
-#: apt-pkg/acquire-item.cc:1329
+#: apt-pkg/acquire-item.cc:1278
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2679,14 +2663,14 @@ msgstr ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
-#: apt-pkg/acquire-item.cc:1365
+#: apt-pkg/acquire-item.cc:1314
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"The package index files are corrupted. No Filename: field for package %s."
-#: apt-pkg/acquire-item.cc:1452
+#: apt-pkg/acquire-item.cc:1401
msgid "Size mismatch"
msgstr "Size mismatch"
@@ -2797,52 +2781,52 @@ msgstr "Wrote %i records with %i mismatched files\n"
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Wrote %i records with %i missing files and %i mismatched files\n"
-#: apt-pkg/deb/dpkgpm.cc:357
+#: apt-pkg/deb/dpkgpm.cc:355
#, c-format
msgid "Preparing %s"
msgstr "Preparing %s"
-#: apt-pkg/deb/dpkgpm.cc:358
+#: apt-pkg/deb/dpkgpm.cc:356
#, c-format
msgid "Unpacking %s"
msgstr "Unpacking %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:361
#, c-format
msgid "Preparing to configure %s"
msgstr "Preparing to configure %s"
-#: apt-pkg/deb/dpkgpm.cc:364
+#: apt-pkg/deb/dpkgpm.cc:362
#, c-format
msgid "Configuring %s"
msgstr "Configuring %s"
-#: apt-pkg/deb/dpkgpm.cc:365
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Installed %s"
msgstr "Installed %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:368
#, c-format
msgid "Preparing for removal of %s"
msgstr "Preparing for removal of %s"
-#: apt-pkg/deb/dpkgpm.cc:371
+#: apt-pkg/deb/dpkgpm.cc:369
#, c-format
msgid "Removing %s"
msgstr "Removing %s"
-#: apt-pkg/deb/dpkgpm.cc:372
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Removed %s"
msgstr "Removed %s"
-#: apt-pkg/deb/dpkgpm.cc:377
+#: apt-pkg/deb/dpkgpm.cc:375
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Preparing to completely remove %s"
-#: apt-pkg/deb/dpkgpm.cc:378
+#: apt-pkg/deb/dpkgpm.cc:376
#, c-format
msgid "Completely removed %s"
msgstr "Completely removed %s"