Merge branch 'debian/sid' into ubuntu/master

Conflicts:
	debian/changelog

1 files changed, 17 insertions, 19 deletions

diff --git a/po/tl.po b/po/tl.po
index 522742b9a..74ca8ec38 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-20 14:43+0100\n"
+"POT-Creation-Date: 2014-02-23 00:29+0100\n"
 "PO-Revision-Date: 2007-03-29 21:36+0800\n"
 "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -163,7 +163,7 @@ msgstr "  Talaang Bersyon:"
 
 #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
@@ -1708,12 +1708,7 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Pinagsasama ang magagamit na impormasyon"
 
-#: cmdline/apt-extracttemplates.cc:100
-#, c-format
-msgid "%s not a valid DEB package."
-msgstr "%s ay hindi balido na paketeng DEB."
-
-#: cmdline/apt-extracttemplates.cc:234
+#: cmdline/apt-extracttemplates.cc:224
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -1737,12 +1732,12 @@ msgstr ""
 "  -c=? Basahin ang talaksang pagkaayos na ito\n"
 "  -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
+#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Hindi makapagsulat sa %s"
 
-#: cmdline/apt-extracttemplates.cc:308
+#: cmdline/apt-extracttemplates.cc:298
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Hindi makuha ang bersyon ng debconf. Nakaluklok ba ang debconf?"
 
@@ -2122,23 +2117,23 @@ msgstr ""
 "  -c=? Basahin ang talaksang pagkaayos na ito\n"
 "  -o=? Itakda ang isang option ng pagkaayos, hal. -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:122
 msgid "Failed to create pipes"
 msgstr "Bigo sa paglikha ng mga pipe"
 
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:149
 msgid "Failed to exec gzip "
 msgstr "Bigo sa pagtakbo ng gzip "
 
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
+#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
 msgid "Corrupted archive"
 msgstr "Sirang arkibo"
 
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:201
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Bigo ang checksum ng tar, sira ang arkibo"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:306
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Hindi kilalang uri ng TAR header %u, miyembrong %s"
@@ -2261,18 +2256,18 @@ msgstr "Ang talaksang %s/%s ay pumapatong sa isang talaksan sa paketeng %s"
 msgid "Unable to stat %s"
 msgstr "Hindi ma-stat ang %s"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46
-#: apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
+#: apt-inst/deb/debfile.cc:57
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Hindi ito tanggap na arkibong DEB, may kulang na miyembrong '%s'"
 
-#: apt-inst/deb/debfile.cc:119
+#: apt-inst/deb/debfile.cc:124
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Internal error, hindi mahanap ang miyembrong %s"
 
-#: apt-inst/deb/debfile.cc:213
+#: apt-inst/deb/debfile.cc:219
 msgid "Unparsable control file"
 msgstr "Di maintindihang talaksang control"
 
@@ -3504,6 +3499,9 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
+#~ msgid "%s not a valid DEB package."
+#~ msgstr "%s ay hindi balido na paketeng DEB."
+
 #~ msgid ""
 #~ "Using CD-ROM mount point %s\n"
 #~ "Mounting CD-ROM\n"