Merge branch 'debian/sid' into ubuntu/master

Conflicts:
	configure.ac
	debian/changelog

1 files changed, 193 insertions, 183 deletions

diff --git a/po/ne.po b/po/ne.po
index ff80aaa67..e627077a0 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-01-25 22:21+0100\n"
+"POT-Creation-Date: 2014-02-06 20:46+0100\n"
 "PO-Revision-Date: 2006-06-12 14:35+0545\n"
 "Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
@@ -115,7 +115,7 @@ msgstr "तपाईँले एउटा वास्तविक बान्
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574
+#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "प्याकेज %s तोक्न असक्षम भयो"
@@ -159,7 +159,7 @@ msgid "  Version table:"
 msgstr "  संस्करण तालिका:"
 
 #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
 #, fuzzy, c-format
@@ -352,23 +352,23 @@ msgstr "आन्तरिक त्रुटि,समस्या हलकर
 msgid "Unable to lock the download directory"
 msgstr "डाउनलोड डाइरेक्ट्री ताल्चा मार्न असक्षम"
 
-#: cmdline/apt-get.cc:722
+#: cmdline/apt-get.cc:725
 msgid "Must specify at least one package to fetch source for"
 msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ"
 
-#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s को लागि स्रोत प्याकेज फेला पार्न असफल भयो"
 
-#: cmdline/apt-get.cc:779
+#: cmdline/apt-get.cc:782
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:784
+#: cmdline/apt-get.cc:787
 #, c-format
 msgid ""
 "Please use:\n"
@@ -376,114 +376,114 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:840
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "पहिल्यै डाउनलोड भएका फाइलहरु फड्काइदैछ '%s'\n"
 
-#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863
+#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन"
 
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:877
 #, 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:883
+#: cmdline/apt-get.cc:886
 #, 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:888
+#: cmdline/apt-get.cc:891
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "स्रोत संग्रहहरुको %sB प्राप्त गर्न आवश्यक छ ।\n"
 
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:897
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "स्रोत फड्काउनुहोस् %s\n"
 
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:918
 msgid "Failed to fetch some archives."
 msgstr "केही संग्रह फड्काउन असफल भयो ।"
 
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
 msgid "Download complete and in download only mode"
 msgstr "डाउनलोड समाप्त भयो र डाउनलोडमा मोड मात्रै छ"
 
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:949
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr " %s मा पहिल्यै अनप्याक गरिएका स्रोतको अनप्याक फड्काइदैछ\n"
 
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:961
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "अनप्याक आदेश '%s' असफल भयो ।\n"
 
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:962
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n"
 
-#: cmdline/apt-get.cc:981
+#: cmdline/apt-get.cc:984
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "निर्माण आदेश '%s' असफल भयो ।\n"
 
-#: cmdline/apt-get.cc:1001
+#: cmdline/apt-get.cc:1004
 msgid "Child process failed"
 msgstr "शाखा प्रक्रिया असफल भयो"
 
-#: cmdline/apt-get.cc:1020
+#: cmdline/apt-get.cc:1023
 msgid "Must specify at least one package to check builddeps for"
 msgstr "को लागि builddeps जाँच्न कम्तिमा एउटा प्याकेज निर्दष्ट गर्नुपर्छ"
 
-#: cmdline/apt-get.cc:1045
+#: cmdline/apt-get.cc:1048
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072
+#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s को लागि निर्माण-निर्भरता सूचना प्राप्त गर्न असक्षम भयो"
 
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1095
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s कुनै निर्माणमा आधारित हुदैन ।\n"
 
-#: cmdline/apt-get.cc:1262
+#: cmdline/apt-get.cc:1265
 #, 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:1280
+#: cmdline/apt-get.cc:1283
 #, 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:1303
+#: cmdline/apt-get.cc:1306
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "%s को लागि %s निर्भरता सन्तुष्ट पार्न असफल भयो: स्थापित प्याकेज %s अति नयाँ छ"
 
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1345
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -492,37 +492,37 @@ msgstr ""
 "%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले संस्करण "
 "आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन "
 
-#: cmdline/apt-get.cc:1348
+#: cmdline/apt-get.cc:1351
 #, 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:1371
+#: cmdline/apt-get.cc:1374
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s को लागि %s निर्भरता सन्तुष्ट गर्न असफल: %s"
 
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1389
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । "
 
-#: cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1394
 msgid "Failed to process build dependencies"
 msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल"
 
-#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "%s (%s) मा जडान गरिदैछ"
 
-#: cmdline/apt-get.cc:1582
+#: cmdline/apt-get.cc:1585
 msgid "Supported modules:"
 msgstr "समर्थित मोड्युलहरू:"
 
-#: cmdline/apt-get.cc:1623
+#: cmdline/apt-get.cc:1626
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -634,7 +634,7 @@ msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n
 
 #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1183
+#: apt-pkg/deb/dpkgpm.cc:1182
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन"
@@ -727,16 +727,16 @@ msgstr "%s मा सिडी रोम अनमाउन्ट गर्न �
 msgid "Disk not found."
 msgstr "डिस्क फेला परेन ।"
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
 msgid "File not found"
 msgstr "फाइल फेला परेन "
 
-#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:618 methods/rred.cc:627
+#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
+#: methods/rred.cc:598 methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "स्थिर गर्न असफल भयो"
 
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
+#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "परिमार्जन समय सेट असफल भयो"
 
@@ -745,34 +745,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:173
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "लगइन भइरहेछ"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "समान नाम निर्धारण गर्न असक्षम भयो"
 
-#: methods/ftp.cc:184
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "स्थानिय नाम निर्धारण गर्न असक्षम भयो"
 
-#: methods/ftp.cc:215 methods/ftp.cc:243
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "सर्भरले जडान अस्वीकार गर्यो र भन्यो: %s"
 
-#: methods/ftp.cc:221
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "प्रयोगकर्ता असफल भयो, सर्भरले भन्यो: %s"
 
-#: methods/ftp.cc:228
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "पास असफल भयो, सर्भरले भन्यो: %s"
 
-#: methods/ftp.cc:248
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -780,121 +780,121 @@ msgstr ""
 "प्रोक्सी सर्भर निर्दिष्ट गरियो तर कुनै स्क्रिफ्ट लगइन भएन, Acquire::ftp::ProxyLogin  "
 "खाली छ ।"
 
-#: methods/ftp.cc:276
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "लगइन स्क्रिफ्ट आदेश '%s' असफल भयो, सर्भरले भन्यो: %s"
 
-#: methods/ftp.cc:302
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "टाइप असफल भयो: %s"
 
-#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237
+#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
 msgid "Connection timeout"
 msgstr "जडान समय सकियो"
 
-#: methods/ftp.cc:346
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "सर्भरले जडान बन्द गर्यो"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292
+#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
 msgid "Read error"
 msgstr "त्रुटि पढ्नुहोस्"
 
-#: methods/ftp.cc:356 methods/rsh.cc:206
+#: methods/ftp.cc:355 methods/rsh.cc:205
 msgid "A response overflowed the buffer."
 msgstr "एउटा प्रतिक्रियाले बफर अधिप्रवाह गर्यो"
 
-#: methods/ftp.cc:373 methods/ftp.cc:385
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "प्रोटोकल दूषित"
 
-#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
 #: apt-pkg/contrib/fileutl.cc:1425
 msgid "Write error"
 msgstr "त्रुटि लेख्नुहोस्"
 
-#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
 msgid "Could not create a socket"
 msgstr "एउटा सकेट सिर्जना गर्न सकेन"
 
-#: methods/ftp.cc:708
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr "डेटा सकेट जडान गर्न सकिएन, जडान समय सकियो"
 
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
 msgid "Failed"
 msgstr "असफल भयो"
 
-#: methods/ftp.cc:714
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "निस्क्रिय सकेट जडान गर्न सकिएन"
 
-#: methods/ftp.cc:731
+#: methods/ftp.cc:730
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo सुन्ने सकेट प्राप्त गर्न असक्षम भयो"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:744
 msgid "Could not bind a socket"
 msgstr "सकेट बाँध्न सकिएन"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:748
 msgid "Could not listen on the socket"
 msgstr "सकेटमा सुन्न सकिएन"
 
-#: methods/ftp.cc:756
+#: methods/ftp.cc:755
 msgid "Could not determine the socket's name"
 msgstr "सकेट नाम निर्धारण गर्न सकिएन"
 
-#: methods/ftp.cc:788
+#: methods/ftp.cc:787
 msgid "Unable to send PORT command"
 msgstr "पोर्ट आदेश पठाउन असक्षम भयो"
 
-#: methods/ftp.cc:798
+#: methods/ftp.cc:797
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "अज्ञात ठेगाना परिवार %u (AF_*)"
 
-#: methods/ftp.cc:807
+#: methods/ftp.cc:806
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT असफल भयो, सर्भरले भन्यो: %s"
 
-#: methods/ftp.cc:827
+#: methods/ftp.cc:826
 msgid "Data socket connect timed out"
 msgstr "डेटा सकेटको जडान समय सकियो"
 
-#: methods/ftp.cc:834
+#: methods/ftp.cc:833
 msgid "Unable to accept connection"
 msgstr "जडान स्वीकार गर्न असक्षम भयो"
 
-#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313
+#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312
 msgid "Problem hashing file"
 msgstr "समस्या द्रुतान्वेषण फाइल"
 
-#: methods/ftp.cc:886
+#: methods/ftp.cc:885
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "फाइल तान्न असक्षम भयो, सर्भरले भन्यो '%s'"
 
-#: methods/ftp.cc:901 methods/rsh.cc:332
+#: methods/ftp.cc:900 methods/rsh.cc:331
 msgid "Data socket timed out"
 msgstr "डेटा सकेट समय सकियो"
 
-#: methods/ftp.cc:931
+#: methods/ftp.cc:930
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "डेटा स्थान्तरण असफल भयो, सर्भरले भन्यो '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1008
+#: methods/ftp.cc:1009
 msgid "Query"
 msgstr "क्वेरी"
 
-#: methods/ftp.cc:1120
+#: methods/ftp.cc:1123
 msgid "Unable to invoke "
 msgstr "आह्वान गर्न असक्षम भयो"
 
@@ -960,71 +960,71 @@ msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट
 msgid "Unable to connect to %s:%s:"
 msgstr "%s %s मा जडान गर्न असफल भयो:"
 
-#: methods/gpgv.cc:167
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "आन्तरिक त्रुटि: असल हस्ताक्षर, तर कुञ्जी औठाछाप निर्धारण गर्न सकिएन?!"
 
-#: methods/gpgv.cc:171
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "कम्तिमा एउटा अवैध हस्ताक्षर विरोध भयो ।"
 
-#: methods/gpgv.cc:173
+#: methods/gpgv.cc:172
 #, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "हस्ताक्षर रूजू गर्न '%s' कार्यन्वयन गर्न सकिएन (के gpgv स्थापना भयो?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:178
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "gpgv कार्यन्वयन गर्दा अज्ञात त्रुटि"
 
-#: methods/gpgv.cc:216 methods/gpgv.cc:223
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "निम्न हस्ताक्षरहरू अवैध छन्:\n"
 
-#: methods/gpgv.cc:230
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "निम्न हस्ताक्षरहरू रूजू हुन सक्दैन किन भने सार्वजनिक कुञ्जी उपलब्ध छैन:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:64
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:519
+#: methods/http.cc:516
 msgid "Error writing to the file"
 msgstr "फाइलमा त्रुटि लेखिदैछ"
 
-#: methods/http.cc:533
+#: methods/http.cc:530
 msgid "Error reading from server. Remote end closed connection"
 msgstr "सर्भरबाट त्रुटि पढिदैछ । दूर गन्तब्य बन्द जडान"
 
-#: methods/http.cc:535
+#: methods/http.cc:532
 msgid "Error reading from server"
 msgstr "सर्भरबाट त्रुटि पढिदैछ"
 
-#: methods/http.cc:571
+#: methods/http.cc:568
 msgid "Error writing to file"
 msgstr "फाइलमा त्रुटि लेखिदैछ"
 
-#: methods/http.cc:631
+#: methods/http.cc:628
 msgid "Select failed"
 msgstr "असफल चयन गर्नुहोस्"
 
-#: methods/http.cc:636
+#: methods/http.cc:633
 msgid "Connection timed out"
 msgstr "जडान समय सकियो"
 
-#: methods/http.cc:659
+#: methods/http.cc:656
 msgid "Error writing to output file"
 msgstr "निर्गात फाइलमा त्रुटि लेखिदैछ"
 
@@ -1060,11 +1060,11 @@ msgstr "अज्ञात मिति ढाँचा"
 msgid "Bad header data"
 msgstr "खराब हेडर डेटा"
 
-#: methods/server.cc:507 methods/server.cc:564
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "जडान असफल भयो"
 
-#: methods/server.cc:656
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "आन्तरिक त्रुटि"
 
@@ -1309,101 +1309,108 @@ msgstr "यी प्याकेजहरू रूजू बिना स्�
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s  %s तान्न असफल भयो\n"
 
-#: apt-private/private-output.cc:200
-msgid "installed,upgradable to: "
+#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-show.cc:86
+msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:206
+#: apt-private/private-output.cc:198
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [स्थापना भयो]"
+
+#: apt-private/private-output.cc:202
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [स्थापना भयो]"
 
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:205
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:207
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [स्थापना भयो]"
 
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:209
 #, fuzzy
 msgid "[installed]"
 msgstr " [स्थापना भयो]"
 
-#: apt-private/private-output.cc:219
-msgid "[upgradable from: "
+#: apt-private/private-output.cc:213
+#, c-format
+msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:225
+#: apt-private/private-output.cc:217
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:316
+#: apt-private/private-output.cc:317
 msgid "The following packages have unmet dependencies:"
 msgstr "निम्न प्याकेजहरुले निर्भरताहरू भेटेनन्:"
 
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:407
 #, c-format
 msgid "but %s is installed"
 msgstr "तर %s स्थापना भयो"
 
-#: apt-private/private-output.cc:408
+#: apt-private/private-output.cc:409
 #, c-format
 msgid "but %s is to be installed"
 msgstr "तर %s स्थापना हुनुपर्यो"
 
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:416
 msgid "but it is not installable"
 msgstr "तर यो स्थापनायोग्य छैन"
 
-#: apt-private/private-output.cc:417
+#: apt-private/private-output.cc:418
 msgid "but it is a virtual package"
 msgstr "तर यो अवास्तविक प्याकेज होइन"
 
-#: apt-private/private-output.cc:420
+#: apt-private/private-output.cc:421
 msgid "but it is not installed"
 msgstr "तर यो स्थापना भएन"
 
-#: apt-private/private-output.cc:420
+#: apt-private/private-output.cc:421
 msgid "but it is not going to be installed"
 msgstr "तर यो स्थापना हुन गइरहेको छैन"
 
-#: apt-private/private-output.cc:425
+#: apt-private/private-output.cc:426
 msgid " or"
 msgstr "वा"
 
-#: apt-private/private-output.cc:454
+#: apt-private/private-output.cc:455
 msgid "The following NEW packages will be installed:"
 msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
 
-#: apt-private/private-output.cc:480
+#: apt-private/private-output.cc:481
 msgid "The following packages will be REMOVED:"
 msgstr "निम्न प्याकेजहरू हटाइनेछन्:"
 
-#: apt-private/private-output.cc:502
+#: apt-private/private-output.cc:503
 msgid "The following packages have been kept back:"
 msgstr "निम्न प्याकेजहरू पछाडि राखिनेछन्:"
 
-#: apt-private/private-output.cc:523
+#: apt-private/private-output.cc:524
 msgid "The following packages will be upgraded:"
 msgstr "निम्न प्याकेजहरू स्तर वृद्धि हुनेछन्:"
 
-#: apt-private/private-output.cc:544
+#: apt-private/private-output.cc:545
 msgid "The following packages will be DOWNGRADED:"
 msgstr "निम्न प्याकेजहरू स्तरकम गरिनेछन्:"
 
-#: apt-private/private-output.cc:564
+#: apt-private/private-output.cc:565
 msgid "The following held packages will be changed:"
 msgstr "निम्न भइरहेको प्याकेजहरू परिवर्तन हुनेछैन:"
 
-#: apt-private/private-output.cc:619
+#: apt-private/private-output.cc:620
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (%s कारणले) "
 
-#: apt-private/private-output.cc:627
+#: apt-private/private-output.cc:628
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1411,27 +1418,27 @@ msgstr ""
 "चेतावनी: निम्न आवश्यक प्याकेजहरू हटाइनेछन् ।\n"
 "तपाईँ के गरिरहेको यकिन नभएसम्म यो काम गरिने छैन!"
 
-#: apt-private/private-output.cc:658
+#: apt-private/private-output.cc:659
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu स्तर वृद्धि गरियो, %lu नयाँ स्थापना भयो, "
 
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:663
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu पुन: स्थापना गरियो, "
 
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:665
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu स्तर कम गरियो, "
 
-#: apt-private/private-output.cc:666
+#: apt-private/private-output.cc:667
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu हटाउन र %lu स्तर वृद्धि गरिएन ।\n"
 
-#: apt-private/private-output.cc:670
+#: apt-private/private-output.cc:671
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu पूर्णरुपले स्थापना भएन र हटाइएन ।\n"
@@ -1440,7 +1447,7 @@ msgstr "%lu पूर्णरुपले स्थापना भएन र �
 #. e.g. "Do you want to continue? [Y/n] "
 #. The user has to answer with an input matching the
 #. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:692
+#: apt-private/private-output.cc:693
 msgid "[Y/n]"
 msgstr ""
 
@@ -1448,21 +1455,21 @@ msgstr ""
 #. e.g. "Should this file be removed? [y/N] "
 #. The user has to answer with an input matching the
 #. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:699
 msgid "[y/N]"
 msgstr ""
 
 #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:709
+#: apt-private/private-output.cc:710
 msgid "Y"
 msgstr ""
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:715
+#: apt-private/private-output.cc:716
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s"
@@ -1520,10 +1527,6 @@ msgstr "काम भयो"
 msgid "Full Text Search"
 msgstr ""
 
-#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
 #: apt-private/private-show.cc:152
 #, c-format
 msgid "There is %lu additional record. Please use the '-a' switch to see it"
@@ -1634,11 +1637,11 @@ msgstr "फाइल %s खोल्न सकिएन"
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "सहायक प्रक्रियामा IPC पाइप सिर्जना गर्न असफल"
 
-#: methods/rsh.cc:340
+#: methods/rsh.cc:339
 msgid "Connection closed prematurely"
 msgstr "जडान असमायिक बन्द भयो"
 
@@ -1958,31 +1961,38 @@ msgstr "   %s संग कुनै अधिलेखन प्रविष्
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - स्मृति बाँडफाँड गर्न असफल भयो"
 
-#: ftparchive/override.cc:35 ftparchive/override.cc:143
+#: ftparchive/override.cc:35 ftparchive/override.cc:139
 #, c-format
 msgid "Unable to open %s"
 msgstr "%s खोल्न असफल"
 
-#: ftparchive/override.cc:61 ftparchive/override.cc:167
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:65
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #१"
+
+#: ftparchive/override.cc:124 ftparchive/override.cc:198
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "अधिलेखन फाइल पढ्न असफल %s"
+
+#: ftparchive/override.cc:163
 #, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
 msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #१"
 
-#: ftparchive/override.cc:75 ftparchive/override.cc:179
+#: ftparchive/override.cc:175
 #, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
 msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #२"
 
-#: ftparchive/override.cc:89 ftparchive/override.cc:192
+#: ftparchive/override.cc:188
 #, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
 msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #३"
 
-#: ftparchive/override.cc:128 ftparchive/override.cc:202
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "अधिलेखन फाइल पढ्न असफल %s"
-
 #: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
@@ -2010,20 +2020,20 @@ msgstr "सङ्कुचन शाखा"
 msgid "Internal error, failed to create %s"
 msgstr "आन्तरीक त्रुटि, %s सिर्जना गर्न असफल"
 
-#: ftparchive/multicompress.cc:304
+#: ftparchive/multicompress.cc:302
 msgid "IO to subprocess/file failed"
 msgstr "सहायक प्रक्रिया/फाइलमा IO असफल भयो"
 
-#: ftparchive/multicompress.cc:342
+#: ftparchive/multicompress.cc:340
 msgid "Failed to read while computing MD5"
 msgstr "MD5 गणना गर्दा पढ्न असफल भयो"
 
-#: ftparchive/multicompress.cc:358
+#: ftparchive/multicompress.cc:356
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "समस्या अनलिङ्क भइरहेछ %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr " %s मा  %s  पुन:नामकरण असफल भयो"
@@ -2158,12 +2168,12 @@ msgstr "मोडको डबल थप %s -> %s"
 msgid "Duplicate conf file %s/%s"
 msgstr "नक्कली कनफिगगरेसन फाइल %s/%s"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
 msgid "Failed to write file %s"
 msgstr "फाइल %s लेख्न असफल भयो"
 
-#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
+#: apt-inst/dirstream.cc:105
 #, c-format
 msgid "Failed to close file %s"
 msgstr "%s फाइल बन्द गर्न असफल भयो"
@@ -2276,14 +2286,14 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:440
+#: apt-pkg/contrib/mmap.cc:446
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:443
+#: apt-pkg/contrib/mmap.cc:449
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2680,7 +2690,7 @@ msgstr "फाइल %s लेख्न असफल भयो"
 msgid "Unable to parse package file %s (1)"
 msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
 
-#: apt-pkg/tagfile.cc:231
+#: apt-pkg/tagfile.cc:235
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (२)"
@@ -3190,49 +3200,49 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "MD5Sum मेल भएन"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:469
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr " '%s' को लागि '%s' निष्काशन फेला पार्न सकिएन"
 
-#: apt-pkg/cacheset.cc:470
+#: apt-pkg/cacheset.cc:472
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr " '%s' को लागि '%s' संस्करण फेला पार्न सकिएन"
 
-#: apt-pkg/cacheset.cc:581
+#: apt-pkg/cacheset.cc:583
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
-#: apt-pkg/cacheset.cc:587
+#: apt-pkg/cacheset.cc:589
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
-#: apt-pkg/cacheset.cc:598
+#: apt-pkg/cacheset.cc:600
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612
+#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:619
+#: apt-pkg/cacheset.cc:621
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:627
+#: apt-pkg/cacheset.cc:629
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:635
+#: apt-pkg/cacheset.cc:637
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
@@ -3280,12 +3290,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr " %s स्थापना भयो"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
 #, c-format
 msgid "Configuring %s"
 msgstr " %s कनफिगर गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
 #, c-format
 msgid "Removing %s"
 msgstr " %s हटाइदैछ"
@@ -3306,111 +3316,111 @@ msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:809
+#: apt-pkg/deb/dpkgpm.cc:808
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।"
 
-#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846
+#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "फाइल %s खोल्न सकिएन"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:970
 #, c-format
 msgid "Preparing %s"
 msgstr " %s तयार गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:972
+#: apt-pkg/deb/dpkgpm.cc:971
 #, c-format
 msgid "Unpacking %s"
 msgstr " %s अनप्याक गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:976
 #, c-format
 msgid "Preparing to configure %s"
 msgstr " %s कनफिगर गर्न तयार गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:979
+#: apt-pkg/deb/dpkgpm.cc:978
 #, c-format
 msgid "Installed %s"
 msgstr " %s स्थापना भयो"
 
-#: apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:983
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr " %s हटाउन तयार गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:985
 #, c-format
 msgid "Removed %s"
 msgstr " %s हट्यो"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr " %s पूर्ण रुपले हटाउन तयार गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:992
+#: apt-pkg/deb/dpkgpm.cc:991
 #, c-format
 msgid "Completely removed %s"
 msgstr " %s पूर्ण रुपले हट्यो"
 
-#: apt-pkg/deb/dpkgpm.cc:1047
+#: apt-pkg/deb/dpkgpm.cc:1046
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
+#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr " %s मा लेख्न असक्षम"
 
-#: apt-pkg/deb/dpkgpm.cc:1050
+#: apt-pkg/deb/dpkgpm.cc:1049
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1071
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1559
+#: apt-pkg/deb/dpkgpm.cc:1558
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1621
+#: apt-pkg/deb/dpkgpm.cc:1620
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1626
+#: apt-pkg/deb/dpkgpm.cc:1625
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1628
+#: apt-pkg/deb/dpkgpm.cc:1627
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1634
+#: apt-pkg/deb/dpkgpm.cc:1633
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1641
+#: apt-pkg/deb/dpkgpm.cc:1640
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
+#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1675
+#: apt-pkg/deb/dpkgpm.cc:1674
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""