Merge branch 'debian/sid' into ubuntu/master

Conflicts:
	debian/changelog

1 files changed, 17 insertions, 19 deletions

diff --git a/po/ne.po b/po/ne.po
index b5aa74499..1779c9f4a 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po\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: 2006-06-12 14:35+0545\n"
 "Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
@@ -160,7 +160,7 @@ msgstr "  संस्करण तालिका:"
 
 #: 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"
@@ -1684,12 +1684,7 @@ msgstr ""
 msgid "Merging available information"
 msgstr "उपलब्ध सूचना गाँभिदैछ"
 
-#: cmdline/apt-extracttemplates.cc:100
-#, c-format
-msgid "%s not a valid DEB package."
-msgstr "%s वैध DEB प्याकेज होइन"
-
-#: cmdline/apt-extracttemplates.cc:234
+#: cmdline/apt-extracttemplates.cc:224
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -1713,12 +1708,12 @@ msgstr ""
 "  -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
 "  -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -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 " %s मा लेख्न असक्षम"
 
-#: cmdline/apt-extracttemplates.cc:308
+#: cmdline/apt-extracttemplates.cc:298
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr " debconf संस्करण प्राप्त गर्न सकिएन । के debconf स्थापना भयो ? "
 
@@ -2092,23 +2087,23 @@ msgstr ""
 "  -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
 "  -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:122
 msgid "Failed to create pipes"
 msgstr "पाइपहरू सिर्जना गर्न असफल"
 
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:149
 msgid "Failed to exec gzip "
 msgstr "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 "संग्रह दूषित भयो"
 
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:201
 msgid "Tar checksum failed, archive corrupted"
 msgstr "टार चेकसम असफल भयो, संग्रह दूषित भयो"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:306
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "अज्ञात टार हेडर प्रकार %u, सदस्य %s"
@@ -2231,18 +2226,18 @@ msgstr "फाइल %s/%s ले प्याकेज %s मा एउटा �
 msgid "Unable to stat %s"
 msgstr "%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 "यो वैध DEB संग्रह होइन, '%s' सदस्य हराइरहेछ"
 
-#: apt-inst/deb/debfile.cc:119
+#: apt-inst/deb/debfile.cc:124
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "आन्तरीक त्रुटि, सदस्य तोक्न सक्दैन  %s"
 
-#: apt-inst/deb/debfile.cc:213
+#: apt-inst/deb/debfile.cc:219
 msgid "Unparsable control file"
 msgstr "पद वर्णन गर्न नसकिने नियन्त्रण फाइल"
 
@@ -3451,6 +3446,9 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
+#~ msgid "%s not a valid DEB package."
+#~ msgstr "%s वैध DEB प्याकेज होइन"
+
 #~ msgid ""
 #~ "Using CD-ROM mount point %s\n"
 #~ "Mounting CD-ROM\n"