merge debian/sid into debian/experimental

1 files changed, 1041 insertions, 1105 deletions

diff --git a/po/ne.po b/po/ne.po
index e21c70f4d..09b9858f7 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-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -22,148 +22,152 @@ msgstr ""
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "प्याकेज %s संस्करण %s संग एउटा नभेटिएको dep छ:\n"
 
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "कूल प्याकेज नामहरू :"
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:279
 #, fuzzy
 msgid "Total package structures: "
 msgstr "कूल प्याकेज नामहरू :"
 
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  सामान्य प्याकेजहरू:"
 
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "शुद्ध अवास्तविक प्याकेजहरू:"
 
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  एकल अवास्तविक प्याकेजहरू:"
 
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  मिश्रित अवास्तविक प्याकेजहरू:"
 
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  हराइरहेको:"
 
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "कूल भिन्न संस्करणहरू:"
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:327
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "कूल भिन्न संस्करणहरू:"
 
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "कूल निर्भरताहरू:"
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "जम्मा ver/file सम्बन्धहरू: "
 
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:334
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "जम्मा ver/file सम्बन्धहरू: "
 
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "कूल उपलब्ध मानचित्रणहरू:"
 
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "कूल विश्वव्यापी स्ट्रिङ्गहरू:"
 
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:362
+msgid "Total dependency version space: "
+msgstr "कूल निर्भरता संस्करण खाली ठाऊँ:"
+
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "कूल शिथिल खाली ठाऊँ:"
 
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "को लागि कूल खाली ठाऊँ लेखांकन:"
 
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
 #: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "प्याकेज फाइल %s sync भन्दा बाहिर छ ।"
 
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1442
+#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 cmdline/apt-mark.cc:59
 #: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
 #: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "कुनै प्याकेजहरू फेला परेन"
 
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "तपाईँले एउटा वास्तविक बान्की दिनुपर्छ"
 
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "प्याकेज %s तोक्न असक्षम भयो"
 
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1546
 msgid "Package files:"
 msgstr "प्याकेज फाइलहरू:"
 
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "क्यास sync  भन्दा बाहिर छ, प्याकेज फाइल x-ref गर्न सक्दैन"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1567
 msgid "Pinned packages:"
 msgstr "पिन गरिएका प्याकेजहरू:"
 
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
 msgid "(not found)"
 msgstr "(फेला परेन)"
 
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1587
 msgid "  Installed: "
 msgstr "  स्थापना भयो:"
 
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1588
 msgid "  Candidate: "
 msgstr "  उमेद्वार:"
 
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
 msgid "(none)"
 msgstr "(कुनै पनि होइन)"
 
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1621
 msgid "  Package pin: "
 msgstr "प्याकेज पिन:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1630
 msgid "  Version table:"
 msgstr "  संस्करण तालिका:"
 
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
+#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s को लागि %s %s, %s %s मा कम्पाएल गरिएको छ\n"
 
-#: cmdline/apt-cache.cc:1829
+#: cmdline/apt-cache.cc:1750
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -295,83 +299,78 @@ msgstr ""
 "  -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
 "  -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:367
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन "
 
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:423
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:863
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
+#: apt-private/private-install.cc:865
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "तर %s स्थापना हुनुपर्यो"
 
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "तर %s स्थापना हुनुपर्यो"
 
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो "
 
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "डाउनलोड डाइरेक्ट्री ताल्चा मार्न असक्षम"
 
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:726
 msgid "Must specify at least one package to fetch source for"
 msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ"
 
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s को लागि स्रोत प्याकेज फेला पार्न असफल भयो"
 
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:786
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:791
 #, c-format
 msgid ""
 "Please use:\n"
@@ -379,113 +378,114 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "पहिल्यै डाउनलोड भएका फाइलहरु फड्काइदैछ '%s'\n"
 
+#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
+#, c-format
+msgid "Couldn't determine free space in %s"
+msgstr " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन"
+
+#: cmdline/apt-get.cc:886
+#, c-format
+msgid "You don't have enough free space in %s"
+msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन"
+
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:895
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "स्रोत संग्रहहरुको %sB/%sB प्राप्त गर्न आवश्यक छ ।\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:900
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "स्रोत संग्रहहरुको %sB प्राप्त गर्न आवश्यक छ ।\n"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:906
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "स्रोत फड्काउनुहोस् %s\n"
 
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:924
 msgid "Failed to fetch some archives."
 msgstr "केही संग्रह फड्काउन असफल भयो ।"
 
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr "डाउनलोड समाप्त भयो र डाउनलोडमा मोड मात्रै छ"
 
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr " %s मा पहिल्यै अनप्याक गरिएका स्रोतको अनप्याक फड्काइदैछ\n"
 
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:967
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "अनप्याक आदेश '%s' असफल भयो ।\n"
 
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:968
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n"
 
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:996
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "निर्माण आदेश '%s' असफल भयो ।\n"
 
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:1015
 msgid "Child process failed"
 msgstr "शाखा प्रक्रिया असफल भयो"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1034
 msgid "Must specify at least one package to check builddeps for"
 msgstr "को लागि builddeps जाँच्न कम्तिमा एउटा प्याकेज निर्दष्ट गर्नुपर्छ"
 
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1059
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1060
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1070
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल"
-
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s को लागि निर्माण-निर्भरता सूचना प्राप्त गर्न असक्षम भयो"
 
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1106
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s कुनै निर्माणमा आधारित हुदैन ।\n"
 
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1276
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन"
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1294
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन"
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1317
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "%s को लागि %s निर्भरता सन्तुष्ट पार्न असफल भयो: स्थापित प्याकेज %s अति नयाँ छ"
 
-#: cmdline/apt-get.cc:1368
+#: cmdline/apt-get.cc:1356
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -494,37 +494,37 @@ msgstr ""
 "%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले संस्करण "
 "आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन "
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1362
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन"
 
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1385
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s को लागि %s निर्भरता सन्तुष्ट गर्न असफल: %s"
 
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1400
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । "
 
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1405
 msgid "Failed to process build dependencies"
 msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल"
 
-#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "%s (%s) मा जडान गरिदैछ"
 
-#: cmdline/apt-get.cc:1615
+#: cmdline/apt-get.cc:1596
 msgid "Supported modules:"
 msgstr "समर्थित मोड्युलहरू:"
 
-#: cmdline/apt-get.cc:1656
+#: cmdline/apt-get.cc:1637
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -618,11 +618,11 @@ msgstr ""
 msgid "Must specify at least one pair url/filename"
 msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ"
 
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -661,8 +661,9 @@ msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n
 msgid "%s was already not hold.\n"
 msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
-#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन"
@@ -760,12 +761,12 @@ msgstr "डिस्क फेला परेन ।"
 msgid "File not found"
 msgstr "फाइल फेला परेन "
 
-#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "स्थिर गर्न असफल भयो"
 
-#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
+#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "परिमार्जन समय सेट असफल भयो"
 
@@ -774,34 +775,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "अवैध URl, स्थानिय URIS // संग सुरू हुन सक्दैन"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:178
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "लगइन भइरहेछ"
 
-#: methods/ftp.cc:184
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "समान नाम निर्धारण गर्न असक्षम भयो"
 
-#: methods/ftp.cc:189
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "स्थानिय नाम निर्धारण गर्न असक्षम भयो"
 
-#: methods/ftp.cc:220 methods/ftp.cc:248
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "सर्भरले जडान अस्वीकार गर्यो र भन्यो: %s"
 
-#: methods/ftp.cc:226
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "प्रयोगकर्ता असफल भयो, सर्भरले भन्यो: %s"
 
-#: methods/ftp.cc:233
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "पास असफल भयो, सर्भरले भन्यो: %s"
 
-#: methods/ftp.cc:253
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -809,123 +810,123 @@ msgstr ""
 "प्रोक्सी सर्भर निर्दिष्ट गरियो तर कुनै स्क्रिफ्ट लगइन भएन, Acquire::ftp::ProxyLogin  "
 "खाली छ ।"
 
-#: methods/ftp.cc:281
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "लगइन स्क्रिफ्ट आदेश '%s' असफल भयो, सर्भरले भन्यो: %s"
 
-#: methods/ftp.cc:307
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "टाइप असफल भयो: %s"
 
-#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "जडान समय सकियो"
 
-#: methods/ftp.cc:351
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "सर्भरले जडान बन्द गर्यो"
 
-#: methods/ftp.cc:354 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1515
-#: apt-pkg/contrib/fileutl.cc:1524 apt-pkg/contrib/fileutl.cc:1529
-#: apt-pkg/contrib/fileutl.cc:1531
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
+#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
+#: apt-pkg/contrib/fileutl.cc:1492
 msgid "Read error"
 msgstr "त्रुटि पढ्नुहोस्"
 
-#: methods/ftp.cc:361 methods/rsh.cc:209
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "एउटा प्रतिक्रियाले बफर अधिप्रवाह गर्यो"
 
-#: methods/ftp.cc:378 methods/ftp.cc:390
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "प्रोटोकल दूषित"
 
-#: methods/ftp.cc:463 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:911
-#: apt-pkg/contrib/fileutl.cc:1637 apt-pkg/contrib/fileutl.cc:1646
-#: apt-pkg/contrib/fileutl.cc:1651 apt-pkg/contrib/fileutl.cc:1653
-#: apt-pkg/contrib/fileutl.cc:1678
+#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
+#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
+#: apt-pkg/contrib/fileutl.cc:1639
 msgid "Write error"
 msgstr "त्रुटि लेख्नुहोस्"
 
-#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "एउटा सकेट सिर्जना गर्न सकेन"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr "डेटा सकेट जडान गर्न सकिएन, जडान समय सकियो"
 
-#: methods/ftp.cc:717 methods/connect.cc:116
+#: methods/ftp.cc:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "असफल भयो"
 
-#: methods/ftp.cc:719
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "निस्क्रिय सकेट जडान गर्न सकिएन"
 
-#: methods/ftp.cc:736
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo सुन्ने सकेट प्राप्त गर्न असक्षम भयो"
 
-#: methods/ftp.cc:750
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "सकेट बाँध्न सकिएन"
 
-#: methods/ftp.cc:754
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "सकेटमा सुन्न सकिएन"
 
-#: methods/ftp.cc:761
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "सकेट नाम निर्धारण गर्न सकिएन"
 
-#: methods/ftp.cc:793
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "पोर्ट आदेश पठाउन असक्षम भयो"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "अज्ञात ठेगाना परिवार %u (AF_*)"
 
-#: methods/ftp.cc:812
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT असफल भयो, सर्भरले भन्यो: %s"
 
-#: methods/ftp.cc:832
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "डेटा सकेटको जडान समय सकियो"
 
-#: methods/ftp.cc:839
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "जडान स्वीकार गर्न असक्षम भयो"
 
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "समस्या द्रुतान्वेषण फाइल"
 
-#: methods/ftp.cc:892
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "फाइल तान्न असक्षम भयो, सर्भरले भन्यो '%s'"
 
-#: methods/ftp.cc:907 methods/rsh.cc:338
+#: methods/ftp.cc:905 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "डेटा सकेट समय सकियो"
 
-#: methods/ftp.cc:944
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "डेटा स्थान्तरण असफल भयो, सर्भरले भन्यो '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1027
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "क्वेरी"
 
-#: methods/ftp.cc:1141
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "आह्वान गर्न असक्षम भयो"
 
@@ -991,70 +992,71 @@ msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट
 msgid "Unable to connect to %s:%s:"
 msgstr "%s %s मा जडान गर्न असफल भयो:"
 
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:168
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "आन्तरिक त्रुटि: असल हस्ताक्षर, तर कुञ्जी औठाछाप निर्धारण गर्न सकिएन?!"
 
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "कम्तिमा एउटा अवैध हस्ताक्षर विरोध भयो ।"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
+#, fuzzy
 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
-msgstr "हस्ताक्षर रूजू गर्न 'apt-key' कार्यन्वयन गर्न सकिएन (के gnupg स्थापना भयो?)"
+msgstr "हस्ताक्षर रूजू गर्न '%s' कार्यन्वयन गर्न सकिएन (के gnupg स्थापना भयो?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:184
 msgid "Unknown error executing apt-key"
 msgstr "apt-key कार्यन्वयन गर्दा अज्ञात त्रुटि"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "निम्न हस्ताक्षरहरू अवैध छन्:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "निम्न हस्ताक्षरहरू रूजू हुन सक्दैन किन भने सार्वजनिक कुञ्जी उपलब्ध छैन:\n"
 
-#: methods/gzip.cc:79
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:515
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "फाइलमा त्रुटि लेखिदैछ"
 
-#: methods/http.cc:529
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr "सर्भरबाट त्रुटि पढिदैछ । दूर गन्तब्य बन्द जडान"
 
-#: methods/http.cc:531
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "सर्भरबाट त्रुटि पढिदैछ"
 
-#: methods/http.cc:567
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "फाइलमा त्रुटि लेखिदैछ"
 
-#: methods/http.cc:627
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "असफल चयन गर्नुहोस्"
 
-#: methods/http.cc:632
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "जडान समय सकियो"
 
-#: methods/http.cc:655
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "निर्गात फाइलमा त्रुटि लेखिदैछ"
 
@@ -1062,46 +1064,39 @@ msgstr "निर्गात फाइलमा त्रुटि लेखि
 msgid "Waiting for headers"
 msgstr "हेडरहरुको लागि पर्खिदैछ"
 
-#: methods/server.cc:110
+#: methods/server.cc:111
 msgid "Bad header line"
 msgstr "खराब हेडर लाइन"
 
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP सर्भरले अवैध जवाफ हेडर पठायो"
 
-#: methods/server.cc:172
+#: methods/server.cc:173
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP सर्भरले अवैध सामग्री-लम्बाई हेडर पठायो"
 
-#: methods/server.cc:195
+#: methods/server.cc:193
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP सर्भरले अवैध सामग्री-दायरा हेडर पठायो"
 
-#: methods/server.cc:197
+#: methods/server.cc:195
 msgid "This HTTP server has broken range support"
 msgstr "HTTP सर्भर संग भाँचिएको दायरा समर्थन छ"
 
-#: methods/server.cc:221
+#: methods/server.cc:219
 msgid "Unknown date format"
 msgstr "अज्ञात मिति ढाँचा"
 
-#: methods/server.cc:497
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "खराब हेडर डेटा"
 
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "जडान असफल भयो"
 
-#: methods/server.cc:580
-#, c-format
-msgid ""
-"Automatically disabled %s due to incorrect response from server/proxy. (man "
-"5 apt.conf)"
-msgstr ""
-
-#: methods/server.cc:703
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "आन्तरिक त्रुटि"
 
@@ -1109,65 +1104,70 @@ msgstr "आन्तरिक त्रुटि"
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "आन्तरिक त्रुटि, स्थापना प्याकेजहरुलाई भाँचिएको प्याकेज भनिन्थ्यो!"
 
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
 msgid "Packages need to be removed but remove is disabled."
 msgstr "प्याकेजहरू हट्न चाहदैछन् तर हटाई अक्षम भइरहेछ ।"
 
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
 msgid "Internal error, Ordering didn't finish"
 msgstr "आन्तरिक त्रुटि, आदेश समाप्त भएको छैन"
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
 msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr "कस्तो नमिलेको.. साइजहरू मेल खाएन, apt@packages.debian.org इमेल गर्नुहोस्"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "संग्रहहरुको %sB/%sB प्राप्त गर्न आवश्यक ।\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "संग्रहहरुको %sB प्राप्त गर्न आवश्यक ।\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "अनप्याक गरिसके पछि थप डिस्क खाली ठाउँको %sB प्रयोग हुनेछ ।\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "%sB अनप्याक गरिसके पछि डिस्क खाली ठाउँ खाली हुनेछ ।\n"
 
-#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+#: apt-private/private-install.cc:200
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन ।"
+
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
 msgid "There are problems and -y was used without --force-yes"
 msgstr "त्यहाँ समस्याहरू छन् र हुन्छलाई जोड नगरिकन -y को प्रयोग भयो"
 
-#: apt-private/private-install.cc:191 apt-private/private-install.cc:213
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "त्रिभियल मात्र निर्दिष्ट गरिएको छ तर यो त्रिभियल सञ्चालन होइन ।"
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:195
+#: apt-private/private-install.cc:220
 msgid "Yes, do as I say!"
 msgstr "हो,मैले भने जस्तै गर्नुहोस्!"
 
-#: apt-private/private-install.cc:197
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1178,20 +1178,20 @@ msgstr ""
 "निरन्तरता दिन '%s' वाक्यांशमा टाइप गर्नुहोस् \n"
 " ?] "
 
-#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "परित्याग गर्नुहोस् ।"
 
-#: apt-private/private-install.cc:218
+#: apt-private/private-install.cc:243
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "के तपाईँ निरन्तरता दिन चाहनुहुन्छ [Y/n]? "
 
-#: apt-private/private-install.cc:288
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr "केही फाइलहरू डाउनलोड गर्न असफल भयो"
 
-#: apt-private/private-install.cc:295
+#: apt-private/private-install.cc:320
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1199,19 +1199,19 @@ msgstr ""
 "केही संग्रहहरू तान्न असक्षम भयो,apt-get अद्यावधिक चलिरहेछ वा हराइरहेको --fix-संगै प्रयास "
 "गर्नुहुन्छ ?"
 
-#: apt-private/private-install.cc:299
+#: apt-private/private-install.cc:324
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "हराइरहेको --fix-र स्वाप भइरहेको मेडिया हाल समर्थित भइरहेको छैन"
 
-#: apt-private/private-install.cc:304
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr "हराइरहेको प्याकेजहरू सुधार्न असक्षम भयो ।"
 
-#: apt-private/private-install.cc:305
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "स्थापना परित्याग गरिदैछ ।"
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1221,15 +1221,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:345
+#: apt-private/private-install.cc:370
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:366
+#: apt-private/private-install.cc:391
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: apt-private/private-install.cc:474
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1245,16 +1245,16 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
 msgid "The following information may help to resolve the situation:"
 msgstr "निम्न सूचनाले अवस्थालाई हल गर्न मद्दत गर्नेछ: "
 
-#: apt-private/private-install.cc:481
+#: apt-private/private-install.cc:506
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो "
 
-#: apt-private/private-install.cc:488
+#: apt-private/private-install.cc:513
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1264,7 +1264,7 @@ msgid_plural ""
 msgstr[0] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
 msgstr[1] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
 
-#: apt-private/private-install.cc:492
+#: apt-private/private-install.cc:517
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1272,17 +1272,17 @@ msgid_plural ""
 msgstr[0] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
 msgstr[1] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
 
-#: apt-private/private-install.cc:494
+#: apt-private/private-install.cc:519
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:587
+#: apt-private/private-install.cc:612
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "तपाईँ यसलाई सुधार गर्न 'apt-get -f install' चलाउन चाहनुहुन्छ:"
 
-#: apt-private/private-install.cc:589
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1290,7 +1290,7 @@ msgstr ""
 "नभेटिएका निर्भरताहरू । प्याकेजहरू बिना 'apt-get -f install' प्रयास गर्नुहोस् ( वा "
 "समाधान निर्दिष्ट गर्नुहोस्) ।"
 
-#: apt-private/private-install.cc:612
+#: apt-private/private-install.cc:638
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1303,68 +1303,68 @@ msgstr ""
 " वितरण अहिले सम्म सिर्जना\n"
 " भएको छैन वा आवगमन विनानै सर्यो ।"
 
-#: apt-private/private-install.cc:633
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "भाँचिएका प्याकेजहरू"
 
-#: apt-private/private-install.cc:710
+#: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
 msgstr "निम्न अतिरिक्त प्याकेजहरू स्थापना हुनेछन्:"
 
-#: apt-private/private-install.cc:800
+#: apt-private/private-install.cc:802
 msgid "Suggested packages:"
 msgstr "सुझाव दिएका प्याकेजहरू:"
 
-#: apt-private/private-install.cc:801
+#: apt-private/private-install.cc:803
 msgid "Recommended packages:"
 msgstr "सिफारिस गरिएका प्याकेजहरू:"
 
-#: apt-private/private-install.cc:823
+#: apt-private/private-install.cc:825
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "%s फड्किदैछ, यो पहिल्यै स्थापना भयो र स्तरवृद्धि सेट भएको छैन ।\n"
 
-#: apt-private/private-install.cc:827
+#: apt-private/private-install.cc:829
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "%s फड्किदैछ, यो पहिल्यै स्थापना भयो र स्तरवृद्धि सेट भएको छैन ।\n"
 
-#: apt-private/private-install.cc:839
+#: apt-private/private-install.cc:841
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr " %s को पुन: स्थापना सम्भव छैन, यो डाउनलोड हुन सक्दैन ।\n"
 
-#: apt-private/private-install.cc:844
+#: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n"
 
-#: apt-private/private-install.cc:892
+#: apt-private/private-install.cc:894
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n"
 
-#: apt-private/private-install.cc:897
+#: apt-private/private-install.cc:899
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:939
+#: apt-private/private-install.cc:941
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n"
 
-#: apt-private/private-install.cc:945
+#: apt-private/private-install.cc:947
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n"
 
-#: apt-private/private-list.cc:121
+#: apt-private/private-list.cc:129
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:151
+#: apt-private/private-list.cc:159
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1372,31 +1372,31 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-cachefile.cc:95
+#: apt-private/private-cachefile.cc:93
 msgid "Correcting dependencies..."
 msgstr "निर्भरताहरू सुधार गरिदैछ..."
 
-#: apt-private/private-cachefile.cc:98
+#: apt-private/private-cachefile.cc:96
 msgid " failed."
 msgstr "असफल भयो ।"
 
-#: apt-private/private-cachefile.cc:101
+#: apt-private/private-cachefile.cc:99
 msgid "Unable to correct dependencies"
 msgstr "निर्भरताहरू सुधार गर्न असक्षम भयो"
 
-#: apt-private/private-cachefile.cc:104
+#: apt-private/private-cachefile.cc:102
 msgid "Unable to minimize the upgrade set"
 msgstr "स्तर वृद्धि सेटलाई न्यूनतम गर्न असक्षम भयो"
 
-#: apt-private/private-cachefile.cc:106
+#: apt-private/private-cachefile.cc:104
 msgid " Done"
 msgstr "काम भयो"
 
-#: apt-private/private-cachefile.cc:110
+#: apt-private/private-cachefile.cc:108
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "यी सुधार गर्न तपाईँले 'apt-get -f install' चलाउन पर्छ ।"
 
-#: apt-private/private-cachefile.cc:113
+#: apt-private/private-cachefile.cc:111
 msgid "Unmet dependencies. Try using -f."
 msgstr "नभेटिएका निर्भरताहरू । -f प्रयोग गरेर प्रयास गर्नुहोस् ।"
 
@@ -1560,7 +1560,7 @@ msgstr ""
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s"
@@ -1569,7 +1569,7 @@ msgstr "संकलन त्रुटि रिजेक्स गर्नु
 msgid "The update command takes no arguments"
 msgstr "अद्यावधिक आदेशले कुनै तर्कहरू लिदैन"
 
-#: apt-private/private-update.cc:95
+#: apt-private/private-update.cc:97
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1577,7 +1577,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-update.cc:99
+#: apt-private/private-update.cc:101
 msgid "All packages are up to date."
 msgstr ""
 
@@ -1601,45 +1601,28 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:36
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "चेतावनी: निम्न प्याकलेजहरू प्रणाणीकरण हुन सक्दैन! "
 
-#: apt-private/private-download.cc:98
+#: apt-private/private-download.cc:40
 msgid "Authentication warning overridden.\n"
 msgstr "प्रमाणिकरण चेतावनी अधिलेखन भयो ।\n"
 
-#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
 msgid "Some packages could not be authenticated"
 msgstr "केही प्याकेजहरू प्रमाणीकरण हुन सक्दैन"
 
-#: apt-private/private-download.cc:108
+#: apt-private/private-download.cc:50
 #, fuzzy
 msgid "Install these packages without verification?"
 msgstr "यी प्याकेजहरू रूजू बिना स्थापना गर्नुहुन्छ [y/N]? "
 
-#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s  %s तान्न असफल भयो\n"
 
-#: apt-private/private-download.cc:171 apt-private/private-download.cc:174
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन"
-
-#: apt-private/private-download.cc:188
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन ।"
-
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1654,33 +1637,41 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade"
+msgstr "स्तर वृद्धि गणना गरिदैछ"
+
+#: apt-private/private-upgrade.cc:28
+msgid "Done"
+msgstr "काम भयो"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "हान्नुहोस्"
 
-#: apt-private/acqprogress.cc:88
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "प्राप्त गर्नुहोस्:"
 
-#: apt-private/acqprogress.cc:119
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:126
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Err "
 
-#: apt-private/acqprogress.cc:150
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "%s (%sB/s) मा %sB मा तानियो\n"
 
-#: apt-private/acqprogress.cc:240
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [काम गरिरहेको]"
 
-#: apt-private/acqprogress.cc:301
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1693,18 +1684,18 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s पढ्न असफल भयो"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
+#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1780,454 +1771,205 @@ msgstr ""
 msgid "Merging available information"
 msgstr "उपलब्ध सूचना गाँभिदैछ"
 
-#: cmdline/apt-extracttemplates.cc:227
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"उपयोग: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-" apt-extracttemplates डवियन प्याकेजहरुबाट कनफिगरेसन र टेम्प्लेट सूचना झिक्ने उपकरण हो\n"
-"\n"
-"\n"
-"विकल्पहरू:\n"
-"  -h   यो मद्दत पाठ\n"
-"  -t   टेम्प्लेट डाइरेक्ट्री सेट गर्नुहोस्\n"
-"  -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
-"  -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "%s स्थिर गर्न असक्षम भयो"
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "अहिलेसम्म लिङ्क गरिएको नोडमा बोलाइएको ड्रपनोड"
 
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
-#: apt-pkg/contrib/fileutl.cc:2097
-#, c-format
-msgid "Unable to write to %s"
-msgstr " %s मा लेख्न असक्षम"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "ह्यास तत्व तोक्न असफल भयो"
 
-#: cmdline/apt-extracttemplates.cc:303
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr " debconf संस्करण प्राप्त गर्न सकिएन । के debconf स्थापना भयो ? "
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "मोड बाँड्न असफल भयो"
 
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "प्याकेज विस्तार सूचि अति लामो छ"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "थपमोडमा आन्तरिक त्रुटि"
 
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "Error processing directory %s"
-msgstr "डाइरेक्ट्री %s प्रक्रिया गर्दा त्रुटि"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "स्रोत विस्तार सूचि अति लामो छ"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "सामाग्री फाइलहरुमा हेडर लेख्दा त्रुटि"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "मोड अधिलेखन गर्ने प्यास गरिदै, %s -> %s र %s/%s"
 
-#: ftparchive/apt-ftparchive.cc:431
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Error processing contents %s"
-msgstr "सामग्री %sप्रक्रिया गर्दा त्रुटि"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"उपयोग: apt-ftparchive [विकल्पहरू] आदेश\n"
-"आदेशहरू: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive ले डेवियन संग्रहहरुको लागि अनुक्रमणिका फाइलहरू सिर्जना गर्दछ । यसले "
-"समर्थन गर्दछ\n"
-"dpkg-scanpackages र dpkg-scansources को लागि कार्यात्मक प्रतिस्थापनमा पुरै "
-"स्वचालितबाट सिर्जनाको धेरै शैलीहरू\n"
-" \n"
-"\n"
-"apt-ftparchive ले debs को ट्रीबाट प्याकेज फाइलहरू सिर्जना गर्दछ । प्याकेज\n"
-"फाइलहरुले प्रत्येक प्याकेजबाट सबै नियन्त्रण फाँटहरुको सामग्रीहरू साथ साथै MD5 hash र "
-"filesize समावेश गर्दछ ।\n"
-"एउटा अधिलेखन फाइल\n"
-"प्राथमिकता र सेक्सनको मान जोड गर्न समर्थित हुन्छ ।\n"
-"\n"
-"त्यस्तै गरी apt-ftparchive ले .dscs को ट्रीबाट स्रोत फाइलहरू सिर्जना गर्दछ ।\n"
-"स्रोत--अधिलेखन--विकल्प src अधीलेखन फाइल निर्दिष्ट गर्न प्रयोग गर्न सकिन्छ\n"
-"\n"
-"'packages' and 'sources' आदेश ट्रीको मूलमा चलाउन सकिन्छ ।\n"
-" विनारी मार्ग फेरी हुने खोजीको विन्दुमा आधारित हुन्छ र \n"
-"अधिलेखन फाइलले अधिलेखन झण्डाहरू समाविष्ट गर्दछ । यदि उपस्थित छ भने बाटो उपसर्ग\n"
-"फाइलनाम फाँटहरुमा थपिन्छ । उदाहरणको लागि \n"
-"डेवियन संग्रहबाट उपयोग:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"विकल्पहरू:\n"
-"  -h    यो मद्दत पाठ\n"
-"  --md5 नियन्त्रण MD5 सिर्जना\n"
-"  -s=?  स्रोत अधिलेखन फाइल\n"
-"  -q    बन्द गर्नुहोस्\n"
-"  -d=?  वैकल्पिक क्यासिङ डेटाबेस चयन गर्नुहोस्\n"
-"  --no-delink delinking डिबग मोड सक्षम गर्नुहोस्\n"
-"  --सामग्रीहरू  सामग्री फाइल सिर्जना नियन्त्रण गर्नुहोस्\n"
-"  -c=?  यो कनफिगरेसन फाइल पढ्नुहोस्\n"
-"  -o=?  एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "कुनै चयनहरू मेल खाएन"
+msgid "Double add of diversion %s -> %s"
+msgstr "मोडको डबल थप %s -> %s"
 
-#: ftparchive/apt-ftparchive.cc:907
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "केही फाइलहरू प्याकेज फाइल समूह `%s' मा हराइरहेको छ"
+msgid "Duplicate conf file %s/%s"
+msgstr "नक्कली कनफिगगरेसन फाइल %s/%s"
 
-#: ftparchive/cachedb.cc:67
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB दूषित थियो, फाइल %s.पुरानो मा पुन:नामकरण गर्नुहोस्"
+msgid "The path %s is too long"
+msgstr "बाटो %s अति लामो छ "
 
-#: ftparchive/cachedb.cc:85
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB पुरानो छ, %s स्तरवृद्धि गर्न प्रयास गरिदैछ"
-
-#: ftparchive/cachedb.cc:96
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
+msgid "Unpacking %s more than once"
+msgstr "एक भन्दा बढी %s अनप्याक गरिदैछ"
 
-#: ftparchive/cachedb.cc:101
+#: apt-inst/extract.cc:142
 #, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "DB फाइल %s असक्षम भयो: %s"
+msgid "The directory %s is diverted"
+msgstr "डाइरेक्ट्री %s फेरियो "
 
-#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
-#: apt-inst/extract.cc:216
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "Failed to stat %s"
-msgstr " %s स्थिर गर्न असफल"
-
-#: ftparchive/cachedb.cc:326
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "लिङ्क पढ्न असफल %s"
-
-#: ftparchive/cachedb.cc:359
-msgid "Archive has no control record"
-msgstr "संग्रह संग नियन्त्रण रेकर्ड छैन"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "प्याकेज लक्षित मोडमा लेख्ने प्यास गर्दैछ %s/%s"
 
-#: ftparchive/cachedb.cc:526
-msgid "Unable to get a cursor"
-msgstr "कर्सर प्राप्त गर्न असक्षम भयो"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "घुम्ती बाटो अति लामो छ"
 
-#: ftparchive/writer.cc:104
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:182
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: डाइरेक्ट्री %s पढ्न असक्षम\n"
+msgid "Failed to stat %s"
+msgstr " %s स्थिर गर्न असफल"
 
-#: ftparchive/writer.cc:109
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: %s स्थिर गर्न असक्षम\n"
-
-#: ftparchive/writer.cc:165
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:167
-msgid "W: "
-msgstr "W: "
-
-#: ftparchive/writer.cc:174
-msgid "E: Errors apply to file "
-msgstr "E: फाइलमा त्रुटिहरू लागू गर्नुहोस्"
+msgid "Failed to rename %s to %s"
+msgstr " %s मा  %s  पुन:नामकरण असफल भयो"
 
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "Failed to resolve %s"
-msgstr "%s हल गर्न असफल भयो"
-
-#: ftparchive/writer.cc:205
-msgid "Tree walking failed"
-msgstr "ट्री हिडाईँ असफल भयो"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "डाइरेक्ट्री %s डाइरेक्ट्री विहिन द्वारा बदलिदैछ"
 
-#: ftparchive/writer.cc:232
-#, c-format
-msgid "Failed to open %s"
-msgstr "%s खोल्न असफल"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "यसको ह्यास बाल्टीमा नोड स्थित गर्न असफल भयो"
 
-#: ftparchive/writer.cc:291
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "बाटो अति लामो छ"
 
-#: ftparchive/writer.cc:299
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "लिङ्क पढ्न असफल %s"
+msgid "Overwrite package match with no version for %s"
+msgstr " %s को लागि संस्करन बिना अधिलेखन प्याकेज मेल खायो"
 
-#: ftparchive/writer.cc:303
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "अनलिङ्क गर्न असफल %s"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "फाइल %s/%s ले प्याकेज %s मा एउटा अधिलेखन गर्दछ"
 
-#: ftparchive/writer.cc:311
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** %s मा %s लिङ्क असफल भयो"
+msgid "Unable to stat %s"
+msgstr "%s स्थिर गर्न असक्षम भयो"
 
-#: ftparchive/writer.cc:321
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr "यस %sB हिटको डि लिङ्क सिमा।\n"
-
-#: ftparchive/writer.cc:427
-msgid "Archive had no package field"
-msgstr "संग्रह संग कुनै प्याकेज फाँट छैन"
+msgid "Failed to write file %s"
+msgstr "फाइल %s लेख्न असफल भयो"
 
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: apt-inst/dirstream.cc:105
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "   %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
+msgid "Failed to close file %s"
+msgstr "%s फाइल बन्द गर्न असफल भयो"
 
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s संभारकर्ता %s हो %s होइन\n"
-
-#: ftparchive/writer.cc:720
-#, fuzzy, c-format
-msgid "  %s has no source override entry\n"
-msgstr "   %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
-
-#: ftparchive/writer.cc:724
-#, fuzzy, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "   %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - स्मृति बाँडफाँड गर्न असफल भयो"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "यो वैध DEB संग्रह होइन, '%s' सदस्य हराइरहेछ"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Unable to open %s"
-msgstr "%s खोल्न असफल"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #१"
+msgid "Internal error, could not locate member %s"
+msgstr "आन्तरीक त्रुटि, सदस्य तोक्न सक्दैन  %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "अधिलेखन फाइल पढ्न असफल %s"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
+msgstr "पद वर्णन गर्न नसकिने नियन्त्रण फाइल"
 
-#: ftparchive/override.cc:166
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #१"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "अवैध संग्रह हस्ताक्षर"
 
-#: ftparchive/override.cc:178
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #२"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "संग्रह सदस्य हेडर पढ्दा त्रुटि "
 
-#: ftparchive/override.cc:191
+#: apt-inst/contrib/arfile.cc:96
 #, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #३"
-
-#: ftparchive/multicompress.cc:73
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "अज्ञात सङ्कुचन अल्गोरिद्म '%s'"
-
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "सङ्कुचन गरिएको निर्गात %s लाई सङ्कुचन सेटको आवश्यक्ता पर्दछ"
+msgid "Invalid archive member header %s"
+msgstr "अवैध संग्रह सदस्य हेडर"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "FILE* सिर्जना गर्न असफल"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "अवैध संग्रह सदस्य हेडर"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "काँटा गर्न असफल"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "संग्रह अति छोटो छ"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "सङ्कुचन शाखा"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "संग्रह हेडरहरू पढ्न असफल"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "आन्तरीक त्रुटि, %s सिर्जना गर्न असफल"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "पाइपहरू सिर्जना गर्न असफल"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "सहायक प्रक्रिया/फाइलमा IO असफल भयो"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "gzip कार्यन्वयन गर्न असफल"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "MD5 गणना गर्दा पढ्न असफल भयो"
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "संग्रह दूषित भयो"
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "समस्या अनलिङ्क भइरहेछ %s"
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "टार चेकसम असफल भयो, संग्रह दूषित भयो"
 
-#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr " %s मा  %s  पुन:नामकरण असफल भयो"
-
-#: cmdline/apt-internal-solver.cc:49
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"उपयोग: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-" apt-extracttemplates डवियन प्याकेजहरुबाट कनफिगरेसन र टेम्प्लेट सूचना झिक्ने उपकरण हो\n"
-"\n"
-"\n"
-"विकल्पहरू:\n"
-"  -h   यो मद्दत पाठ\n"
-"  -t   टेम्प्लेट डाइरेक्ट्री सेट गर्नुहोस्\n"
-"  -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
-"  -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "अज्ञात प्याकेज रेकर्ड!"
-
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"उपयोग: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs प्याकेज फाइलहरू क्रमबद्ध गर्ने साधारण उपकरण हो । -s विकल्प कस्तो खालको "
-"फाइल हो भनी इंकित गर्न प्रयोग गरिन्छ ।\n"
-"\n"
-"विकल्पहरू:\n"
-"  -h   यो मद्दत पाठ\n"
-"  -s   क्रमबद्ध स्रोत फाइल प्रयोग गर्नुहोस्\n"
-"  -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
-"  -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "अज्ञात टार हेडर प्रकार %u, सदस्य %s"
 
-#: apt-pkg/install-progress.cc:59
+#: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/init.cc:156
+#: apt-pkg/init.cc:146
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "प्याकिङ्ग प्रणाली '%s' समर्थित छैन"
 
-#: apt-pkg/init.cc:172
+#: apt-pkg/init.cc:162
 msgid "Unable to determine a suitable packaging system type"
 msgstr "उपयुक्त प्याकिङ्ग प्रणाली प्रकार निर्धारन गर्न असक्षम भयो"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i रेकर्डहरू लेखियो ।\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "हराइरहेको फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "हराइरहेको फाइल %i हरू र मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n"
@@ -2254,109 +1996,104 @@ msgstr "यो समस्याहरू सुधार्न तपाईँ
 msgid "The list of sources could not be read."
 msgstr "स्रोतहरुको सूचि पढ्न सकिएन ।"
 
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "खाली प्याकेज क्यास"
 
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "प्याकेज क्यास फाइल दूषित भयो "
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "प्याकेज क्यास फाइल एउटा अमिल्दो संस्करण हो"
 
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:169
 #, fuzzy
 msgid "The package cache file is corrupted, it is too small"
 msgstr "प्याकेज क्यास फाइल दूषित भयो "
 
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:174
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "यो APT ले संस्करण प्रणालीलाई समर्थन गर्दैन '%s'"
 
-#: apt-pkg/pkgcache.cc:180
-#, fuzzy, c-format
-msgid "The package cache was built for different architectures: %s vs %s"
+#: apt-pkg/pkgcache.cc:179
+msgid "The package cache was built for a different architecture"
 msgstr "प्याकेज क्यास विभिन्न वास्तुकलाको लागि निर्माण भएको हो"
 
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "आधारित"
 
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "पुन:आधारित"
 
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "सुझाव दिन्छ"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "सिफारिस गर्दछ"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "द्वन्दहरू"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "बदल्छ"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "वेकायमहरू"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "महत्वपूर्ण"
 
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "आवश्यक"
 
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "मानक"
 
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "वैकल्पिक"
 
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "अतिरिक्त"
 
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
-msgid "Calculating upgrade"
-msgstr "स्तर वृद्धि गणना गरिदैछ."
-
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "विधि ड्राइभर %s फेला पार्न सकिएन ।"
 
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
 msgid "Is the package %s installed?"
 msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n"
 
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "विधि %s सही रुपले सुरू हुन सकेन"
 
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "कृपया डिस्क लेबुल: '%s' ड्राइभ '%s'मा घुसउनुहोस् र इन्टर थिच्नुहोस् । "
@@ -2393,105 +2130,67 @@ msgstr "%s खोल्न असफल"
 msgid "Failed to write temporary StateFile %s"
 msgstr "फाइल %s लेख्न असफल भयो"
 
-#: apt-pkg/acquire-item.cc:98
-msgid "Use --allow-insecure-repositories to force the update"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "पुन:नामकरण असफल गरियो, %s (%s -> %s) ।"
 
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:163
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "MD5Sum मेल भएन"
 
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "साइज मेल खाएन"
 
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "अवैध सञ्चालन  %s"
 
-#: apt-pkg/acquire-item.cc:260
-#, fuzzy
-msgid "Signature error"
-msgstr "त्रुटि लेख्नुहोस्"
-
-#: apt-pkg/acquire-item.cc:264
-msgid "Does not start with a cleartext signature"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1588
-#, c-format
-msgid ""
-"An error occurred during the signature verification. The repository is not "
-"updated and the previous index files will be used. GPG error: %s: %s\n"
-msgstr ""
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1707
-#, fuzzy, c-format
-msgid "The repository '%s' is no longer signed."
-msgstr "डाइरेक्ट्री %s फेरियो "
-
-#: apt-pkg/acquire-item.cc:1714
-msgid ""
-"This is normally not allowed, but the option Acquire::"
-"AllowDowngradeToInsecureRepositories was given to override it."
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1640
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1656
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
 
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1698
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "निम्न कुञ्जी IDs को लागि कुनै सार्वजनिक कुञ्जी उपलब्ध छैन:\n"
 
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:1736
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:1758
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:1788
 #, c-format
 msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
+"An error occurred during the signature verification. The repository is not "
+"updated and the previous index files will be used. GPG error: %s: %s\n"
+msgstr ""
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#, c-format
+msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:1926
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2500,72 +2199,88 @@ msgstr ""
 "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज "
 "निश्चित गर्नुहोस् । (arch हराएरहेको कारणले) "
 
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:1992
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2050
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "प्याकेज अनुक्रमणिका फाइलहरू दूषित भए । प्याकेज %s को लागि कुनै फाइलनाम: फाँट छैन ।"
 
-#: apt-pkg/pkgcachegen.cc:113
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
+msgstr "अनुक्रमणिका फाइल प्रकार '%s' समर्थित छैन"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "%s स्थिर गर्न असक्षम भयो ।"
+
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "क्यास संग एउटा नमिल्दो संस्करण प्रणाली छ"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
 #: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
 #: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
 #: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (pkg फेला पार्नुहोस् )"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "वाऊ, APT ले सक्षम गरेको प्याकेज नामहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:263
 #, fuzzy
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "वाऊ, APT ले सक्षम गरेको निर्भरताहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
 
-#: apt-pkg/pkgcachegen.cc:591
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "फाइल निर्भरताहरू प्रक्रिया गर्दा प्याकेज %s %s फेला परेन"
 
-#: apt-pkg/pkgcachegen.cc:1203
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन "
 
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "प्याकेज सूचिहरू पढिदैछ"
 
-#: apt-pkg/pkgcachegen.cc:1308
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "फाइल उपलब्धताहरू संकलन गरिदैछ"
 
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr " %s मा लेख्न असक्षम"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "स्रोत क्यास बचत गर्दा IO त्रुटि"
 
@@ -2574,29 +2289,29 @@ msgstr "स्रोत क्यास बचत गर्दा IO त्र�
 msgid "Vendor block %s contains no fingerprint"
 msgstr "बिक्रता ब्ल्क %s ले कुनै औठाछाप समाविष्ट गर्दैन"
 
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।"
 
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:91
 #, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "आंशिक संग्रह डाइरेक्ट्री %s हराइरहेछ ।"
 
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:99
 #, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "अनुक्रमणिका फाइल प्रकार '%s' समर्थित छैन"
+msgid "Unable to lock directory %s"
+msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:902
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "%li को %li फाइल पुन:प्राप्त गरिदैछ (%s बाँकी छ)"
 
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:904
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "%li को %li फाइल पुन:प्राप्त गरिदैछ"
@@ -2610,15 +2325,10 @@ msgstr ""
 "केही अनुक्रमणिका फाइलहरू डाउनलोड गर्न असफल भयो, तिनीहरू उपेक्षित भए, वा सट्टामा पुरानो "
 "एउटा प्रयोग गरियो ।"
 
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "तपाईँको स्रोत सूचिमा केही 'source' URIs राख्नुहोस्"
 
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s स्थिर गर्न असक्षम भयो ।"
-
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2640,19 +2350,19 @@ msgstr "पिन टाइप %s बुझ्न सकिएन "
 msgid "No priority (or zero) specified for pin"
 msgstr "पिनको लागि कुनै प्राथमिकता (वा शून्य) निर्दिष्ट छैन"
 
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "फाइल %s खोल्न सकिएन"
 
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:630
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2748,7 +2458,7 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "प्याकेज %s पुन:स्थापना हुन चाहन्छ, तर यसको लागि मैले एउटा संग्रह फेला पार्न सकिन ।"
 
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1086
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2756,7 +2466,7 @@ msgstr ""
 "त्रुटि, pkgProblemResolver:: समाधानले विच्छेदन सिर्जना गर्दछ, यो भइरहेको प्याकेजहरुको "
 "कारणले गर्दा हो ।"
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1088
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "समस्याहरू सुधार्न असक्षम भयो, तपाईँले प्याकेजहरु भाँच्नुभयो ।"
 
@@ -2764,53 +2474,48 @@ msgstr "समस्याहरू सुधार्न असक्षम भ
 msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:237
+#: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:316
+#: apt-pkg/edsp.cc:320
 msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/edsp.cc:323
+#: apt-pkg/edsp.cc:327
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:169
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (२)"
+msgid "Unable to parse package file %s (%d)"
+msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (%d)"
 
-#: apt-pkg/indexrecords.cc:83
+#: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
 
-#: apt-pkg/indexrecords.cc:91
+#: apt-pkg/indexrecords.cc:86
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "द्रष्टब्य, %s को सट्टा  %s चयन भइरहेछ\n"
 
-#: apt-pkg/indexrecords.cc:139
+#: apt-pkg/indexrecords.cc:117
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:152
+#: apt-pkg/indexrecords.cc:130
 #, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "घुमाउरो फाइलमा अवैध लाइन:%s"
 
-#: apt-pkg/indexrecords.cc:171
+#: apt-pkg/indexrecords.cc:149
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
@@ -2890,329 +2595,197 @@ msgstr "स्रोत सूची %s भित्र %u लाइनमा �
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन"
 
-#: apt-pkg/cacheset.cc:501
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr " '%s' को लागि '%s' निष्काशन फेला पार्न सकिएन"
 
-#: apt-pkg/cacheset.cc:504
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr " '%s' को लागि '%s' संस्करण फेला पार्न सकिएन"
 
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:603
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:609
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:734
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:742
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:750
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:107
-#, fuzzy, c-format
-msgid "Installing %s"
-msgstr " %s स्थापना भयो"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr " %s कनफिगर गरिदैछ"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr " %s हटाइदैछ"
-
-#: apt-pkg/deb/dpkgpm.cc:110
-#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr " %s पूर्ण रुपले हट्यो"
-
-#: apt-pkg/deb/dpkgpm.cc:111
+#: apt-pkg/cacheset.cc:647
 #, c-format
-msgid "Noting disappearance of %s"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:112
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid "Running post-installation trigger %s"
+msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, fuzzy, c-format
-msgid "Directory '%s' missing"
-msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।"
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "फाइल %s खोल्न सकिएन"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/cacheset.cc:663
 #, c-format
-msgid "Preparing %s"
-msgstr " %s तयार गरिदैछ"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
-#, c-format
-msgid "Unpacking %s"
-msgstr " %s अनप्याक गरिदैछ"
-
-#: apt-pkg/deb/dpkgpm.cc:1010
-#, c-format
-msgid "Preparing to configure %s"
-msgstr " %s कनफिगर गर्न तयार गरिदैछ"
-
-#: apt-pkg/deb/dpkgpm.cc:1012
-#, c-format
-msgid "Installed %s"
-msgstr " %s स्थापना भयो"
-
-#: apt-pkg/deb/dpkgpm.cc:1017
-#, c-format
-msgid "Preparing for removal of %s"
-msgstr " %s हटाउन तयार गरिदैछ"
-
-#: apt-pkg/deb/dpkgpm.cc:1019
-#, c-format
-msgid "Removed %s"
-msgstr " %s हट्यो"
-
-#: apt-pkg/deb/dpkgpm.cc:1024
-#, c-format
-msgid "Preparing to completely remove %s"
-msgstr " %s पूर्ण रुपले हटाउन तयार गरिदैछ"
-
-#: apt-pkg/deb/dpkgpm.cc:1025
-#, c-format
-msgid "Completely removed %s"
-msgstr " %s पूर्ण रुपले हट्यो"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr " %s मा लेख्न असक्षम"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
+msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418
+#, c-format
+msgid "%lid %lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+msgid "%limin %lis"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:94
-#, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल"
-
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "%lis"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
+#: apt-pkg/contrib/strutl.cc:1258
+#, c-format
+msgid "Selection %s not found"
+msgstr "चयन %s फेला पार्न सकिएन"
 
-#: apt-pkg/contrib/fileutl.cc:196
+#: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "ताल्चा मारिएको फाइल मात्र पढ्नको लागि ताल्चा मार्न प्रयोग गरिएको छैन %s"
 
-#: apt-pkg/contrib/fileutl.cc:201
+#: apt-pkg/contrib/fileutl.cc:195
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "ताल्चा मारिएको फाइल खोल्न सकिएन %s"
 
-#: apt-pkg/contrib/fileutl.cc:224
+#: apt-pkg/contrib/fileutl.cc:218
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "nfs माउन्ट गरिएको लक फाइलको लागि लक प्रयोग गरिएको छैन %s"
 
-#: apt-pkg/contrib/fileutl.cc:229
+#: apt-pkg/contrib/fileutl.cc:223
 #, c-format
 msgid "Could not get lock %s"
 msgstr "ताल्चा प्राप्त गर्न सकिएन %s"
 
-#: apt-pkg/contrib/fileutl.cc:366 apt-pkg/contrib/fileutl.cc:480
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:400
+#: apt-pkg/contrib/fileutl.cc:394
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:418
+#: apt-pkg/contrib/fileutl.cc:412
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:427
+#: apt-pkg/contrib/fileutl.cc:421
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:824
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:826
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।"
 
-#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "सहायक प्रक्रिया %s ले एउटा त्रुटि कोड फर्कायो (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "सहायक प्रक्रिया %s अनपेक्षित बन्द भयो"
 
-#: apt-pkg/contrib/fileutl.cc:952
+#: apt-pkg/contrib/fileutl.cc:913
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "फाइल बन्द गर्दा समस्या"
 
-#: apt-pkg/contrib/fileutl.cc:1140
+#: apt-pkg/contrib/fileutl.cc:1101
 #, c-format
 msgid "Could not open file %s"
 msgstr "फाइल %s खोल्न सकिएन"
 
-#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "%s को लागि पाइप खोल्न सकिएन"
 
-#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
+#: apt-pkg/contrib/fileutl.cc:1315
 msgid "Failed to create subprocess IPC"
 msgstr "सहायक प्रक्रिया IPC सिर्जना गर्न असफल"
 
-#: apt-pkg/contrib/fileutl.cc:1412
+#: apt-pkg/contrib/fileutl.cc:1373
 msgid "Failed to exec compressor "
 msgstr "सङ्कुचनकर्ता कार्यान्वयन गर्न असफल भयो"
 
-#: apt-pkg/contrib/fileutl.cc:1553
+#: apt-pkg/contrib/fileutl.cc:1514
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "पड्नुहोस्, अहिले सम्म %lu पढ्न छ तर कुनै बाँकी छैन"
 
-#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
+#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "लेख्नुहोस्, अहिले सम्म %lu लेख्न छ तर सकिदैन "
 
-#: apt-pkg/contrib/fileutl.cc:1954
+#: apt-pkg/contrib/fileutl.cc:1915
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "फाइल बन्द गर्दा समस्या"
 
-#: apt-pkg/contrib/fileutl.cc:1965
+#: apt-pkg/contrib/fileutl.cc:1927
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "फाइल गुप्तिकरण गर्दा समस्या"
 
-#: apt-pkg/contrib/fileutl.cc:1976
+#: apt-pkg/contrib/fileutl.cc:1938
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "फाइल अनलिङ्क गर्दा समस्या"
 
-#: apt-pkg/contrib/fileutl.cc:1989
+#: apt-pkg/contrib/fileutl.cc:1951
 msgid "Problem syncing the file"
 msgstr "फाइल गुप्तिकरण गर्दा समस्या"
 
@@ -3236,35 +2809,6 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s... गरियो"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "चयन %s फेला पार्न सकिएन"
-
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "एउटा खाली फाइल mmap बनाउन सकिएन"
@@ -3327,61 +2871,67 @@ msgstr "माउन्ट बिन्दु %s स्थिर गर्न �
 msgid "Failed to stat the cdrom"
 msgstr "सिडी रोम स्थिर गर्न असफल भयो"
 
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "नचिनिएको टाइप संक्षिप्त रुप: '%c'"
 
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "कनफिगरेसन फाइल खोलिदैछ %s"
 
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "वाक्य संरचना त्रुटि %s:%u: बन्द कुनै नाम बिना सुरू हुन्छ ।"
 
-#: apt-pkg/contrib/configuration.cc:817
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "वाक्य संरचना त्रुटि %s:%u: वैरुप गरिएको ट्याग"
 
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "वाक्य संरचना त्रुटि %s:%u: मान पछाडि अतिरिक्त जंक"
 
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "वाक्य संरचना त्रुटि %s:%u: निर्देशनहरू माथिल्लो तहबाट मात्र हुन्छ"
 
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:884
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "वाक्य संरचना त्रुटि %s:%u: अति धेरै नेस्टेड समावेश गर्दछ"
 
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "वाक्य संरचना त्रुटि %s:%u: यहाँ बाट समावेश गरेको"
 
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "वाक्य संरचना त्रुटि %s:%u: समर्थन नभएको डाइरेक्टिभ '%s'"
 
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:900
 #, fuzzy, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr "वाक्य संरचना त्रुटि %s:%u: निर्देशनहरू माथिल्लो तहबाट मात्र हुन्छ"
 
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:950
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "वाक्य संरचना त्रुटि %s:%u:फाइलको अन्त्यमा अतिरिक्त जंक"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "स्थापना परित्याग गरिदैछ ।"
+
 #: apt-pkg/contrib/cmndline.cc:124
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -3428,172 +2978,558 @@ msgstr "अर्थ %s बुझिएन, सत्य वा झूठो प
 msgid "Invalid operation %s"
 msgstr "अवैध सञ्चालन  %s"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "अहिलेसम्म लिङ्क गरिएको नोडमा बोलाइएको ड्रपनोड"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr " %s स्थापना भयो"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "ह्यास तत्व तोक्न असफल भयो"
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Configuring %s"
+msgstr " %s कनफिगर गरिदैछ"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "मोड बाँड्न असफल भयो"
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
+#, c-format
+msgid "Removing %s"
+msgstr " %s हटाइदैछ"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "थपमोडमा आन्तरिक त्रुटि"
+#: apt-pkg/deb/dpkgpm.cc:115
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr " %s पूर्ण रुपले हट्यो"
 
-#: apt-inst/filelist.cc:477
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "मोड अधिलेखन गर्ने प्यास गरिदै, %s -> %s र %s/%s"
+msgid "Noting disappearance of %s"
+msgstr ""
 
-#: apt-inst/filelist.cc:506
+#: apt-pkg/deb/dpkgpm.cc:117
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "मोडको डबल थप %s -> %s"
+msgid "Running post-installation trigger %s"
+msgstr ""
 
-#: apt-inst/filelist.cc:549
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:847
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।"
+
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "फाइल %s खोल्न सकिएन"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "नक्कली कनफिगगरेसन फाइल %s/%s"
+msgid "Preparing %s"
+msgstr " %s तयार गरिदैछ"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
-msgid "The path %s is too long"
-msgstr "बाटो %s अति लामो छ "
+msgid "Unpacking %s"
+msgstr " %s अनप्याक गरिदैछ"
 
-#: apt-inst/extract.cc:132
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "एक भन्दा बढी %s अनप्याक गरिदैछ"
+msgid "Preparing to configure %s"
+msgstr " %s कनफिगर गर्न तयार गरिदैछ"
 
-#: apt-inst/extract.cc:142
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "डाइरेक्ट्री %s फेरियो "
+msgid "Installed %s"
+msgstr " %s स्थापना भयो"
 
-#: apt-inst/extract.cc:152
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "प्याकेज लक्षित मोडमा लेख्ने प्यास गर्दैछ %s/%s"
+msgid "Preparing for removal of %s"
+msgstr " %s हटाउन तयार गरिदैछ"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "घुम्ती बाटो अति लामो छ"
+#: apt-pkg/deb/dpkgpm.cc:1024
+#, c-format
+msgid "Removed %s"
+msgstr " %s हट्यो"
 
-#: apt-inst/extract.cc:249
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "डाइरेक्ट्री %s डाइरेक्ट्री विहिन द्वारा बदलिदैछ"
+msgid "Preparing to completely remove %s"
+msgstr " %s पूर्ण रुपले हटाउन तयार गरिदैछ"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "यसको ह्यास बाल्टीमा नोड स्थित गर्न असफल भयो"
+#: apt-pkg/deb/dpkgpm.cc:1030
+#, c-format
+msgid "Completely removed %s"
+msgstr " %s पूर्ण रुपले हट्यो"
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "बाटो अति लामो छ"
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr " %s मा लेख्न असक्षम"
 
-#: apt-inst/extract.cc:421
-#, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr " %s को लागि संस्करन बिना अधिलेखन प्याकेज मेल खायो"
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: apt-inst/extract.cc:438
+#: apt-pkg/deb/dpkgpm.cc:1670
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1732
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1737
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1739
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1745
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1752
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1787
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "फाइल %s/%s ले प्याकेज %s मा एउटा अधिलेखन गर्दछ"
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
 
-#: apt-inst/extract.cc:498
+#: apt-pkg/deb/debsystem.cc:94
+#, fuzzy, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "Unable to stat %s"
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
+
+#: cmdline/apt-extracttemplates.cc:224
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"उपयोग: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+" apt-extracttemplates डवियन प्याकेजहरुबाट कनफिगरेसन र टेम्प्लेट सूचना झिक्ने उपकरण हो\n"
+"\n"
+"\n"
+"विकल्पहरू:\n"
+"  -h   यो मद्दत पाठ\n"
+"  -t   टेम्प्लेट डाइरेक्ट्री सेट गर्नुहोस्\n"
+"  -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
+"  -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
 msgstr "%s स्थिर गर्न असक्षम भयो"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr " debconf संस्करण प्राप्त गर्न सकिएन । के debconf स्थापना भयो ? "
+
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "प्याकेज विस्तार सूचि अति लामो छ"
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, c-format
-msgid "Failed to write file %s"
-msgstr "फाइल %s लेख्न असफल भयो"
+msgid "Error processing directory %s"
+msgstr "डाइरेक्ट्री %s प्रक्रिया गर्दा त्रुटि"
+
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "स्रोत विस्तार सूचि अति लामो छ"
 
-#: apt-inst/dirstream.cc:104
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "सामाग्री फाइलहरुमा हेडर लेख्दा त्रुटि"
+
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "Failed to close file %s"
-msgstr "%s फाइल बन्द गर्न असफल भयो"
+msgid "Error processing contents %s"
+msgstr "सामग्री %sप्रक्रिया गर्दा त्रुटि"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/apt-ftparchive.cc:626
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"उपयोग: apt-ftparchive [विकल्पहरू] आदेश\n"
+"आदेशहरू: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive ले डेवियन संग्रहहरुको लागि अनुक्रमणिका फाइलहरू सिर्जना गर्दछ । यसले "
+"समर्थन गर्दछ\n"
+"dpkg-scanpackages र dpkg-scansources को लागि कार्यात्मक प्रतिस्थापनमा पुरै "
+"स्वचालितबाट सिर्जनाको धेरै शैलीहरू\n"
+" \n"
+"\n"
+"apt-ftparchive ले debs को ट्रीबाट प्याकेज फाइलहरू सिर्जना गर्दछ । प्याकेज\n"
+"फाइलहरुले प्रत्येक प्याकेजबाट सबै नियन्त्रण फाँटहरुको सामग्रीहरू साथ साथै MD5 hash र "
+"filesize समावेश गर्दछ ।\n"
+"एउटा अधिलेखन फाइल\n"
+"प्राथमिकता र सेक्सनको मान जोड गर्न समर्थित हुन्छ ।\n"
+"\n"
+"त्यस्तै गरी apt-ftparchive ले .dscs को ट्रीबाट स्रोत फाइलहरू सिर्जना गर्दछ ।\n"
+"स्रोत--अधिलेखन--विकल्प src अधीलेखन फाइल निर्दिष्ट गर्न प्रयोग गर्न सकिन्छ\n"
+"\n"
+"'packages' and 'sources' आदेश ट्रीको मूलमा चलाउन सकिन्छ ।\n"
+" विनारी मार्ग फेरी हुने खोजीको विन्दुमा आधारित हुन्छ र \n"
+"अधिलेखन फाइलले अधिलेखन झण्डाहरू समाविष्ट गर्दछ । यदि उपस्थित छ भने बाटो उपसर्ग\n"
+"फाइलनाम फाँटहरुमा थपिन्छ । उदाहरणको लागि \n"
+"डेवियन संग्रहबाट उपयोग:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"विकल्पहरू:\n"
+"  -h    यो मद्दत पाठ\n"
+"  --md5 नियन्त्रण MD5 सिर्जना\n"
+"  -s=?  स्रोत अधिलेखन फाइल\n"
+"  -q    बन्द गर्नुहोस्\n"
+"  -d=?  वैकल्पिक क्यासिङ डेटाबेस चयन गर्नुहोस्\n"
+"  --no-delink delinking डिबग मोड सक्षम गर्नुहोस्\n"
+"  --सामग्रीहरू  सामग्री फाइल सिर्जना नियन्त्रण गर्नुहोस्\n"
+"  -c=?  यो कनफिगरेसन फाइल पढ्नुहोस्\n"
+"  -o=?  एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्"
+
+#: ftparchive/apt-ftparchive.cc:822
+msgid "No selections matched"
+msgstr "कुनै चयनहरू मेल खाएन"
+
+#: ftparchive/apt-ftparchive.cc:907
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "यो वैध DEB संग्रह होइन, '%s' सदस्य हराइरहेछ"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "केही फाइलहरू प्याकेज फाइल समूह `%s' मा हराइरहेको छ"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/cachedb.cc:65
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "आन्तरीक त्रुटि, सदस्य तोक्न सक्दैन  %s"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB दूषित थियो, फाइल %s.पुरानो मा पुन:नामकरण गर्नुहोस्"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "पद वर्णन गर्न नसकिने नियन्त्रण फाइल"
+#: ftparchive/cachedb.cc:83
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB पुरानो छ, %s स्तरवृद्धि गर्न प्रयास गरिदैछ"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "अवैध संग्रह हस्ताक्षर"
+#: ftparchive/cachedb.cc:94
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "संग्रह सदस्य हेडर पढ्दा त्रुटि "
+#: ftparchive/cachedb.cc:99
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "DB फाइल %s असक्षम भयो: %s"
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "लिङ्क पढ्न असफल %s"
+
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "संग्रह संग नियन्त्रण रेकर्ड छैन"
+
+#: ftparchive/cachedb.cc:594
+msgid "Unable to get a cursor"
+msgstr "कर्सर प्राप्त गर्न असक्षम भयो"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "W: डाइरेक्ट्री %s पढ्न असक्षम\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "W: %s स्थिर गर्न असक्षम\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "W: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "E: फाइलमा त्रुटिहरू लागू गर्नुहोस्"
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "%s हल गर्न असफल भयो"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "ट्री हिडाईँ असफल भयो"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "%s खोल्न असफल"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "लिङ्क पढ्न असफल %s"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "अनलिङ्क गर्न असफल %s"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** %s मा %s लिङ्क असफल भयो"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr "यस %sB हिटको डि लिङ्क सिमा।\n"
+
+#: ftparchive/writer.cc:417
+msgid "Archive had no package field"
+msgstr "संग्रह संग कुनै प्याकेज फाँट छैन"
+
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "   %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
+
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s संभारकर्ता %s हो %s होइन\n"
+
+#: ftparchive/writer.cc:698
 #, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "अवैध संग्रह सदस्य हेडर"
+msgid "  %s has no source override entry\n"
+msgstr "   %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "अवैध संग्रह सदस्य हेडर"
+#: ftparchive/writer.cc:702
+#, fuzzy, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "   %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "संग्रह अति छोटो छ"
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - स्मृति बाँडफाँड गर्न असफल भयो"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "संग्रह हेडरहरू पढ्न असफल"
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "%s खोल्न असफल"
 
-#: apt-inst/contrib/extracttar.cc:123
-msgid "Failed to create pipes"
-msgstr "पाइपहरू सिर्जना गर्न असफल"
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #१"
 
-#: apt-inst/contrib/extracttar.cc:150
-msgid "Failed to exec gzip "
-msgstr "gzip कार्यन्वयन गर्न असफल"
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "अधिलेखन फाइल पढ्न असफल %s"
 
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
-msgid "Corrupted archive"
-msgstr "संग्रह दूषित भयो"
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #१"
 
-#: apt-inst/contrib/extracttar.cc:202
-msgid "Tar checksum failed, archive corrupted"
-msgstr "टार चेकसम असफल भयो, संग्रह दूषित भयो"
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #२"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #३"
 
-#: apt-inst/contrib/extracttar.cc:307
+#: ftparchive/multicompress.cc:73
 #, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "अज्ञात टार हेडर प्रकार %u, सदस्य %s"
+msgid "Unknown compression algorithm '%s'"
+msgstr "अज्ञात सङ्कुचन अल्गोरिद्म '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "सङ्कुचन गरिएको निर्गात %s लाई सङ्कुचन सेटको आवश्यक्ता पर्दछ"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "FILE* सिर्जना गर्न असफल"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "काँटा गर्न असफल"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "सङ्कुचन शाखा"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "आन्तरीक त्रुटि, %s सिर्जना गर्न असफल"
 
-#~ msgid "Total dependency version space: "
-#~ msgstr "कूल निर्भरता संस्करण खाली ठाऊँ:"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "सहायक प्रक्रिया/फाइलमा IO असफल भयो"
 
-#~ msgid "You don't have enough free space in %s"
-#~ msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "MD5 गणना गर्दा पढ्न असफल भयो"
 
-#~ msgid "Done"
-#~ msgstr "काम भयो"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "समस्या अनलिङ्क भइरहेछ %s"
 
+#: cmdline/apt-internal-solver.cc:49
 #, fuzzy
-#~ msgid "No keyring installed in %s."
-#~ msgstr "स्थापना परित्याग गरिदैछ ।"
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"उपयोग: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+" apt-extracttemplates डवियन प्याकेजहरुबाट कनफिगरेसन र टेम्प्लेट सूचना झिक्ने उपकरण हो\n"
+"\n"
+"\n"
+"विकल्पहरू:\n"
+"  -h   यो मद्दत पाठ\n"
+"  -t   टेम्प्लेट डाइरेक्ट्री सेट गर्नुहोस्\n"
+"  -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
+"  -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "अज्ञात प्याकेज रेकर्ड!"
+
+#: cmdline/apt-sortpkgs.cc:153
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"उपयोग: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs प्याकेज फाइलहरू क्रमबद्ध गर्ने साधारण उपकरण हो । -s विकल्प कस्तो खालको "
+"फाइल हो भनी इंकित गर्न प्रयोग गरिन्छ ।\n"
+"\n"
+"विकल्पहरू:\n"
+"  -h   यो मद्दत पाठ\n"
+"  -s   क्रमबद्ध स्रोत फाइल प्रयोग गर्नुहोस्\n"
+"  -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
+"  -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
 
 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"