summaryrefslogtreecommitdiff
path: root/po/en_GB.po
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2006-02-13 10:25:04 +0000
committerMichael Vogt <michael.vogt@ubuntu.com>2006-02-13 10:25:04 +0000
commit5e972bffae68a75aafc9f9b639e82e252fde3b8b (patch)
tree14bea4042f1d0a434b8fa183fa2fc06e51b0a12a /po/en_GB.po
parent79b41ef196ed0ec3cfda58cc5d17c4f6ef6423e0 (diff)
parentfe5d48773170773390b4b8ce731d2851d703a412 (diff)
* merged with mainline
Patches applied: * bubulle@debian.org--2005/apt--main--0--patch-167 Resync with Michael * bubulle@debian.org--2005/apt--main--0--patch-168 Vietnamese translation completed * bubulle@debian.org--2005/apt--main--0--patch-169 Update PO files and POT file...again * bubulle@debian.org--2005/apt--main--0--patch-170 Compelted French translation * bubulle@debian.org--2005/apt--main--0--patch-171 Activate Welsh translation * bubulle@debian.org--2005/apt--main--0--patch-172 Completed to 512 strings * bubulle@debian.org--2005/apt--main--0--patch-173 Russian translation completed * bubulle@debian.org--2005/apt--main--0--patch-174 Swedish translation completed * bubulle@debian.org--2005/apt--main--0--patch-175 Merge from Philippe Batailler French manpages tree/Vietnamese translation update * bubulle@debian.org--2005/apt--main--0--patch-176 Galician translation update * bubulle@debian.org--2005/apt--main--0--patch-177 Slovak translation update * bubulle@debian.org--2005/apt--main--0--patch-178 Polish translation update * bubulle@debian.org--2005/apt--main--0--patch-179 Correct permissions * bubulle@debian.org--2005/apt--main--0--patch-180 Japanese translation update * bubulle@debian.org--2005/apt--main--0--patch-181 Basque translation update * bubulle@debian.org--2005/apt--main--0--patch-182 Catalan translation completed * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-123 * fix typo in apt-cache.8 manpage * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-124 * fixed another typo in doc/apt-secure.8.xml * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-125 * merged the debian-sid changes back * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-126 * fixed the changelog yet again * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-127 * merged with apt--mvo * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-128 * don't explod if a Provides has DepCompareOp * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-129 * fix regression about not working --print-uris in "install" * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-130 * merged with bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-131 * create sources.list.d as well * mvo@debian.org--2005/apt--debian-sid--0--patch-17 * merged with apt--mvo--0 * mvo@debian.org--2005/apt--debian-sid--0--patch-18 * merged with apt--mvo * philippe.batailler@free.fr--2005/apt--main--0--patch-9 manpages
Diffstat (limited to 'po/en_GB.po')
-rw-r--r--po/en_GB.po66
1 files changed, 35 insertions, 31 deletions
diff --git a/po/en_GB.po b/po/en_GB.po
index 1ea3e8171..fc636658e 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-04 18:51+0100\n"
+"POT-Creation-Date: 2006-01-20 14:01+0100\n"
"PO-Revision-Date: 2002-11-10 20:56+0100\n"
"Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
"Language-Team: en_GB <en@li.org>\n"
@@ -512,7 +512,7 @@ msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink limit of %sB hit.\n"
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
msgstr "Failed to stat %s"
@@ -1077,9 +1077,9 @@ msgid "Unable to find a source package for %s"
msgstr "Unable to find a source package for %s"
#: cmdline/apt-get.cc:1959
-#, c-format
-msgid "Skiping already downloaded file '%s'\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Skipping unpack of already unpacked source in %s\n"
#: cmdline/apt-get.cc:1983
#, c-format
@@ -1661,12 +1661,12 @@ msgstr "Disk not found."
msgid "File not found"
msgstr "File not found"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Failed to stat"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Failed to set modification time"
@@ -1794,7 +1794,7 @@ msgstr "Data socket connect timed out"
msgid "Unable to accept connection"
msgstr "Unable to accept connection"
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem hashing file"
@@ -1927,76 +1927,76 @@ msgstr "Couldn't open pipe for %s"
msgid "Read error from %s process"
msgstr "Read error from %s process"
-#: methods/http.cc:381
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Waiting for headers"
-#: methods/http.cc:527
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Got a single header line over %u chars"
-#: methods/http.cc:535
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Bad header line"
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "The HTTP server sent an invalid reply header"
-#: methods/http.cc:590
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "The HTTP server sent an invalid Content-Length header"
-#: methods/http.cc:605
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "The HTTP server sent an invalid Content-Range header"
-#: methods/http.cc:607
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "This HTTP server has broken range support"
-#: methods/http.cc:631
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Unknown date format"
-#: methods/http.cc:778
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Select failed"
-#: methods/http.cc:783
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Connection timed out"
-#: methods/http.cc:806
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Error writing to output file"
-#: methods/http.cc:837
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Error writing to file"
-#: methods/http.cc:865
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Error writing to the file"
-#: methods/http.cc:879
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Error reading from server. Remote end closed connection"
-#: methods/http.cc:881
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Error reading from server"
-#: methods/http.cc:1112
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Bad header data"
-#: methods/http.cc:1129
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Connection failed"
-#: methods/http.cc:1220
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Internal error"
@@ -2536,11 +2536,15 @@ msgstr "IO Error saving source cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "rename failed, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
msgstr "MD5Sum mismatch"
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2549,7 +2553,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:778
+#: apt-pkg/acquire-item.cc:817
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2558,14 +2562,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:814
+#: apt-pkg/acquire-item.cc:853
#, 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:901
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
msgstr "Size mismatch"