X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/b3c63712e4e54e3743c302416528423def4eefbb..9ffbac99e52c91182ed8ff8678a994626b194e69:/po/ne.po

diff --git a/po/ne.po b/po/ne.po
index 41f225d26..ac349184a 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-12-07 15:31+0100\n"
+"POT-Creation-Date: 2016-08-04 10:25+0200\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"
@@ -231,10 +231,10 @@ msgid ""
 "unauthenticated"
 msgstr "त्यहाँ समस्याहरू छन् र हुन्छलाई जोड नगरिकन -y को प्रयोग भयो"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "%s  %s तान्न असफल भयो\n"
+msgid "Failed to fetch %s  %s"
+msgstr "%s  %s तान्न असफल भयो"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -250,6 +250,37 @@ msgstr "तपाईँ संग %s मा पर्याप्त खाल
 msgid "Unable to lock the download directory"
 msgstr "डाउनलोड डाइरेक्ट्री ताल्चा मार्न असक्षम"
 
+#: apt-private/private-install.cc
+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"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"केही प्याकेजहरू स्थापना हुन सक्दैन । यसको मतलब तपाईँले\n"
+" एउटा असम्भव अवास्थाको अनुरोध गर्नु भएको छ वा यदि तपाईँले प्रयोग गर्नु भइरहेको केहि "
+"प्याकेजहरुको आवश्यकता पर्ने अस्थिर\n"
+" वितरण अहिले सम्म सिर्जना\n"
+" भएको छैन वा आवगमन विनानै सर्यो ।"
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc
+msgid "The following information may help to resolve the situation:"
+msgstr "निम्न सूचनाले अवस्थालाई हल गर्न मद्दत गर्नेछ: "
+
+#: apt-private/private-install.cc
+msgid "Broken packages"
+msgstr "भाँचिएका प्याकेजहरू"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "आन्तरिक त्रुटि, स्थापना प्याकेजहरुलाई भाँचिएको प्याकेज भनिन्थ्यो!"
@@ -394,20 +425,6 @@ msgid ""
 "shouldn't happen. Please file a bug report against apt."
 msgstr ""
 
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc
-msgid "The following information may help to resolve the situation:"
-msgstr "निम्न सूचनाले अवस्थालाई हल गर्न मद्दत गर्नेछ: "
-
 #: apt-private/private-install.cc
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
@@ -450,23 +467,6 @@ msgstr ""
 "नभेटिएका निर्भरताहरू । प्याकेजहरू बिना 'apt-get -f install' प्रयास गर्नुहोस् ( वा "
 "समाधान निर्दिष्ट गर्नुहोस्) ।"
 
-#: apt-private/private-install.cc
-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"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"केही प्याकेजहरू स्थापना हुन सक्दैन । यसको मतलब तपाईँले\n"
-" एउटा असम्भव अवास्थाको अनुरोध गर्नु भएको छ वा यदि तपाईँले प्रयोग गर्नु भइरहेको केहि "
-"प्याकेजहरुको आवश्यकता पर्ने अस्थिर\n"
-" वितरण अहिले सम्म सिर्जना\n"
-" भएको छैन वा आवगमन विनानै सर्यो ।"
-
-#: apt-private/private-install.cc
-msgid "Broken packages"
-msgstr "भाँचिएका प्याकेजहरू"
-
 #: apt-private/private-install.cc
 #, fuzzy
 msgid "The following additional packages will be installed:"
@@ -528,12 +528,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+#. TRANSLATORS: placeholder is a binary name like apt or apt-get
 #: apt-private/private-main.cc
+#, c-format
 msgid ""
 "NOTE: This is only a simulation!\n"
-"      apt-get needs root privileges for real execution.\n"
+"      %s needs root privileges for real execution.\n"
 "      Keep also in mind that locking is deactivated,\n"
-"      so don't depend on the relevance to the real current situation!"
+"      so don't depend on the relevance to the real current situation!\n"
 msgstr ""
 
 #: apt-private/private-output.cc apt-private/private-show.cc
@@ -744,10 +746,6 @@ msgstr "क्यास sync  भन्दा बाहिर छ, प्या
 msgid "Pinned packages:"
 msgstr "पिन गरिएका प्याकेजहरू:"
 
-#: apt-private/private-show.cc
-msgid "(not found)"
-msgstr "(फेला परेन)"
-
 #. Print the package name and the version we are forcing to
 #: apt-private/private-show.cc
 #, c-format
@@ -766,10 +764,6 @@ msgstr "  उमेद्वार:"
 msgid "(none)"
 msgstr "(कुनै पनि होइन)"
 
-#: apt-private/private-show.cc
-msgid "  Package pin: "
-msgstr "प्याकेज पिन:"
-
 #. Show the priority tables
 #: apt-private/private-show.cc
 msgid "  Version table:"
@@ -872,51 +866,6 @@ msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याक
 msgid "Build command '%s' failed.\n"
 msgstr "निर्माण आदेश '%s' असफल भयो ।\n"
 
-#: apt-private/private-source.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन"
-
-#: apt-private/private-source.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन"
-
-#: apt-private/private-source.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr "%s को लागि %s निर्भरता सन्तुष्ट पार्न असफल भयो: स्थापित प्याकेज %s अति नयाँ छ"
-
-#: apt-private/private-source.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले संस्करण "
-"आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन "
-
-#: apt-private/private-source.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन"
-
-#: apt-private/private-source.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "%s को लागि %s निर्भरता सन्तुष्ट गर्न असफल: %s"
-
-#: apt-private/private-source.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । "
-
 #: apt-private/private-source.cc
 #, c-format
 msgid "Unable to get build-dependency information for %s"
@@ -1285,6 +1234,7 @@ msgstr ""
 #: cmdline/apt-helper.cc
 msgid ""
 "Usage: apt-helper [options] command\n"
+"       apt-helper [options] cat-file file ...\n"
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper bundles a variety of commands for shell scripts to use\n"
@@ -1299,6 +1249,10 @@ msgstr ""
 msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "concatenate files, with automatic decompression"
+msgstr ""
+
 #: cmdline/apt-helper.cc
 msgid "detect proxy using apt.conf"
 msgstr ""
@@ -1551,14 +1505,10 @@ msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट
 msgid "Unable to connect to %s:%s:"
 msgstr "%s %s मा जडान गर्न असफल भयो:"
 
-#: methods/copy.cc methods/gzip.cc methods/rred.cc
+#: methods/copy.cc
 msgid "Failed to stat"
 msgstr "स्थिर गर्न असफल भयो"
 
-#: methods/copy.cc methods/gzip.cc methods/rred.cc
-msgid "Failed to set modification time"
-msgstr "परिमार्जन समय सेट असफल भयो"
-
 #: methods/file.cc
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "अवैध URl, स्थानिय URIS // संग सुरू हुन सक्दैन"
@@ -1710,6 +1660,21 @@ msgstr "क्वेरी"
 msgid "Unable to invoke "
 msgstr "आह्वान गर्न असक्षम भयो"
 
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc apt-pkg/acquire-item.cc
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc
+#, c-format
+msgid ""
+"Signed file isn't valid, got '%s' (does the network require authentication?)"
+msgstr ""
+
 #: methods/gpgv.cc
 msgid "At least one invalid signature was encountered."
 msgstr "कम्तिमा एउटा अवैध हस्ताक्षर विरोध भयो ।"
@@ -1724,18 +1689,16 @@ msgstr "आन्तरिक त्रुटि: असल हस्ताक
 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 msgstr "हस्ताक्षर रूजू गर्न '%s' कार्यन्वयन गर्न सकिएन (के gnupg स्थापना भयो?)"
 
-#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"Clearsigned file isn't valid, got '%s' (does the network require "
-"authentication?)"
-msgstr ""
-
 #: methods/gpgv.cc
 msgid "Unknown error executing apt-key"
 msgstr "apt-key कार्यन्वयन गर्दा अज्ञात त्रुटि"
 
+#. TRANSLATORS: The second %s is the reason and is untranslated for repository owners.
+#: methods/gpgv.cc
+#, c-format
+msgid "Signature by key %s uses weak digest algorithm (%s)"
+msgstr ""
+
 #: methods/gpgv.cc
 msgid "The following signatures were invalid:\n"
 msgstr "निम्न हस्ताक्षरहरू अवैध छन्:\n"
@@ -1746,10 +1709,6 @@ msgid ""
 "available:\n"
 msgstr "निम्न हस्ताक्षरहरू रूजू हुन सक्दैन किन भने सार्वजनिक कुञ्जी उपलब्ध छैन:\n"
 
-#: methods/gzip.cc
-msgid "Empty files can't be valid archives"
-msgstr ""
-
 #: methods/http.cc
 msgid "Error writing to the file"
 msgstr "फाइलमा त्रुटि लेखिदैछ"
@@ -1817,6 +1776,16 @@ msgstr "फाइल %s खोल्न सकिएन"
 msgid "[Mirror: %s]"
 msgstr ""
 
+#: methods/rred.cc ftparchive/cachedb.cc apt-inst/extract.cc
+#: apt-pkg/acquire-item.cc
+#, c-format
+msgid "Failed to stat %s"
+msgstr " %s स्थिर गर्न असफल"
+
+#: methods/rred.cc
+msgid "Failed to set modification time"
+msgstr "परिमार्जन समय सेट असफल भयो"
+
 #: methods/rsh.cc ftparchive/multicompress.cc
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "सहायक प्रक्रियामा IPC पाइप सिर्जना गर्न असफल"
@@ -1872,6 +1841,10 @@ msgstr ""
 msgid "Internal error"
 msgstr "आन्तरिक त्रुटि"
 
+#: methods/store.cc
+msgid "Empty files can't be valid archives"
+msgstr ""
+
 #: dselect/install:33
 msgid "Bad default setting!"
 msgstr "खराब पूर्वनिर्धारण सेटिङ्ग!"
@@ -1911,6 +1884,20 @@ msgstr ""
 msgid "Merging available information"
 msgstr "उपलब्ध सूचना गाँभिदैछ"
 
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन"
+
 #: cmdline/apt-extracttemplates.cc
 #, fuzzy
 msgid ""
@@ -1945,6 +1932,26 @@ msgstr " %s मा लेख्न असक्षम"
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr " debconf संस्करण प्राप्त गर्न सकिएन । के debconf स्थापना भयो ? "
 
+#: cmdline/apt-internal-planner.cc
+#, fuzzy
+msgid ""
+"Usage: apt-internal-planner\n"
+"\n"
+"apt-internal-planner is an interface to use the current internal\n"
+"installation planner for the APT family like an external one,\n"
+"for debugging or the like.\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-internal-solver.cc
 #, fuzzy
 msgid ""
@@ -2113,11 +2120,6 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "DB फाइल %s असक्षम भयो: %s"
 
-#: ftparchive/cachedb.cc apt-inst/extract.cc
-#, c-format
-msgid "Failed to stat %s"
-msgstr " %s स्थिर गर्न असफल"
-
 #: ftparchive/cachedb.cc
 #, fuzzy
 msgid "Failed to read .dsc"
@@ -2244,7 +2246,7 @@ msgstr "%s खोल्न असफल"
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc
+#: ftparchive/writer.cc apt-pkg/acquire-item.cc
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "लिङ्क पढ्न असफल %s"
@@ -2451,16 +2453,51 @@ msgid ""
 "details."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "पुन:नामकरण असफल गरियो, %s (%s -> %s) ।"
+#: apt-pkg/acquire-item.cc
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "डाइरेक्ट्री %s फेरियो "
+
+#: apt-pkg/acquire-item.cc
+#, fuzzy, c-format
+msgid "The repository '%s' does no longer have a Release file."
+msgstr "डाइरेक्ट्री %s फेरियो "
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "डाइरेक्ट्री %s फेरियो "
+
+#: apt-pkg/acquire-item.cc
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "डाइरेक्ट्री %s फेरियो "
+
+#: apt-pkg/acquire-item.cc
+#, fuzzy, c-format
+msgid "The repository '%s' provides only weak security information."
+msgstr "डाइरेक्ट्री %s फेरियो "
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "MD5Sum मेल भएन"
 
+#: apt-pkg/acquire-item.cc
+msgid "Insufficient information available to perform this download securely"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "पुन:नामकरण असफल गरियो, %s (%s -> %s) ।"
+
 #: apt-pkg/acquire-item.cc
 msgid "Size mismatch"
 msgstr "साइज मेल खाएन"
@@ -2503,8 +2540,11 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/acquire-item.cc
-msgid "There is no public key available for the following key IDs:\n"
-msgstr "निम्न कुञ्जी IDs को लागि कुनै सार्वजनिक कुञ्जी उपलब्ध छैन:\n"
+#, c-format
+msgid ""
+"Skipping acquire of configured file '%s' as repository '%s' provides only "
+"weak security information for it"
+msgstr ""
 
 #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
 #. the time since then the file is invalid - formatted in the same way as in
@@ -2521,33 +2561,6 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#. No Release file was present, or verification failed, so fall
-#. back to queueing Packages files without verification
-#. only allow going further if the user explicitly wants it
-#: apt-pkg/acquire-item.cc
-#, fuzzy, c-format
-msgid "The repository '%s' is not signed."
-msgstr "डाइरेक्ट्री %s फेरियो "
-
-#. No Release file was present so fall
-#. back to queueing Packages files without verification
-#. only allow going further if the user explicitly wants it
-#: apt-pkg/acquire-item.cc
-#, fuzzy, c-format
-msgid "The repository '%s' does not have a Release file."
-msgstr "डाइरेक्ट्री %s फेरियो "
-
-#: apt-pkg/acquire-item.cc
-#, fuzzy, c-format
-msgid "The repository '%s' is no longer signed."
-msgstr "डाइरेक्ट्री %s फेरियो "
-
-#: apt-pkg/acquire-item.cc
-msgid ""
-"This is normally not allowed, but the option Acquire::"
-"AllowDowngradeToInsecureRepositories was given to override it."
-msgstr ""
-
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -2964,11 +2977,6 @@ msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन"
-
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -2995,14 +3003,8 @@ msgid "Problem closing the gzip file %s"
 msgstr "फाइल बन्द गर्दा समस्या"
 
 #: apt-pkg/contrib/fileutl.cc
-#, c-format
-msgid "Could not open file %s"
-msgstr "फाइल %s खोल्न सकिएन"
-
-#: apt-pkg/contrib/fileutl.cc
-#, fuzzy, c-format
-msgid "Could not open file descriptor %d"
-msgstr "%s को लागि पाइप खोल्न सकिएन"
+msgid "Unexpected end of file"
+msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc
 msgid "Failed to create subprocess IPC"
@@ -3012,6 +3014,16 @@ msgstr "सहायक प्रक्रिया IPC सिर्जना 
 msgid "Failed to exec compressor "
 msgstr "सङ्कुचनकर्ता कार्यान्वयन गर्न असफल भयो"
 
+#: apt-pkg/contrib/fileutl.cc
+#, c-format
+msgid "Could not open file %s"
+msgstr "फाइल %s खोल्न सकिएन"
+
+#: apt-pkg/contrib/fileutl.cc
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "%s को लागि पाइप खोल्न सकिएन"
+
 #: apt-pkg/contrib/fileutl.cc
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
@@ -3170,13 +3182,15 @@ msgid "No Hash entry in Release file %s"
 msgstr ""
 
 #: apt-pkg/deb/debmetaindex.cc
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
+#, c-format
+msgid ""
+"No Hash entry in Release file %s which is considered strong enough for "
+"security purposes"
+msgstr ""
 
 #: apt-pkg/deb/debmetaindex.cc
 #, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgid "Invalid '%s' entry in Release file %s"
 msgstr "घुमाउरो फाइलमा अवैध लाइन:%s"
 
 #. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
@@ -3190,6 +3204,11 @@ msgstr ""
 msgid "Invalid value set for option %s regarding source %s %s (%s)"
 msgstr ""
 
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
 #: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
 #, c-format
 msgid "Unable to parse package file %s (%d)"
@@ -3249,13 +3268,18 @@ msgstr ""
 msgid "Running post-installation trigger %s"
 msgstr ""
 
+#: apt-pkg/deb/dpkgpm.cc
+#, c-format
+msgid "Installed %s"
+msgstr " %s स्थापना भयो"
+
 #. FIXME: use a better string after freeze
 #: apt-pkg/deb/dpkgpm.cc
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।"
 
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "फाइल %s खोल्न सकिएन"
@@ -3275,11 +3299,6 @@ msgstr " %s अनप्याक गरिदैछ"
 msgid "Preparing to configure %s"
 msgstr " %s कनफिगर गर्न तयार गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Installed %s"
-msgstr " %s स्थापना भयो"
-
 #: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Preparing for removal of %s"
@@ -3398,6 +3417,22 @@ msgstr ""
 msgid "Execute external solver"
 msgstr ""
 
+#: apt-pkg/edsp.cc
+msgid "Execute external planner"
+msgstr ""
+
+#: apt-pkg/edsp.cc
+msgid "Send request to planner"
+msgstr ""
+
+#: apt-pkg/edsp.cc
+msgid "Send scenario to planner"
+msgstr ""
+
+#: apt-pkg/edsp.cc
+msgid "External planner failed without a proper error message"
+msgstr ""
+
 #: apt-pkg/indexcopy.cc
 #, c-format
 msgid "Wrote %i records.\n"
@@ -3481,11 +3516,6 @@ msgstr "प्याकेज क्यास फाइल दूषित भ
 msgid "The package cache file is an incompatible version"
 msgstr "प्याकेज क्यास फाइल एउटा अमिल्दो संस्करण हो"
 
-#: apt-pkg/pkgcache.cc
-#, fuzzy
-msgid "The package cache file is corrupted, it is too small"
-msgstr "प्याकेज क्यास फाइल दूषित भयो "
-
 #: apt-pkg/pkgcache.cc
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
@@ -3496,6 +3526,11 @@ msgstr "यो APT ले संस्करण प्रणालीलाई 
 msgid "The package cache was built for different architectures: %s vs %s"
 msgstr "प्याकेज क्यास विभिन्न वास्तुकलाको लागि निर्माण भएको हो"
 
+#: apt-pkg/pkgcache.cc
+#, fuzzy
+msgid "The package cache file is corrupted, it has the wrong hash"
+msgstr "प्याकेज क्यास फाइल दूषित भयो "
+
 #: apt-pkg/pkgcache.cc
 msgid "Depends"
 msgstr "आधारित"
@@ -3532,14 +3567,14 @@ msgstr ""
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc
-msgid "important"
-msgstr "महत्वपूर्ण"
-
 #: apt-pkg/pkgcache.cc
 msgid "required"
 msgstr "आवश्यक"
 
+#: apt-pkg/pkgcache.cc
+msgid "important"
+msgstr "महत्वपूर्ण"
+
 #: apt-pkg/pkgcache.cc
 msgid "standard"
 msgstr "मानक"
@@ -3661,14 +3696,9 @@ msgstr "तपाईँको स्रोत सूचिमा केही 's
 
 #: apt-pkg/tagfile.cc
 #, c-format
-msgid "Cannot convert %s to integer"
+msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "%s  %s तान्न असफल भयो\n"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""
@@ -3682,6 +3712,55 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "स्तर वृद्धि गणना गरिदैछ"
 
+#~ msgid "(not found)"
+#~ msgstr "(फेला परेन)"
+
+#~ msgid "  Package pin: "
+#~ msgstr "प्याकेज पिन:"
+
+#~ msgid "There is no public key available for the following key IDs:\n"
+#~ msgstr "निम्न कुञ्जी IDs को लागि कुनै सार्वजनिक कुञ्जी उपलब्ध छैन:\n"
+
+#, fuzzy
+#~ msgid "The repository is insufficiently signed by key %s (%s)"
+#~ msgstr "डाइरेक्ट्री %s फेरियो "
+
+#, fuzzy
+#~ msgid ""
+#~ "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+#~ "packages"
+#~ msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन"
+
+#~ msgid ""
+#~ "%s dependency for %s cannot be satisfied because the package %s cannot be "
+#~ "found"
+#~ msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन"
+
+#~ msgid ""
+#~ "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+#~ msgstr ""
+#~ "%s को लागि %s निर्भरता सन्तुष्ट पार्न असफल भयो: स्थापित प्याकेज %s अति नयाँ छ"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s dependency for %s cannot be satisfied because candidate version of "
+#~ "package %s can't satisfy version requirements"
+#~ msgstr ""
+#~ "%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले "
+#~ "संस्करण आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन "
+
+#, fuzzy
+#~ msgid ""
+#~ "%s dependency for %s cannot be satisfied because package %s has no "
+#~ "candidate version"
+#~ msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन"
+
+#~ msgid "Failed to satisfy %s dependency for %s: %s"
+#~ msgstr "%s को लागि %s निर्भरता सन्तुष्ट गर्न असफल: %s"
+
+#~ msgid "Build-dependencies for %s could not be satisfied."
+#~ msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । "
+
 #~ msgid "Problem unlinking %s"
 #~ msgstr "समस्या अनलिङ्क भइरहेछ %s"