Update PO files

diff --git a/po/ChangeLog b/po/ChangeLog
index 2ad5351e469b7b45757a12fc3533bc39a5e5cfad..0817285c7a4aaba2ccbe5aa3eb02f660ca8ec24f 100644 (file)
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-23  Christian Perrier  <bubulle@debian.org>
+
+       * Update all PO files and apt-all.pot. 545 strings.
+         Formerly complete PO files are now 539t1f6u
+

 2009-03-19  Ivan Masár  <helix84@centrum.sk>
 
        * sk.po: Updated to 539t
 2009-03-19  Ivan Masár  <helix84@centrum.sk>
 
        * sk.po: Updated to 539t

diff --git a/po/ar.po b/po/ar.po
index 058fc120dfe9b7df5f3cccb824c57011f275928c..4cc0cafc09f857114f8dd1540dd34eadc0f67e4d 100644 (file)
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt_po\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2006-10-20 21:28+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
 "PO-Revision-Date: 2006-10-20 21:28+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"


@@ -161,7 +161,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s لـ%s %s مُجمّع على %s %s\n"
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s لـ%s %s مُجمّع على %s %s\n"


@@ -559,7 +559,7 @@ msgstr "فشل تغيير اسم %s إلى %s"
 msgid "Y"
 msgstr "Y"
 
 msgid "Y"
 msgstr "Y"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""


@@ -720,11 +720,11 @@ msgstr "حزم بحاجة للإزالة لكن الإزالة مُعطّلة."
 msgid "Internal error, Ordering didn't finish"
 msgstr "خطأ داخلي، لم تنته عملية الترتيب"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "خطأ داخلي، لم تنته عملية الترتيب"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "تعذر قَفْل دليل التنزيل"
 
 msgid "Unable to lock the download directory"
 msgstr "تعذر قَفْل دليل التنزيل"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "تعذرت قراءة قائمة المصادر."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "تعذرت قراءة قائمة المصادر."


@@ -753,7 +753,7 @@ msgstr "بعد الاستخراج %sب من المساحة الإضافيّة س
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "تعذر حساب المساحة الحرة في %s"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "تعذر حساب المساحة الحرة في %s"


@@ -790,7 +790,7 @@ msgstr "إجهاض."
 msgid "Do you want to continue [Y/n]? "
 msgstr "هل تريد الاستمرار [Y/n]؟"
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "هل تريد الاستمرار [Y/n]؟"
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "فشل إحضار %s  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "فشل إحضار %s  %s\n"


@@ -799,7 +799,7 @@ msgstr "فشل إحضار %s  %s\n"
 msgid "Some files failed to download"
 msgstr "فشل تنزيل بعض الملفات"
 
 msgid "Some files failed to download"
 msgstr "فشل تنزيل بعض الملفات"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "اكتمل التنزيل وفي وضع التنزيل فقط"
 
 msgid "Download complete and in download only mode"
 msgstr "اكتمل التنزيل وفي وضع التنزيل فقط"
 


@@ -893,30 +893,35 @@ msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'"
 msgid "Selected version %s (%s) for %s\n"
 msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "لا يقبل الأمر update أية مُعطيات"
 
 msgid "The update command takes no arguments"
 msgstr "لا يقبل الأمر update أية مُعطيات"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "تعذر قفل دليل القائمة"
 
 msgid "Unable to lock the list directory"
 msgstr "تعذر قفل دليل القائمة"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "سيتم تثبيت الحزم الجديدة التالية:"
 
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "سيتم تثبيت الحزم الجديدة التالية:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -932,51 +937,51 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "قد تساعد المعلومات التالية في حل المشكلة:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "قد تساعد المعلومات التالية في حل المشكلة:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
 
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "تعذر العثور على الحزمة %s"
 
 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "تعذر العثور على الحزمة %s"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "تعذر العثور على الحزمة %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "تعذر العثور على الحزمة %s"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "لاحظ، تحديد %s بسبب صيغة regex '%s'\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "لاحظ، تحديد %s بسبب صيغة regex '%s'\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "إلا أنه سيتم تثبيت %s"
 
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "إلا أنه سيتم تثبيت %s"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "قد ترغب بتشغيل `apt-get -f install' لتصحيح هذه:"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "قد ترغب بتشغيل `apt-get -f install' لتصحيح هذه:"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 "مُعتمدات غير مستوفاة. جرب 'apt-get -f install' بدون أسماء حزم (أو حدّد حلاً)."
 
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 "مُعتمدات غير مستوفاة. جرب 'apt-get -f install' بدون أسماء حزم (أو حدّد حلاً)."
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -984,152 +989,152 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
 "or been moved out of Incoming."
 msgstr ""
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "حزم معطوبة"
 
 msgid "Broken packages"
 msgstr "حزم معطوبة"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "سيتم تثبيت الحزم الإضافيّة التالية:"
 
 msgid "The following extra packages will be installed:"
 msgstr "سيتم تثبيت الحزم الإضافيّة التالية:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "الحزم المقترحة:"
 
 msgid "Suggested packages:"
 msgstr "الحزم المقترحة:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "الحزم المستحسنة:"
 
 msgid "Recommended packages:"
 msgstr "الحزم المستحسنة:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "حساب الترقية..."
 
 msgid "Calculating upgrade... "
 msgstr "حساب الترقية..."
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "فشل"
 
 msgid "Failed"
 msgstr "فشل"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "تمّ"
 
 msgid "Done"
 msgstr "تمّ"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "تعذر العثور على مصدر الحزمة %s"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "تعذر العثور على مصدر الحزمة %s"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "تخطي الملف '%s' المنزل مسبقاً\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "تخطي الملف '%s' المنزل مسبقاً\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "ليس هناك مساحة كافية في %s"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "ليس هناك مساحة كافية في %s"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "يجب جلب %sب/%sب من الأرشيفات المصدرية.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "يجب جلب %sب/%sب من الأرشيفات المصدرية.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "إحضار المصدر %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "إحضار المصدر %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "فشل إحضار بعض الأرشيفات."
 
 msgid "Failed to fetch some archives."
 msgstr "فشل إحضار بعض الأرشيفات."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "أمر فك الحزمة '%s' فشل.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "أمر فك الحزمة '%s' فشل.\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "أمر البناء '%s' فشل.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "أمر البناء '%s' فشل.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr ""
 
 msgid "Child process failed"
 msgstr ""
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
 
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr ""
 
 msgid "Failed to process build dependencies"
 msgstr ""
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "الوحدات المدعومة:"
 
 msgid "Supported modules:"
 msgstr "الوحدات المدعومة:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1145,7 +1150,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1688,7 +1693,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr "تعذر قبول الاتصال"
 
 msgid "Unable to accept connection"
 msgstr "تعذر قبول الاتصال"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr ""
 
 msgid "Problem hashing file"
 msgstr ""
 


@@ -1772,38 +1777,38 @@ msgstr ""
 msgid "Unable to connect to %s %s:"
 msgstr "تعذر الاتصال بـ%s %s:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "تعذر الاتصال بـ%s %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr ""
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr ""
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr ""
 
 msgid "At least one invalid signature was encountered."
 msgstr ""
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr ""
 
 msgid "Unknown error executing gpgv"
 msgstr ""
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr ""
 
 msgid "The following signatures were invalid:\n"
 msgstr ""
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -1819,81 +1824,81 @@ msgstr ""
 msgid "Read error from %s process"
 msgstr ""
 
 msgid "Read error from %s process"
 msgstr ""
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "بانتظار الترويسات"
 
 msgid "Waiting for headers"
 msgstr "بانتظار الترويسات"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr ""
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr ""
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "سطر ترويسة سيء"
 
 msgid "Bad header line"
 msgstr "سطر ترويسة سيء"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "أرسل خادم http ترويسة ردّ غير صالحة"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "أرسل خادم http ترويسة ردّ غير صالحة"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "أرسل خادم http ترويسة طول محتويات (ِContent-Length) غير صالحة"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "أرسل خادم http ترويسة طول محتويات (ِContent-Length) غير صالحة"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "أرسل خادم http ترويسة مدى محتويات (ِContent-Range) غير صالحة"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "أرسل خادم http ترويسة مدى محتويات (ِContent-Range) غير صالحة"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "خادم http له دعم مدى معطوب"
 
 msgid "This HTTP server has broken range support"
 msgstr "خادم http له دعم مدى معطوب"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "نسق تاريخ مجهول"
 
 msgid "Unknown date format"
 msgstr "نسق تاريخ مجهول"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "فشل التحديد"
 
 msgid "Select failed"
 msgstr "فشل التحديد"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "انتهى وقت الاتصال"
 
 msgid "Connection timed out"
 msgstr "انتهى وقت الاتصال"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "خطأ في الكتابة إلى ملف المُخرجات"
 
 msgid "Error writing to output file"
 msgstr "خطأ في الكتابة إلى ملف المُخرجات"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "خطأ في الكتابة إلى الملف"
 
 msgid "Error writing to file"
 msgstr "خطأ في الكتابة إلى الملف"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "خطأ في الكتابة إلى الملف"
 
 msgid "Error writing to the file"
 msgstr "خطأ في الكتابة إلى الملف"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "خطأ في القراءة من الخادم. أقفل الطرف الآخر الاتصال"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "خطأ في القراءة من الخادم. أقفل الطرف الآخر الاتصال"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "خطأ في القراءة من الخادم"
 
 msgid "Error reading from server"
 msgstr "خطأ في القراءة من الخادم"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "فشلت كتابة الملف %s"
 
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "فشلت كتابة الملف %s"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "بيانات ترويسة سيئة"
 
 msgid "Bad header data"
 msgstr "بيانات ترويسة سيئة"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "فشل الاتصال"
 
 msgid "Connection failed"
 msgstr "فشل الاتصال"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "خطأ داخلي"
 
 msgid "Internal error"
 msgstr "خطأ داخلي"
 


@@ -1913,7 +1918,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "تعذر العثور على التحديد %s"
 #, c-format
 msgid "Selection %s not found"
 msgstr "تعذر العثور على التحديد %s"


@@ -2333,7 +2362,7 @@ msgstr ""
 msgid "Method %s did not start correctly"
 msgstr ""
 
 msgid "Method %s did not start correctly"
 msgstr ""
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "الرجاء إدخال القرص المُسمّى  '%s' في السوّاقة '%s' وضغط مفتاح الإدخال."
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "الرجاء إدخال القرص المُسمّى  '%s' في السوّاقة '%s' وضغط مفتاح الإدخال."


@@ -2688,10 +2717,14 @@ msgstr "التحضير لإزالة %s بالكامل"
 msgid "Completely removed %s"
 msgstr "تمت إزالة %s بالكامل"
 
 msgid "Completely removed %s"
 msgstr "تمت إزالة %s بالكامل"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr ""
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr ""

diff --git a/po/bg.po b/po/bg.po
index d653dfb5e4efcfe4ec6713dc3b0e983b8559af94..fa835de1a90e69fc03078013f1090d7c472d99e1 100644 (file)
--- a/po/bg.po
+++ b/po/bg.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.21\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt 0.7.21\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2009-01-27 12:41+0200\n"
 "Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "PO-Revision-Date: 2009-01-27 12:41+0200\n"
 "Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"


@@ -161,7 +161,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s за %s компилиран на %s %s\n"
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s за %s компилиран на %s %s\n"


@@ -665,7 +665,7 @@ msgstr "Неуспех при преименуването на %s на %s"
 msgid "Y"
 msgstr "Y"
 
 msgid "Y"
 msgstr "Y"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Грешка при компилирането на регулярния израз - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Грешка при компилирането на регулярния израз - %s"


@@ -828,11 +828,11 @@ msgstr "Трябва да бъдат премахнати пакети, но п
 msgid "Internal error, Ordering didn't finish"
 msgstr "Вътрешна грешка, „Ordering“ не завърши"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "Вътрешна грешка, „Ordering“ не завърши"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "Неуспех при заключването на директорията за изтегляне"
 
 msgid "Unable to lock the download directory"
 msgstr "Неуспех при заключването на директорията за изтегляне"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Списъкът с източници не можа да бъде прочетен."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Списъкът с източници не можа да бъде прочетен."


@@ -864,7 +864,7 @@ msgstr ""
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "След тази операция ще бъде освободено %sB дисково пространство.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "След тази операция ще бъде освободено %sB дисково пространство.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Неуспех при определянето на свободното пространство в %s"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Неуспех при определянето на свободното пространство в %s"


@@ -901,7 +901,7 @@ msgstr "Прекъсване."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Искате ли да продължите [Y/n]? "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "Искате ли да продължите [Y/n]? "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Неуспех при изтеглянето на %s  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Неуспех при изтеглянето на %s  %s\n"


@@ -910,7 +910,7 @@ msgstr "Неуспех при изтеглянето на %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Някои файлове не можаха да бъдат изтеглени"
 
 msgid "Some files failed to download"
 msgstr "Някои файлове не можаха да бъдат изтеглени"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "Изтеглянето завърши в режим само на изтегляне"
 
 msgid "Download complete and in download only mode"
 msgstr "Изтеглянето завърши в режим само на изтегляне"
 


@@ -1007,30 +1007,35 @@ msgstr "Не е намерена версия „%s“ на „%s“"
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Избрана е версия %s (%s) за %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Избрана е версия %s (%s) за %s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "Командата „update“ не възприема аргументи"
 
 msgid "The update command takes no arguments"
 msgstr "Командата „update“ не възприема аргументи"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "Неуспех при заключването на директорията със списъка на пакетите"
 
 msgid "Unable to lock the list directory"
 msgstr "Неуспех при заключването на директорията със списъка на пакетите"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Не би трябвало да се изтрива. AutoRemover няма да бъде стартиран"
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Не би трябвало да се изтрива. AutoRemover няма да бъде стартиран"
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 "Следните пакети са били инсталирани автоматично и вече не са необходими:"
 
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 "Следните пакети са били инсталирани автоматично и вече не са необходими:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Използвайте „apt-get autoremove“ за да ги премахнете."
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Използвайте „apt-get autoremove“ за да ги премахнете."
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1048,44 +1053,44 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr ""
 "Следната информация може да помогне за намиране на изход от ситуацията:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 "Следната информация може да помогне за намиране на изход от ситуацията:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Вътрешна грешка, AutoRemover счупи нещо в системата"
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Вътрешна грешка, AutoRemover счупи нещо в системата"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Неуспех при намирането на задача %s"
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Неуспех при намирането на задача %s"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Неуспех при намирането на пакет %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Неуспех при намирането на пакет %s"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Забележете, избиране на %s за регулярен израз „%s“\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Забележете, избиране на %s за регулярен израз „%s“\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s е отбелязан като ръчно инсталиран.\n"
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s е отбелязан като ръчно инсталиран.\n"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1093,7 +1098,7 @@ msgstr ""
 "Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или "
 "укажете разрешение)."
 
 "Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или "
 "укажете разрешение)."
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1105,118 +1110,118 @@ msgstr ""
 "дистрибуция, че някои необходими пакети още не са създадени или пък\n"
 "са били преместени от Incoming."
 
 "дистрибуция, че някои необходими пакети още не са създадени или пък\n"
 "са били преместени от Incoming."
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "Счупени пакети"
 
 msgid "Broken packages"
 msgstr "Счупени пакети"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "Следните допълнителни пакети ще бъдат инсталирани:"
 
 msgid "The following extra packages will be installed:"
 msgstr "Следните допълнителни пакети ще бъдат инсталирани:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "Предложени пакети:"
 
 msgid "Suggested packages:"
 msgstr "Предложени пакети:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "Препоръчвани пакети:"
 
 msgid "Recommended packages:"
 msgstr "Препоръчвани пакети:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "Изчисляване на актуализацията..."
 
 msgid "Calculating upgrade... "
 msgstr "Изчисляване на актуализацията..."
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "Неуспех"
 
 msgid "Failed"
 msgstr "Неуспех"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "Готово"
 
 msgid "Done"
 msgstr "Готово"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Неуспех при намирането на изходен код на пакет %s"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Неуспех при намирането на изходен код на пакет %s"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Пропускане на вече изтегления файл „%s“\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Пропускане на вече изтегления файл „%s“\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Нямате достатъчно свободно пространство в %s"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Нямате достатъчно свободно пространство в %s"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Изтегляне на изходен код %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Изтегляне на изходен код %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "Неуспех при изтеглянето на някои архиви."
 
 msgid "Failed to fetch some archives."
 msgstr "Неуспех при изтеглянето на някои архиви."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Командата за разпакетиране „%s“ пропадна.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Командата за разпакетиране „%s“ пропадна.\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Командата за компилиране „%s“ пропадна.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Командата за компилиране „%s“ пропадна.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "Процесът-потомък пропадна"
 
 msgid "Child process failed"
 msgstr "Процесът-потомък пропадна"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Трябва да укажете поне един пакет за проверка на зависимости за компилиране"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Трябва да укажете поне един пакет за проверка на зависимости за компилиране"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 "Неуспех при получаването на информация за зависимостите за компилиране на %s"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 "Неуспех при получаването на информация за зависимостите за компилиране на %s"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s няма зависимости за компилиране.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s няма зависимости за компилиране.\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "


@@ -1225,7 +1230,7 @@ msgstr ""
 "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s "
 "не може да бъде намерен"
 
 "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s "
 "не може да бъде намерен"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1235,32 +1240,33 @@ msgstr ""
 "налични версии на пакета %s, които могат да удовлетворят изискването за "
 "версия"
 
 "налични версии на пакета %s, които могат да удовлетворят изискването за "
 "версия"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният "
 "пакет %s е твърде нов"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният "
 "пакет %s е твърде нов"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени."
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "Неуспех при обработката на зависимостите за компилиране"
 
 msgid "Failed to process build dependencies"
 msgstr "Неуспех при обработката на зависимостите за компилиране"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "Поддържани модули:"
 
 msgid "Supported modules:"
 msgstr "Поддържани модули:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1276,7 +1282,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1879,7 +1885,7 @@ msgstr "Времето за установяване на връзка с гне
 msgid "Unable to accept connection"
 msgstr "Невъзможно е да се приеме свързването"
 
 msgid "Unable to accept connection"
 msgstr "Невъзможно е да се приеме свързването"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "Проблем при хеширане на файла"
 
 msgid "Problem hashing file"
 msgstr "Проблем при хеширане на файла"
 


@@ -1963,44 +1969,44 @@ msgstr "Нещо лошо се случи при намирането на IP а
 msgid "Unable to connect to %s %s:"
 msgstr "Неуспех при свързването с %s %s:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "Неуспех при свързването с %s %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Неуспех при достъпа до набор на ключове: „%s“"
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Неуспех при достъпа до набор на ключове: „%s“"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: Списъкът с аргументи от Acquire::gpgv::Options е твърде дълъг. Завършване "
 "на работа."
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: Списъкът с аргументи от Acquire::gpgv::Options е твърде дълъг. Завършване "
 "на работа."
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Вътрешна грешка: Валиден подпис, но не може да се провери отпечатъка на "
 "ключа?!"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Вътрешна грешка: Валиден подпис, но не може да се провери отпечатъка на "
 "ключа?!"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "Намерен е поне един невалиден подпис."
 
 msgid "At least one invalid signature was encountered."
 msgstr "Намерен е поне един невалиден подпис."
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Неуспех при изпълнението на „%s“ за проверка на подписа (инсталиран ли е "
 "gpgv?)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Неуспех при изпълнението на „%s“ за проверка на подписа (инсталиран ли е "
 "gpgv?)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "Неизвестна грешка при изпълнението на gpgv"
 
 msgid "Unknown error executing gpgv"
 msgstr "Неизвестна грешка при изпълнението на gpgv"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "Следните подписи са невалидни:\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "Следните подписи са невалидни:\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -2018,80 +2024,80 @@ msgstr "Неуспех при отварянето на програмен ка
 msgid "Read error from %s process"
 msgstr "Грешка при четене от процес %s"
 
 msgid "Read error from %s process"
 msgstr "Грешка при четене от процес %s"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "Чакане на заглавни части"
 
 msgid "Waiting for headers"
 msgstr "Чакане на заглавни части"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Получен е един ред на заглавна част с над %u символа"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Получен е един ред на заглавна част с над %u символа"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "Невалиден ред на заглавна част"
 
 msgid "Bad header line"
 msgstr "Невалиден ред на заглавна част"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP сървърът изпрати невалидна заглавна част като отговор"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP сървърът изпрати невалидна заглавна част като отговор"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Length“"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Length“"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Range“"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Range“"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "HTTP сървърът няма поддръжка за прехвърляне на фрагменти на файлове"
 
 msgid "This HTTP server has broken range support"
 msgstr "HTTP сървърът няма поддръжка за прехвърляне на фрагменти на файлове"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "Неизвестен формат на дата"
 
 msgid "Unknown date format"
 msgstr "Неизвестен формат на дата"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "Неуспех на избора"
 
 msgid "Select failed"
 msgstr "Неуспех на избора"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "Допустимото време за свързване изтече"
 
 msgid "Connection timed out"
 msgstr "Допустимото време за свързване изтече"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "Грешка при записа на изходен файл"
 
 msgid "Error writing to output file"
 msgstr "Грешка при записа на изходен файл"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "Грешка при записа на файл"
 
 msgid "Error writing to file"
 msgstr "Грешка при записа на файл"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "Грешка при записа на файла"
 
 msgid "Error writing to the file"
 msgstr "Грешка при записа на файла"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "Грешка при четене от сървъра"
 
 msgid "Error reading from server"
 msgstr "Грешка при четене от сървъра"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 msgid "Failed to truncate file"
 msgstr "Неуспех при отрязване на края на файла"
 
 msgid "Failed to truncate file"
 msgstr "Неуспех при отрязване на края на файла"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "Невалидни данни на заглавната част"
 
 msgid "Bad header data"
 msgstr "Невалидни данни на заглавната част"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "Неуспех при свързването"
 
 msgid "Connection failed"
 msgstr "Неуспех при свързването"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "Вътрешна грешка"
 
 msgid "Internal error"
 msgstr "Вътрешна грешка"
 


@@ -2111,7 +2117,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "Изборът %s не е намерен"
 #, c-format
 msgid "Selection %s not found"
 msgstr "Изборът %s не е намерен"


@@ -2550,7 +2580,7 @@ msgstr "Неуспех при намирането на драйвер за ме
 msgid "Method %s did not start correctly"
 msgstr "Методът %s не стартира правилно"
 
 msgid "Method %s did not start correctly"
 msgstr "Методът %s не стартира правилно"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“."
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“."


@@ -2920,12 +2950,16 @@ msgstr "Подготовка за пълно премахване на %s"
 msgid "Completely removed %s"
 msgstr "%s е напълно премахнат"
 
 msgid "Completely removed %s"
 msgstr "%s е напълно премахнат"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Неуспех при запис в журнала, openpty() се провали (дали /dev/pts е "
 "монтирана?)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Неуспех при запис в журнала, openpty() се провали (дали /dev/pts е "
 "монтирана?)\n"
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Неуспех при закърпване на файла"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Неуспех при закърпване на файла"

diff --git a/po/bs.po b/po/bs.po
index b075425c7d2eb380d079859bf98aaba9e63429bc..3f94a879909765b9c4f08488a9b574d81c5dd796 100644 (file)
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2004-05-06 15:25+0100\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
 "PO-Revision-Date: 2004-05-06 15:25+0100\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"


@@ -157,7 +157,7 @@ msgstr ""
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr ""
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr ""


@@ -568,7 +568,7 @@ msgstr ""
 msgid "Y"
 msgstr ""
 
 msgid "Y"
 msgstr ""
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""


@@ -729,11 +729,11 @@ msgstr ""
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr ""
 
 msgid "Unable to lock the download directory"
 msgstr ""
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr ""
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr ""


@@ -762,7 +762,7 @@ msgstr ""
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr ""
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr ""


@@ -797,7 +797,7 @@ msgstr "Odustani."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Da li želite nastaviti? [Y/n]"
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "Da li želite nastaviti? [Y/n]"
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr ""
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr ""


@@ -806,7 +806,7 @@ msgstr ""
 msgid "Some files failed to download"
 msgstr ""
 
 msgid "Some files failed to download"
 msgstr ""
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr ""
 
 msgid "Download complete and in download only mode"
 msgstr ""
 


@@ -898,30 +898,35 @@ msgstr ""
 msgid "Selected version %s (%s) for %s\n"
 msgstr ""
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr ""
 
 msgid "The update command takes no arguments"
 msgstr ""
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr ""
 
 msgid "Unable to lock the list directory"
 msgstr ""
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Slijedeći NOVI paketi će biti instalirani:"
 
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Slijedeći NOVI paketi će biti instalirani:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -937,49 +942,49 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr ""
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ali se %s treba instalirati"
 
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ali se %s treba instalirati"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -987,152 +992,152 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
 "or been moved out of Incoming."
 msgstr ""
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "Oštećeni paketi"
 
 msgid "Broken packages"
 msgstr "Oštećeni paketi"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "Slijedeći dodatni paketi će biti instalirani:"
 
 msgid "The following extra packages will be installed:"
 msgstr "Slijedeći dodatni paketi će biti instalirani:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "Predloženi paketi:"
 
 msgid "Suggested packages:"
 msgstr "Predloženi paketi:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "Preporučeni paketi:"
 
 msgid "Recommended packages:"
 msgstr "Preporučeni paketi:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "Računam nadogradnju..."
 
 msgid "Calculating upgrade... "
 msgstr "Računam nadogradnju..."
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "Neuspješno"
 
 msgid "Failed"
 msgstr "Neuspješno"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "Urađeno"
 
 msgid "Done"
 msgstr "Urađeno"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr ""
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr ""
 
 msgid "Failed to fetch some archives."
 msgstr ""
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr ""
 
 msgid "Child process failed"
 msgstr ""
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
 
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr ""
 
 msgid "Failed to process build dependencies"
 msgstr ""
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "Podržani moduli:"
 
 msgid "Supported modules:"
 msgstr "Podržani moduli:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1148,7 +1153,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1687,7 +1692,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
 msgid "Unable to accept connection"
 msgstr ""
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr ""
 
 msgid "Problem hashing file"
 msgstr ""
 


@@ -1771,39 +1776,39 @@ msgstr ""
 msgid "Unable to connect to %s %s:"
 msgstr "Ne mogu se povezati sa %s %s:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "Ne mogu se povezati sa %s %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr ""
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr ""
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr ""
 
 msgid "At least one invalid signature was encountered."
 msgstr ""
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr ""
 
 msgid "Unknown error executing gpgv"
 msgstr ""
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Slijedeći dodatni paketi će biti instalirani:"
 
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Slijedeći dodatni paketi će biti instalirani:"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -1819,81 +1824,81 @@ msgstr ""
 msgid "Read error from %s process"
 msgstr ""
 
 msgid "Read error from %s process"
 msgstr ""
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "Čekam na zaglavlja"
 
 msgid "Waiting for headers"
 msgstr "Čekam na zaglavlja"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr ""
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr ""
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr ""
 
 msgid "Bad header line"
 msgstr ""
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr ""
 
 msgid "This HTTP server has broken range support"
 msgstr ""
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "Nepoznat oblik datuma"
 
 msgid "Unknown date format"
 msgstr "Nepoznat oblik datuma"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr ""
 
 msgid "Select failed"
 msgstr ""
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr ""
 
 msgid "Connection timed out"
 msgstr ""
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr ""
 
 msgid "Error writing to output file"
 msgstr ""
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr ""
 
 msgid "Error writing to file"
 msgstr ""
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr ""
 
 msgid "Error writing to the file"
 msgstr ""
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr ""
 
 msgid "Error reading from server"
 msgstr ""
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Ne mogu ukloniti %s"
 
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Ne mogu ukloniti %s"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr ""
 
 msgid "Bad header data"
 msgstr ""
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "Povezivanje neuspješno"
 
 msgid "Connection failed"
 msgstr "Povezivanje neuspješno"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "Unutrašnja greška"
 
 msgid "Internal error"
 msgstr "Unutrašnja greška"
 


@@ -1913,7 +1918,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr ""
 #, c-format
 msgid "Selection %s not found"
 msgstr ""


@@ -2334,7 +2363,7 @@ msgstr ""
 msgid "Method %s did not start correctly"
 msgstr ""
 
 msgid "Method %s did not start correctly"
 msgstr ""
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""


@@ -2688,10 +2717,14 @@ msgstr ""
 msgid "Completely removed %s"
 msgstr "Ne mogu ukloniti %s"
 
 msgid "Completely removed %s"
 msgstr "Ne mogu ukloniti %s"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr ""
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr ""

diff --git a/po/ca.po b/po/ca.po
index 96732a0eb2e0ee0ca3edd1e29d7c9435147acf73..5e061aa6661fd16b739adc82ac88bc31433babcb 100644 (file)
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.20\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt 0.7.20\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2008-12-21 20:24+0100\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
 "PO-Revision-Date: 2008-12-21 20:24+0100\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"


@@ -158,7 +158,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s per a %s compilat el %s %s\n"
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s per a %s compilat el %s %s\n"


@@ -655,7 +655,7 @@ msgstr "No s'ha pogut canviar el nom de %s a %s"
 msgid "Y"
 msgstr "S"
 
 msgid "Y"
 msgstr "S"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "S'ha produït un error de compilació de l'expressió regular - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "S'ha produït un error de compilació de l'expressió regular - %s"


@@ -819,11 +819,11 @@ msgstr ""
 msgid "Internal error, Ordering didn't finish"
 msgstr "S'ha produït un error intern, l'ordenació no ha acabat"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "S'ha produït un error intern, l'ordenació no ha acabat"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "No és possible blocar el directori de descàrrega"
 
 msgid "Unable to lock the download directory"
 msgstr "No és possible blocar el directori de descàrrega"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "No s'ha pogut llegir la llista de les fonts."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "No s'ha pogut llegir la llista de les fonts."


@@ -854,7 +854,7 @@ msgstr ""
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Després d'aquesta operació s'alliberaran %sB d'espai en disc.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Després d'aquesta operació s'alliberaran %sB d'espai en disc.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "No s'ha pogut determinar l'espai lliure en %s"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "No s'ha pogut determinar l'espai lliure en %s"


@@ -891,7 +891,7 @@ msgstr "Avortat."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Voleu continuar [S/n]? "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "Voleu continuar [S/n]? "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "No s'ha pogut obtenir %s  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "No s'ha pogut obtenir %s  %s\n"


@@ -900,7 +900,7 @@ msgstr "No s'ha pogut obtenir %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Alguns fitxers no s'han pogut baixar"
 
 msgid "Some files failed to download"
 msgstr "Alguns fitxers no s'han pogut baixar"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "Descàrrega completa i en mode de només descàrrega"
 
 msgid "Download complete and in download only mode"
 msgstr "Descàrrega completa i en mode de només descàrrega"
 


@@ -998,32 +998,37 @@ msgstr "No s'ha trobat la versió «%s» per a «%s»"
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Versió seleccionada %s (%s) per a %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Versió seleccionada %s (%s) per a %s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "L'ordre update no pren arguments"
 
 msgid "The update command takes no arguments"
 msgstr "L'ordre update no pren arguments"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "No es pot blocar el directori de la llista"
 
 msgid "Unable to lock the list directory"
 msgstr "No es pot blocar el directori de la llista"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Es suposa que no hauriem de suprimir coses, no es pot iniciar el supressor "
 "automàtic"
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Es suposa que no hauriem de suprimir coses, no es pot iniciar el supressor "
 "automàtic"
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 "Els paquets següents s'instal·laren automàticament i ja no són necessaris:"
 
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 "Els paquets següents s'instal·laren automàticament i ja no són necessaris:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Empreu «apt-get autoremove» per a suprimir-los."
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Empreu «apt-get autoremove» per a suprimir-los."
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1041,43 +1046,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "La informació següent pot ajudar-vos a resoldre la situació:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "La informació següent pot ajudar-vos a resoldre la situació:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "S'ha produït un error intern, el supressor automàtic ha trencat coses"
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "S'ha produït un error intern, el supressor automàtic ha trencat coses"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Error intern, AllUpgrade ha trencat coses"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Error intern, AllUpgrade ha trencat coses"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr "No s'ha pogut trobar la tasca %s"
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "No s'ha pogut trobar la tasca %s"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "No s'ha pogut trobar el paquet %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "No s'ha pogut trobar el paquet %s"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Nota: s'està seleccionant %s per a l'expressió regular '%s'\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Nota: s'està seleccionant %s per a l'expressió regular '%s'\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "S'ha marcat %s com instal·lat manualment.\n"
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "S'ha marcat %s com instal·lat manualment.\n"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho:"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho:"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1085,7 +1090,7 @@ msgstr ""
 "Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o "
 "especifiqueu una solució)."
 
 "Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o "
 "especifiqueu una solució)."
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1097,120 +1102,120 @@ msgstr ""
 "unstable i alguns paquets requerits encara no han estat creats o bé\n"
 "encara no els hi han afegit."
 
 "unstable i alguns paquets requerits encara no han estat creats o bé\n"
 "encara no els hi han afegit."
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "Paquets trencats"
 
 msgid "Broken packages"
 msgstr "Paquets trencats"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "S'instal·laran els següents paquets extres:"
 
 msgid "The following extra packages will be installed:"
 msgstr "S'instal·laran els següents paquets extres:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "Paquets suggerits:"
 
 msgid "Suggested packages:"
 msgstr "Paquets suggerits:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "Paquets recomanats:"
 
 msgid "Recommended packages:"
 msgstr "Paquets recomanats:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "S'està calculant l'actualització... "
 
 msgid "Calculating upgrade... "
 msgstr "S'està calculant l'actualització... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "Ha fallat"
 
 msgid "Failed"
 msgstr "Ha fallat"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "Fet"
 
 msgid "Done"
 msgstr "Fet"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "S'ha produït un error intern, el solucionador de problemes ha trencat coses"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "S'ha produït un error intern, el solucionador de problemes ha trencat coses"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr "Haureu d'especificar un paquet de codi font per a baixar"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "Haureu d'especificar un paquet de codi font per a baixar"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "No es pot trobar un paquet de fonts per a %s"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "No es pot trobar un paquet de fonts per a %s"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "S'està ometent el fitxer ja baixat «%s»\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "S'està ometent el fitxer ja baixat «%s»\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "No teniu prou espai lliure en %s"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "No teniu prou espai lliure en %s"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Es necessita baixar %sB/%sB d'arxius font.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Es necessita baixar %sB/%sB d'arxius font.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Es necessita baixar %sB d'arxius font.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Es necessita baixar %sB d'arxius font.\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obté el font %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obté el font %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "No s'ha pogut baixar alguns arxius."
 
 msgid "Failed to fetch some archives."
 msgstr "No s'ha pogut baixar alguns arxius."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "L'ordre de desempaquetar «%s» ha fallat.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "L'ordre de desempaquetar «%s» ha fallat.\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Comproveu si el paquet «dpkgdev» està instal·lat.\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Comproveu si el paquet «dpkgdev» està instal·lat.\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "L'ordre de construir «%s» ha fallat.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "L'ordre de construir «%s» ha fallat.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "Ha fallat el procés fill"
 
 msgid "Child process failed"
 msgstr "Ha fallat el procés fill"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "S'ha d'especificar un paquet per a verificar les dependències de construcció "
 "per a"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "S'ha d'especificar un paquet per a verificar les dependències de construcció "
 "per a"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 "No es pot obtenir informació sobre les dependències de construcció per a %s"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 "No es pot obtenir informació sobre les dependències de construcció per a %s"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s no té dependències de construcció.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s no té dependències de construcció.\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "


@@ -1219,7 +1224,7 @@ msgstr ""
 "La dependència %s en %s no es pot satisfer per que no es pot trobar el "
 "paquet %s"
 
 "La dependència %s en %s no es pot satisfer per que no es pot trobar el "
 "paquet %s"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1228,32 +1233,33 @@ msgstr ""
 "La dependència %s per a %s no es pot satisfer per que cap versió del paquet %"
 "s pot satisfer els requeriments de versions"
 
 "La dependència %s per a %s no es pot satisfer per que cap versió del paquet %"
 "s pot satisfer els requeriments de versions"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "No s'ha pogut satisfer la dependència %s per a %s: El paquet instal·lat %s "
 "és massa nou"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "No s'ha pogut satisfer la dependència %s per a %s: El paquet instal·lat %s "
 "és massa nou"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "No s'han pogut satisfer les dependències de construcció per a %s"
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "No s'han pogut satisfer les dependències de construcció per a %s"
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "No es poden processar les dependències de construcció"
 
 msgid "Failed to process build dependencies"
 msgstr "No es poden processar les dependències de construcció"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "Mòduls suportats:"
 
 msgid "Supported modules:"
 msgstr "Mòduls suportats:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1269,7 +1275,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1874,7 +1880,7 @@ msgstr "S'ha esgotat el temps de connexió al sòcol de dades"
 msgid "Unable to accept connection"
 msgstr "No es pot acceptar la connexió"
 
 msgid "Unable to accept connection"
 msgstr "No es pot acceptar la connexió"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "Problema escollint el fitxer"
 
 msgid "Problem hashing file"
 msgstr "Problema escollint el fitxer"
 


@@ -1958,44 +1964,44 @@ msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "No es pot connectar amb %s %s:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "No es pot connectar amb %s %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "No s'ha pogut accedir a l'anell de claus: «%s»"
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "No s'ha pogut accedir a l'anell de claus: «%s»"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: La llista d'arguments d'Acquire::gpgv::Options és massa llarga. S'està "
 "sortint."
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: La llista d'arguments d'Acquire::gpgv::Options és massa llarga. S'està "
 "sortint."
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Error intern: La signatura és correcta, però no s'ha pogut determinar "
 "l'emprempta digital de la clau!"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Error intern: La signatura és correcta, però no s'ha pogut determinar "
 "l'emprempta digital de la clau!"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "S'ha trobat almenys una signatura invàlida."
 
 msgid "At least one invalid signature was encountered."
 msgstr "S'ha trobat almenys una signatura invàlida."
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "No s'ha pogut executar «%s» per a verificar la signatura (està instal·lat el "
 "gpgv?)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "No s'ha pogut executar «%s» per a verificar la signatura (està instal·lat el "
 "gpgv?)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "S'ha produït un error desconegut en executar el gpgv"
 
 msgid "Unknown error executing gpgv"
 msgstr "S'ha produït un error desconegut en executar el gpgv"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "Les signatures següents són invàlides:\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "Les signatures següents són invàlides:\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -2013,81 +2019,81 @@ msgstr "No s'ha pogut obrir un conducte per a %s"
 msgid "Read error from %s process"
 msgstr "S'ha produït un error en llegir des del procés %s"
 
 msgid "Read error from %s process"
 msgstr "S'ha produït un error en llegir des del procés %s"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "S'estan esperant les capçaleres"
 
 msgid "Waiting for headers"
 msgstr "S'estan esperant les capçaleres"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "S'ha obtingut una capçalera d'una sola línea de més de %u caràcters"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "S'ha obtingut una capçalera d'una sola línea de més de %u caràcters"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "Línia de capçalera incorrecta"
 
 msgid "Bad header line"
 msgstr "Línia de capçalera incorrecta"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "El servidor HTTP ha enviat una capçalera de resposta no vàlida"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "El servidor HTTP ha enviat una capçalera de resposta no vàlida"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "El servidor HTTP ha enviat una capçalera de Content-Length no vàlida"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "El servidor HTTP ha enviat una capçalera de Content-Length no vàlida"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "El servidor HTTP ha enviat una capçalera de Content-Range no vàlida"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "El servidor HTTP ha enviat una capçalera de Content-Range no vàlida"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "Aquest servidor HTTP té el suport d'abast trencat"
 
 msgid "This HTTP server has broken range support"
 msgstr "Aquest servidor HTTP té el suport d'abast trencat"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "Format de la data desconegut"
 
 msgid "Unknown date format"
 msgstr "Format de la data desconegut"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "Ha fallat la selecció"
 
 msgid "Select failed"
 msgstr "Ha fallat la selecció"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "Connexió finalitzada"
 
 msgid "Connection timed out"
 msgstr "Connexió finalitzada"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "S'ha produït un error en escriure al fitxer de sortida"
 
 msgid "Error writing to output file"
 msgstr "S'ha produït un error en escriure al fitxer de sortida"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "S'ha produït un error en escriure al fitxer"
 
 msgid "Error writing to file"
 msgstr "S'ha produït un error en escriure al fitxer"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "S'ha produït un error en escriure al fitxer"
 
 msgid "Error writing to the file"
 msgstr "S'ha produït un error en escriure al fitxer"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "S'ha produït un error en llegir, el servidor remot ha tancat la connexió"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "S'ha produït un error en llegir, el servidor remot ha tancat la connexió"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "S'ha produït un error en llegir des del servidor"
 
 msgid "Error reading from server"
 msgstr "S'ha produït un error en llegir des del servidor"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 msgid "Failed to truncate file"
 msgstr "No s'ha pogut truncar el fitxer %s"
 
 msgid "Failed to truncate file"
 msgstr "No s'ha pogut truncar el fitxer %s"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "Capçalera de dades no vàlida"
 
 msgid "Bad header data"
 msgstr "Capçalera de dades no vàlida"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "Ha fallat la connexió"
 
 msgid "Connection failed"
 msgstr "Ha fallat la connexió"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "Error intern"
 
 msgid "Internal error"
 msgstr "Error intern"
 


@@ -2109,7 +2115,31 @@ msgstr ""
 "No hi ha espai per al «Dynamic MMap». Incrementeu la mida d'APT::Cache-Limit. "
 "Valor actual: %lu. (man 5 apt.conf)"
 
 "No hi ha espai per al «Dynamic MMap». Incrementeu la mida d'APT::Cache-Limit. "
 "Valor actual: %lu. (man 5 apt.conf)"
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "No s'ha trobat la selecció %s"
 #, c-format
 msgid "Selection %s not found"
 msgstr "No s'ha trobat la selecció %s"


@@ -2540,7 +2570,7 @@ msgstr "No s'ha pogut trobar el mètode de control %s."
 msgid "Method %s did not start correctly"
 msgstr "El mètode %s no s'ha iniciat correctament"
 
 msgid "Method %s did not start correctly"
 msgstr "El mètode %s no s'ha iniciat correctament"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Inseriu el disc amb l'etiqueta: «%s» en la unitat «%s» i premeu Intro."
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Inseriu el disc amb l'etiqueta: «%s» en la unitat «%s» i premeu Intro."


@@ -2916,12 +2946,16 @@ msgstr "S'està preparant per a suprimir completament el paquet %s"
 msgid "Completely removed %s"
 msgstr "S'ha suprimit completament el paquet %s"
 
 msgid "Completely removed %s"
 msgstr "S'ha suprimit completament el paquet %s"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "No es pot escriure el registre, ha fallat openpty() (no s'ha muntat /dev/"
 "pts?)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "No es pot escriure el registre, ha fallat openpty() (no s'ha muntat /dev/"
 "pts?)\n"
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "No s'ha pogut aplicar el pedaç al fitxer"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "No s'ha pogut aplicar el pedaç al fitxer"

diff --git a/po/cs.po b/po/cs.po
index dfd2f6c2b788e24f492a00a857cb0c80fb7f9eb9..69c1d9e0d8781459400dd235964b27299132d0e4 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2008-11-16 18:05+0100\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
 "PO-Revision-Date: 2008-11-16 18:05+0100\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"


@@ -156,7 +156,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s pro %s zkompilován na %s %s\n"
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s pro %s zkompilován na %s %s\n"


@@ -650,7 +650,7 @@ msgstr "Selhalo přejmenování %s na %s"
 msgid "Y"
 msgstr "Y"
 
 msgid "Y"
 msgstr "Y"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Chyba při kompilaci regulárního výrazu - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Chyba při kompilaci regulárního výrazu - %s"


@@ -811,11 +811,11 @@ msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta."
 msgid "Internal error, Ordering didn't finish"
 msgstr "Vnitřní chyba, třídění nedoběhlo do konce"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "Vnitřní chyba, třídění nedoběhlo do konce"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "Nemohu zamknout adresář pro stahování"
 
 msgid "Unable to lock the download directory"
 msgstr "Nemohu zamknout adresář pro stahování"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Nelze přečíst seznam zdrojů."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Nelze přečíst seznam zdrojů."


@@ -845,7 +845,7 @@ msgstr "Po této operaci bude na disku použito dalších %sB.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Po této operaci bude na disku uvolněno %sB.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Po této operaci bude na disku uvolněno %sB.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nemohu určit volné místo v %s"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nemohu určit volné místo v %s"


@@ -882,7 +882,7 @@ msgstr "Přerušeno."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Chcete pokračovat [Y/n]? "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "Chcete pokračovat [Y/n]? "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Selhalo stažení %s  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Selhalo stažení %s  %s\n"


@@ -891,7 +891,7 @@ msgstr "Selhalo stažení %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Některé soubory nemohly být staženy"
 
 msgid "Some files failed to download"
 msgstr "Některé soubory nemohly být staženy"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "Stahování dokončeno v režimu pouze stáhnout"
 
 msgid "Download complete and in download only mode"
 msgstr "Stahování dokončeno v režimu pouze stáhnout"
 


@@ -988,30 +988,35 @@ msgstr "Verze „%s“ pro „%s“ nebyla nalezena"
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Vybraná verze %s (%s) pro %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Vybraná verze %s (%s) pro %s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "Příkaz update neakceptuje žádné argumenty"
 
 msgid "The update command takes no arguments"
 msgstr "Příkaz update neakceptuje žádné argumenty"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "Nemohu uzamknout list adresář"
 
 msgid "Unable to lock the list directory"
 msgstr "Nemohu uzamknout list adresář"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Neměli bychom mazat věci, nemůžu spustit AutoRemover"
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Neměli bychom mazat věci, nemůžu spustit AutoRemover"
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 "Následující balíky byly nainstalovány automaticky a již nejsou potřeba:"
 
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 "Následující balíky byly nainstalovány automaticky a již nejsou potřeba:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Pro jejich odstranění použijte „apt-get autoremove“."
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Pro jejich odstranění použijte „apt-get autoremove“."
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1029,43 +1034,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Vnitřní chyba, AutoRemover pokazil věci"
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Vnitřní chyba, AutoRemover pokazil věci"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Vnitřní chyba, AllUpgrade pokazil věci"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Vnitřní chyba, AllUpgrade pokazil věci"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Nemohu najít úlohu %s"
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Nemohu najít úlohu %s"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nemohu najít balík %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nemohu najít balík %s"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Pozn: vybírám %s pro regulární výraz „%s“\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Pozn: vybírám %s pro regulární výraz „%s“\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s nastaven jako instalovaný ručně.\n"
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s nastaven jako instalovaný ručně.\n"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Pro opravení následujících můžete spustit „apt-get -f install“:"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Pro opravení následujících můžete spustit „apt-get -f install“:"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1073,7 +1078,7 @@ msgstr ""
 "Nesplněné závislosti. Zkuste spustit „apt-get -f install“ bez balíků (nebo "
 "navrhněte řešení)."
 
 "Nesplněné závislosti. Zkuste spustit „apt-get -f install“ bez balíků (nebo "
 "navrhněte řešení)."
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1084,124 +1089,124 @@ msgstr ""
 "nemožnou situaci, nebo, pokud používáte nestabilní distribuci, že\n"
 "vyžadované balíky ještě nebyly vytvořeny nebo přesunuty z Příchozí fronty."
 
 "nemožnou situaci, nebo, pokud používáte nestabilní distribuci, že\n"
 "vyžadované balíky ještě nebyly vytvořeny nebo přesunuty z Příchozí fronty."
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "Poškozené balíky"
 
 msgid "Broken packages"
 msgstr "Poškozené balíky"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "Následující extra balíky budou instalovány:"
 
 msgid "The following extra packages will be installed:"
 msgstr "Následující extra balíky budou instalovány:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "Navrhované balíky:"
 
 msgid "Suggested packages:"
 msgstr "Navrhované balíky:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "Doporučované balíky:"
 
 msgid "Recommended packages:"
 msgstr "Doporučované balíky:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "Propočítávám aktualizaci... "
 
 msgid "Calculating upgrade... "
 msgstr "Propočítávám aktualizaci... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "Selhalo"
 
 msgid "Failed"
 msgstr "Selhalo"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "Hotovo"
 
 msgid "Done"
 msgstr "Hotovo"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr "Vnitřní chyba, řešitel problémů pokazil věci"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Vnitřní chyba, řešitel problémů pokazil věci"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nemohu najít zdrojový balík pro %s"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nemohu najít zdrojový balík pro %s"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Přeskakuji dříve stažený soubor „%s“\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Přeskakuji dříve stažený soubor „%s“\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Na %s nemáte dostatek volného místa"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Na %s nemáte dostatek volného místa"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Potřebuji stáhnout %sB zdrojových archivů.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Potřebuji stáhnout %sB zdrojových archivů.\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Stáhnout zdroj %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Stáhnout zdroj %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "Stažení některých archivů selhalo."
 
 msgid "Failed to fetch some archives."
 msgstr "Stažení některých archivů selhalo."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Příkaz pro rozbalení „%s“ selhal.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Příkaz pro rozbalení „%s“ selhal.\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Zkontrolujte, zda je nainstalován balíček „dpkg-dev“.\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Zkontrolujte, zda je nainstalován balíček „dpkg-dev“.\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Příkaz pro sestavení „%s“ selhal.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Příkaz pro sestavení „%s“ selhal.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "Synovský proces selhal"
 
 msgid "Child process failed"
 msgstr "Synovský proces selhal"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Musíte zadat alespoň jeden balík, pro který budou kontrolovány závislosti "
 "pro sestavení"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Musíte zadat alespoň jeden balík, pro který budou kontrolovány závislosti "
 "pro sestavení"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nemohu získat závislosti pro sestavení %s"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nemohu získat závislosti pro sestavení %s"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nemá žádné závislosti pro sestavení.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nemá žádné závislosti pro sestavení.\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen"
 
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1210,31 +1215,32 @@ msgstr ""
 "%s závislost pro %s nemůže být splněna protože není k dispozici verze balíku "
 "%s, která odpovídá požadavku na verzi"
 
 "%s závislost pro %s nemůže být splněna protože není k dispozici verze balíku "
 "%s, která odpovídá požadavku na verzi"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Selhalo splnění %s závislosti pro %s: Instalovaný balík %s je příliš nový"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Selhalo splnění %s závislosti pro %s: Instalovaný balík %s je příliš nový"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Selhalo splnění %s závislosti pro %s: %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Selhalo splnění %s závislosti pro %s: %s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Závislosti pro sestavení %s nemohly být splněny."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Závislosti pro sestavení %s nemohly být splněny."
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "Chyba při zpracování závislostí pro sestavení"
 
 msgid "Failed to process build dependencies"
 msgstr "Chyba při zpracování závislostí pro sestavení"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "Podporované moduly:"
 
 msgid "Supported modules:"
 msgstr "Podporované moduly:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1250,7 +1256,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1845,7 +1851,7 @@ msgstr "Spojení datového socketu vypršelo"
 msgid "Unable to accept connection"
 msgstr "Nemohu přijmout spojení"
 
 msgid "Unable to accept connection"
 msgstr "Nemohu přijmout spojení"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "Problém s hashováním souboru"
 
 msgid "Problem hashing file"
 msgstr "Problém s hashováním souboru"
 


@@ -1929,39 +1935,39 @@ msgstr "Něco hodně ošklivého se přihodilo při zjišťování „%s:%s“ (
 msgid "Unable to connect to %s %s:"
 msgstr "Nemohu se připojit k %s %s:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "Nemohu se připojit k %s %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Nemohu přistoupit ke klíčence: „%s“"
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Nemohu přistoupit ke klíčence: „%s“"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: Seznam argumentů Acquire::gpgv::Options je příliš dlouhý. Končím."
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: Seznam argumentů Acquire::gpgv::Options je příliš dlouhý. Končím."
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "Vnitřní chyba: Dobrý podpis, ale nemohu zjistit otisk klíče?!"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "Vnitřní chyba: Dobrý podpis, ale nemohu zjistit otisk klíče?!"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "Byl zaznamenán nejméně jeden neplatný podpis. "
 
 msgid "At least one invalid signature was encountered."
 msgstr "Byl zaznamenán nejméně jeden neplatný podpis. "
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Nepodařilo se spustit „%s“ pro ověření podpisu (je gpgv nainstalováno?)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Nepodařilo se spustit „%s“ pro ověření podpisu (je gpgv nainstalováno?)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "Neznámá chyba při spouštění gpgv"
 
 msgid "Unknown error executing gpgv"
 msgstr "Neznámá chyba při spouštění gpgv"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "Následující podpisy jsou neplatné:\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "Následující podpisy jsou neplatné:\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -1979,80 +1985,80 @@ msgstr "Nemohu otevřít rouru pro %s"
 msgid "Read error from %s process"
 msgstr "Chyba čtení z procesu %s"
 
 msgid "Read error from %s process"
 msgstr "Chyba čtení z procesu %s"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "Čekám na hlavičky"
 
 msgid "Waiting for headers"
 msgstr "Čekám na hlavičky"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Získal jsem jednu řádku hlavičky přes %u znaků"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Získal jsem jednu řádku hlavičky přes %u znaků"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "Chybná hlavička"
 
 msgid "Bad header line"
 msgstr "Chybná hlavička"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "Http server poslal neplatnou hlavičku odpovědi"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Http server poslal neplatnou hlavičku odpovědi"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Http server poslal neplatnou hlavičku Content-Length"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Http server poslal neplatnou hlavičku Content-Length"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Http server poslal neplatnou hlavičku Content-Range"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Http server poslal neplatnou hlavičku Content-Range"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "Tento HTTP server má porouchanou podporu rozsahů"
 
 msgid "This HTTP server has broken range support"
 msgstr "Tento HTTP server má porouchanou podporu rozsahů"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "Neznámý formát data"
 
 msgid "Unknown date format"
 msgstr "Neznámý formát data"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "Výběr selhal"
 
 msgid "Select failed"
 msgstr "Výběr selhal"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "Čas spojení vypršel"
 
 msgid "Connection timed out"
 msgstr "Čas spojení vypršel"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "Chyba zápisu do výstupního souboru"
 
 msgid "Error writing to output file"
 msgstr "Chyba zápisu do výstupního souboru"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "Chyba zápisu do souboru"
 
 msgid "Error writing to file"
 msgstr "Chyba zápisu do souboru"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "Chyba zápisu do souboru"
 
 msgid "Error writing to the file"
 msgstr "Chyba zápisu do souboru"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "Chyba čtení ze serveru"
 
 msgid "Error reading from server"
 msgstr "Chyba čtení ze serveru"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 msgid "Failed to truncate file"
 msgstr "Nelze zmenšit soubor"
 
 msgid "Failed to truncate file"
 msgstr "Nelze zmenšit soubor"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "Špatné datové záhlaví"
 
 msgid "Bad header data"
 msgstr "Špatné datové záhlaví"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "Spojení selhalo"
 
 msgid "Connection failed"
 msgstr "Spojení selhalo"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "Vnitřní chyba"
 
 msgid "Internal error"
 msgstr "Vnitřní chyba"
 


@@ -2072,7 +2078,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "Výběr %s nenalezen"
 #, c-format
 msgid "Selection %s not found"
 msgstr "Výběr %s nenalezen"


@@ -2499,7 +2529,7 @@ msgstr "Ovladač metody %s nemohl být nalezen."
 msgid "Method %s did not start correctly"
 msgstr "Metoda %s nebyla spuštěna správně"
 
 msgid "Method %s did not start correctly"
 msgstr "Metoda %s nebyla spuštěna správně"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Vložte prosím disk nazvaný „%s“ do mechaniky „%s“ a stiskněte enter."
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Vložte prosím disk nazvaný „%s“ do mechaniky „%s“ a stiskněte enter."


@@ -2863,10 +2893,14 @@ msgstr "Připravuji úplné odstranění %s"
 msgid "Completely removed %s"
 msgstr "Kompletně odstraněn %s"
 
 msgid "Completely removed %s"
 msgstr "Kompletně odstraněn %s"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Nelze zapsat log, volání openpty() selhalo (/dev/pts není připojen?)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Nelze zapsat log, volání openpty() selhalo (/dev/pts není připojen?)\n"
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Nemohu záplatovat soubor"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Nemohu záplatovat soubor"

diff --git a/po/cy.po b/po/cy.po
index ee4ce88ae06a2f483b7679751a77d1e50621ff3c..59ef4ed09d609d9e315fcff51f0e5edd6aa9f908 100644 (file)
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: APT\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: APT\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2005-06-06 13:46+0100\n"
 "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
 "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
 "PO-Revision-Date: 2005-06-06 13:46+0100\n"
 "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
 "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"


@@ -174,7 +174,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n"
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n"


@@ -680,7 +680,7 @@ msgstr "Methwyd ailenwi %s at %s"
 msgid "Y"
 msgstr "I"
 
 msgid "Y"
 msgstr "I"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Gwall crynhoi patrwm - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Gwall crynhoi patrwm - %s"


@@ -850,11 +850,11 @@ msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
 msgid "Internal error, Ordering didn't finish"
 msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
 
 msgid "Unable to lock the download directory"
 msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Methwyd darllen y rhestr ffynhonellau."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Methwyd darllen y rhestr ffynhonellau."


@@ -883,7 +883,7 @@ msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Does dim digon o le rhydd yn %s gennych"
 #, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Does dim digon o le rhydd yn %s gennych"


@@ -921,7 +921,7 @@ msgstr "Erthylu."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Methwyd cyrchu %s  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Methwyd cyrchu %s  %s\n"


@@ -930,7 +930,7 @@ msgstr "Methwyd cyrchu %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Methodd rhai ffeiliau lawrlwytho"
 
 msgid "Some files failed to download"
 msgstr "Methodd rhai ffeiliau lawrlwytho"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
 
 msgid "Download complete and in download only mode"
 msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
 


@@ -1030,30 +1030,35 @@ msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
 
 msgid "The update command takes no arguments"
 msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
 
 msgid "Unable to lock the list directory"
 msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1069,46 +1074,46 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 #, fuzzy
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
 #, fuzzy
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "Methwyd canfod pecyn %s"
 
 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "Methwyd canfod pecyn %s"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Methwyd canfod pecyn %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Methwyd canfod pecyn %s"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ond mae %s yn mynd i gael ei sefydlu"
 
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ond mae %s yn mynd i gael ei sefydlu"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain:"
 
 # FIXME
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain:"
 
 # FIXME

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1117,7 +1122,7 @@ msgstr ""
 "pecyn (neu penodwch ddatrys)"
 
 # FIXME: needs commas
 "pecyn (neu penodwch ddatrys)"
 
 # FIXME: needs commas

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1129,118 +1134,118 @@ msgstr ""
 "ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n"
 "heb gael eu symud allan o Incoming."
 
 "ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n"
 "heb gael eu symud allan o Incoming."
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "Pecynnau wedi torri"
 
 msgid "Broken packages"
 msgstr "Pecynnau wedi torri"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
 
 msgid "The following extra packages will be installed:"
 msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "Pecynnau a awgrymmir:"
 
 msgid "Suggested packages:"
 msgstr "Pecynnau a awgrymmir:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "Pecynnau a argymhellir:"
 
 msgid "Recommended packages:"
 msgstr "Pecynnau a argymhellir:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 #, fuzzy
 msgid "Calculating upgrade... "
 msgstr "Yn Cyfrifo'r Uwchraddiad... "
 
 #, fuzzy
 msgid "Calculating upgrade... "
 msgstr "Yn Cyfrifo'r Uwchraddiad... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "Methwyd"
 
 msgid "Failed"
 msgstr "Methwyd"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "Wedi Gorffen"
 
 msgid "Done"
 msgstr "Wedi Gorffen"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, fuzzy, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
 
 #, fuzzy, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Does dim digon o le rhydd yn %s gennych"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Does dim digon o le rhydd yn %s gennych"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, fuzzy, c-format
 msgid "Fetch source %s\n"
 msgstr "Cyrchu Ffynhonell %s\n"
 
 #, fuzzy, c-format
 msgid "Fetch source %s\n"
 msgstr "Cyrchu Ffynhonell %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "Methwyd cyrchu rhai archifau."
 
 msgid "Failed to fetch some archives."
 msgstr "Methwyd cyrchu rhai archifau."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "Methodd proses plentyn"
 
 msgid "Child process failed"
 msgstr "Methodd proses plentyn"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "


@@ -1249,7 +1254,7 @@ msgstr ""
 "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %"
 "s"
 
 "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %"
 "s"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1258,34 +1263,34 @@ msgstr ""
 "Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd "
 "ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin"
 
 "Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd "
 "ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy "
 "newydd"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy "
 "newydd"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "Methwyd prosesu dibyniaethau adeiladu"
 
 msgid "Failed to process build dependencies"
 msgstr "Methwyd prosesu dibyniaethau adeiladu"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 #, fuzzy
 msgid "Supported modules:"
 msgstr "Modylau a Gynhelir:"
 
 # FIXME: split
 #, fuzzy
 msgid "Supported modules:"
 msgstr "Modylau a Gynhelir:"
 
 # FIXME: split

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628

 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"


@@ -1302,7 +1307,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1924,7 +1929,7 @@ msgstr "Goramserodd cysylltiad y soced data"
 msgid "Unable to accept connection"
 msgstr "Methwyd derbyn cysylltiad"
 
 msgid "Unable to accept connection"
 msgstr "Methwyd derbyn cysylltiad"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "Problem wrth stwnshio ffeil"
 
 msgid "Problem hashing file"
 msgstr "Problem wrth stwnshio ffeil"
 


@@ -2009,39 +2014,39 @@ msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Methwyd cysylltu i %s %s:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "Methwyd cysylltu i %s %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, fuzzy, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Methwyd datrys '%s'"
 
 #, fuzzy, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Methwyd datrys '%s'"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr ""
 
 msgid "At least one invalid signature was encountered."
 msgstr ""
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr ""
 
 msgid "Unknown error executing gpgv"
 msgstr ""
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
 
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -2057,87 +2062,87 @@ msgstr "Methwyd agor pibell ar gyfer %s"
 msgid "Read error from %s process"
 msgstr "Gwall darllen o broses %s"
 
 msgid "Read error from %s process"
 msgstr "Gwall darllen o broses %s"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "Yn aros am benawdau"
 
 msgid "Waiting for headers"
 msgstr "Yn aros am benawdau"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "Llinell pennawd gwael"
 
 msgid "Bad header line"
 msgstr "Llinell pennawd gwael"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 #, fuzzy
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
 
 #, fuzzy
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 #, fuzzy
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
 
 #, fuzzy
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 #, fuzzy
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
 
 #, fuzzy
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 #, fuzzy
 msgid "This HTTP server has broken range support"
 msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
 
 #, fuzzy
 msgid "This HTTP server has broken range support"
 msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "Fformat dyddiad anhysbys"
 
 msgid "Unknown date format"
 msgstr "Fformat dyddiad anhysbys"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "Methwyd dewis"
 
 msgid "Select failed"
 msgstr "Methwyd dewis"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "Goramserodd y cysylltiad"
 
 msgid "Connection timed out"
 msgstr "Goramserodd y cysylltiad"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
 
 msgid "Error writing to output file"
 msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "Gwall wrth ysgrifennu at ffeil"
 
 msgid "Error writing to file"
 msgstr "Gwall wrth ysgrifennu at ffeil"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "Gwall wrth ysgrifennu at y ffeil"
 
 msgid "Error writing to the file"
 msgstr "Gwall wrth ysgrifennu at y ffeil"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 #, fuzzy
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
 
 #, fuzzy
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "Gwall wrth ddarllen o'r gweinydd"
 
 msgid "Error reading from server"
 msgstr "Gwall wrth ddarllen o'r gweinydd"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Methwyd ysgrifennu ffeil %s"
 
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Methwyd ysgrifennu ffeil %s"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 #, fuzzy
 msgid "Bad header data"
 msgstr "Data pennawd gwael"
 
 #, fuzzy
 msgid "Bad header data"
 msgstr "Data pennawd gwael"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "Methodd y cysylltiad"
 
 msgid "Connection failed"
 msgstr "Methodd y cysylltiad"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "Gwall mewnol"
 
 msgid "Internal error"
 msgstr "Gwall mewnol"
 


@@ -2157,7 +2162,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "Ni chanfuwyd y dewis %s"
 #, c-format
 msgid "Selection %s not found"
 msgstr "Ni chanfuwyd y dewis %s"


@@ -2600,7 +2629,7 @@ msgstr "Methwyd canfod y gyrrydd dull %s."
 msgid "Method %s did not start correctly"
 msgstr "Ni gychwynodd y dull %s yn gywir"
 
 msgid "Method %s did not start correctly"
 msgstr "Ni gychwynodd y dull %s yn gywir"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, fuzzy, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 #, fuzzy, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""


@@ -2972,10 +3001,14 @@ msgstr "Yn agor y ffeil cyfluniad %s"
 msgid "Completely removed %s"
 msgstr "Methwyd dileu %s"
 
 msgid "Completely removed %s"
 msgstr "Methwyd dileu %s"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 #, fuzzy
 msgid "Could not patch file"
 #: methods/rred.cc:219
 #, fuzzy
 msgid "Could not patch file"

diff --git a/po/da.po b/po/da.po
index 5c92ff15aa196706bc18e84861a693aac351b1ae..ef7e358bdc130ca50609eb04c9dae73a07df103b 100644 (file)
--- a/po/da.po
+++ b/po/da.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-da\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt-da\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2007-09-06 21:40+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
 "Language-Team: Danish\n"
 "PO-Revision-Date: 2007-09-06 21:40+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
 "Language-Team: Danish\n"


@@ -162,7 +162,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s oversat %s %s\n"
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s oversat %s %s\n"


@@ -659,7 +659,7 @@ msgstr "Kunne ikke omd
 msgid "Y"
 msgstr "J"
 
 msgid "Y"
 msgstr "J"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Fejl ved tolkning af regulært udtryk - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Fejl ved tolkning af regulært udtryk - %s"


@@ -820,11 +820,11 @@ msgstr "Pakker skal afinstalleres, men Remove er deaktiveret."
 msgid "Internal error, Ordering didn't finish"
 msgstr "Intern fejl. Sortering blev ikke fuldført"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "Intern fejl. Sortering blev ikke fuldført"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "Kunne ikke låse nedhentningsmappen"
 
 msgid "Unable to lock the download directory"
 msgstr "Kunne ikke låse nedhentningsmappen"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Listen med kilder kunne ikke læses."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Listen med kilder kunne ikke læses."


@@ -853,7 +853,7 @@ msgstr "Efter udpakning vil %sB yderligere diskplads v
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Efter udpakning vil %sB diskplads blive frigjort.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Efter udpakning vil %sB diskplads blive frigjort.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kunne ikke bestemme ledig plads i %s"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kunne ikke bestemme ledig plads i %s"


@@ -890,7 +890,7 @@ msgstr "Afbryder."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vil du fortsætte [J/n]? "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vil du fortsætte [J/n]? "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Kunne ikke hente %s %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Kunne ikke hente %s %s\n"


@@ -899,7 +899,7 @@ msgstr "Kunne ikke hente %s %s\n"
 msgid "Some files failed to download"
 msgstr "Nedhentningen af filer mislykkedes"
 
 msgid "Some files failed to download"
 msgstr "Nedhentningen af filer mislykkedes"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand"
 
 msgid "Download complete and in download only mode"
 msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand"
 


@@ -998,31 +998,36 @@ msgstr "Versionen '%s' for '%s' blev ikke fundet"
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Valgte version %s (%s) af %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Valgte version %s (%s) af %s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "'update'-kommandoen benytter ingen parametre"
 
 msgid "The update command takes no arguments"
 msgstr "'update'-kommandoen benytter ingen parametre"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "Kunne ikke låse listemappen"
 
 msgid "Unable to lock the list directory"
 msgstr "Kunne ikke låse listemappen"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Det er ikke meningen, at vi skal slette ting og sager, kan ikke starte "
 "AutoRemover"
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Det er ikke meningen, at vi skal slette ting og sager, kan ikke starte "
 "AutoRemover"
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Følgende pakker blev installeret automatisk, og behøves ikke længere:"
 
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Følgende pakker blev installeret automatisk, og behøves ikke længere:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Brug 'apt-get autoremove' til at fjerne dem."
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Brug 'apt-get autoremove' til at fjerne dem."
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1040,43 +1045,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "Følgende oplysninger kan hjælpe dig med at klare situationen:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "Følgende oplysninger kan hjælpe dig med at klare situationen:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Intern fejl. AutoRemover ødelagde noget"
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Intern fejl. AutoRemover ødelagde noget"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Intern fejl, AllUpgrade ødelagde noget"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Intern fejl, AllUpgrade ødelagde noget"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Kunne ikke finde opgaven %s"
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Kunne ikke finde opgaven %s"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Kunne ikke finde pakken %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Kunne ikke finde pakken %s"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Bemærk, vælger %s som regulært udtryk '%s'\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Bemærk, vælger %s som regulært udtryk '%s'\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s sat til manuelt installeret.\n"
 
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s sat til manuelt installeret.\n"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Du kan muligvis rette det ved at køre 'apt-get -f install':"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Du kan muligvis rette det ved at køre 'apt-get -f install':"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1084,7 +1089,7 @@ msgstr ""
 "Uopfyldte afhængigheder. Prøv 'apt-get -f install' uden pakker (eller angiv "
 "en løsning)."
 
 "Uopfyldte afhængigheder. Prøv 'apt-get -f install' uden pakker (eller angiv "
 "en løsning)."
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1095,115 +1100,115 @@ msgstr ""
 "en umulig situation eller bruger den ustabile distribution, hvor enkelte\n"
 "pakker endnu ikke er lavet eller gjort tilgængelige."
 
 "en umulig situation eller bruger den ustabile distribution, hvor enkelte\n"
 "pakker endnu ikke er lavet eller gjort tilgængelige."
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "Ødelagte pakker"
 
 msgid "Broken packages"
 msgstr "Ødelagte pakker"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "Følgende yderligere pakker vil blive installeret:"
 
 msgid "The following extra packages will be installed:"
 msgstr "Følgende yderligere pakker vil blive installeret:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "Foreslåede pakker:"
 
 msgid "Suggested packages:"
 msgstr "Foreslåede pakker:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "Anbefalede pakker:"
 
 msgid "Recommended packages:"
 msgstr "Anbefalede pakker:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "Beregner opgraderingen... "
 
 msgid "Calculating upgrade... "
 msgstr "Beregner opgraderingen... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "Mislykkedes"
 
 msgid "Failed"
 msgstr "Mislykkedes"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "Færdig"
 
 msgid "Done"
 msgstr "Færdig"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern fejl. Problemløseren ødelagde noget"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern fejl. Problemløseren ødelagde noget"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr "Du skal angive mindst én pakke at hente kildeteksten til"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "Du skal angive mindst én pakke at hente kildeteksten til"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Kunne ikke finde kildetekstpakken for %s"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Kunne ikke finde kildetekstpakken for %s"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Overspringer allerede hentet fil '%s'\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Overspringer allerede hentet fil '%s'\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Du har ikke nok ledig plads i %s"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Du har ikke nok ledig plads i %s"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "%sB skal hentes fra kildetekst-arkiverne.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "%sB skal hentes fra kildetekst-arkiverne.\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Henter kildetekst %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Henter kildetekst %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "Nogle arkiver kunne ikke hentes."
 
 msgid "Failed to fetch some archives."
 msgstr "Nogle arkiver kunne ikke hentes."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Udpakningskommandoen '%s' fejlede.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Udpakningskommandoen '%s' fejlede.\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Tjek om pakken 'dpkg-dev' er installeret.\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Tjek om pakken 'dpkg-dev' er installeret.\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Opbygningskommandoen '%s' fejlede.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Opbygningskommandoen '%s' fejlede.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "Barneprocessen fejlede"
 
 msgid "Child process failed"
 msgstr "Barneprocessen fejlede"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr "Skal angive mindst én pakke at tjekke opbygningsafhængigheder for"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr "Skal angive mindst én pakke at tjekke opbygningsafhængigheder for"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Kunne ikke hente oplysninger om opbygningsafhængigheder for %s"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Kunne ikke hente oplysninger om opbygningsafhængigheder for %s"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen opbygningsafhængigheder.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen opbygningsafhængigheder.\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "


@@ -1211,7 +1216,7 @@ msgid ""
 msgstr ""
 "%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
 
 msgstr ""
 "%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1220,32 +1225,32 @@ msgstr ""
 "%s-afhængigheden for %s kan ikke opfyldes, da ingen af de tilgængelige "
 "udgaver af pakken %s kan tilfredsstille versions-kravene"
 
 "%s-afhængigheden for %s kan ikke opfyldes, da ingen af de tilgængelige "
 "udgaver af pakken %s kan tilfredsstille versions-kravene"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Kunne ikke opfylde %s-afhængigheden for %s: Den installerede pakke %s er for "
 "ny"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Kunne ikke opfylde %s-afhængigheden for %s: Den installerede pakke %s er for "
 "ny"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Kunne ikke opfylde %s-afhængigheden for %s: %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Kunne ikke opfylde %s-afhængigheden for %s: %s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes."
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "Kunne ikke behandler opbygningsafhængighederne"
 
 msgid "Failed to process build dependencies"
 msgstr "Kunne ikke behandler opbygningsafhængighederne"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "Understøttede moduler:"
 
 msgid "Supported modules:"
 msgstr "Understøttede moduler:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628

 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"


@@ -1262,7 +1267,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1864,7 +1869,7 @@ msgstr "Tidsudl
 msgid "Unable to accept connection"
 msgstr "Kunne ikke acceptere forbindelse"
 
 msgid "Unable to accept connection"
 msgstr "Kunne ikke acceptere forbindelse"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "Problem ved \"hashing\" af fil"
 
 msgid "Problem hashing file"
 msgstr "Problem ved \"hashing\" af fil"
 


@@ -1948,40 +1953,40 @@ msgstr "Der skete noget underligt under navneoms
 msgid "Unable to connect to %s %s:"
 msgstr "Kunne ikke forbinde til %s %s:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "Kunne ikke forbinde til %s %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Kunne ikke tilgå nøgleringent '%s'"
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Kunne ikke tilgå nøgleringent '%s'"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "F: Argumentlisten fra Acquire::gpgv::Options er for lang. Afslutter."
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "F: Argumentlisten fra Acquire::gpgv::Options er for lang. Afslutter."
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Intern fejl: Gyldig signatur, men kunne ikke afgøre nøgle-fingeraftryk?!"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Intern fejl: Gyldig signatur, men kunne ikke afgøre nøgle-fingeraftryk?!"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "Stødte på mindst én ugyldig signatur."
 
 msgid "At least one invalid signature was encountered."
 msgstr "Stødte på mindst én ugyldig signatur."
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Kunne ikke køre '%s' for at verificere signaturen (er gpgv installeret?)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Kunne ikke køre '%s' for at verificere signaturen (er gpgv installeret?)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "Ukendt fejl ved kørsel af gpgv"
 
 msgid "Unknown error executing gpgv"
 msgstr "Ukendt fejl ved kørsel af gpgv"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "Følgende signaturer var ugyldige:\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "Følgende signaturer var ugyldige:\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -1999,82 +2004,82 @@ msgstr "Kunne ikke 
 msgid "Read error from %s process"
 msgstr "Læsefejl fra %s-process"
 
 msgid "Read error from %s process"
 msgstr "Læsefejl fra %s-process"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "Afventer hoveder"
 
 msgid "Waiting for headers"
 msgstr "Afventer hoveder"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Fandt en enkelt linje i hovedet på over %u tegn"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Fandt en enkelt linje i hovedet på over %u tegn"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "Ugyldig linje i hovedet"
 
 msgid "Bad header line"
 msgstr "Ugyldig linje i hovedet"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "http-serveren sendte et ugyldigt svarhovede"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "http-serveren sendte et ugyldigt svarhovede"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "http-serveren sendte et ugyldigt Content-Length-hovede"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "http-serveren sendte et ugyldigt Content-Length-hovede"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "http-serveren sendte et ugyldigt Content-Range-hovede"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "http-serveren sendte et ugyldigt Content-Range-hovede"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr ""
 "Denne http-servere har fejlagtig understøttelse af intervaller ('ranges')"
 
 msgid "This HTTP server has broken range support"
 msgstr ""
 "Denne http-servere har fejlagtig understøttelse af intervaller ('ranges')"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "Ukendt datoformat"
 
 msgid "Unknown date format"
 msgstr "Ukendt datoformat"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "Valg mislykkedes"
 
 msgid "Select failed"
 msgstr "Valg mislykkedes"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "Tidsudløb på forbindelsen"
 
 msgid "Connection timed out"
 msgstr "Tidsudløb på forbindelsen"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "Fejl ved skrivning af uddatafil"
 
 msgid "Error writing to output file"
 msgstr "Fejl ved skrivning af uddatafil"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "Fejl ved skrivning til fil"
 
 msgid "Error writing to file"
 msgstr "Fejl ved skrivning til fil"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "Fejl ved skrivning til filen"
 
 msgid "Error writing to the file"
 msgstr "Fejl ved skrivning til filen"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "Fejl ved læsning fra serveren. Den fjerne ende lukkede forbindelsen"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Fejl ved læsning fra serveren. Den fjerne ende lukkede forbindelsen"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "Fejl ved læsning fra server"
 
 msgid "Error reading from server"
 msgstr "Fejl ved læsning fra server"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Kunne ikke skrive filen %s"
 
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Kunne ikke skrive filen %s"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "Ugyldige hoved-data"
 
 msgid "Bad header data"
 msgstr "Ugyldige hoved-data"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "Forbindelsen mislykkedes"
 
 msgid "Connection failed"
 msgstr "Forbindelsen mislykkedes"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "Intern fejl"
 
 msgid "Internal error"
 msgstr "Intern fejl"
 


@@ -2094,7 +2099,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "Det valgte %s blev ikke fundet"
 #, c-format
 msgid "Selection %s not found"
 msgstr "Det valgte %s blev ikke fundet"


@@ -2523,7 +2552,7 @@ msgstr "Metodedriveren %s blev ikke fundet."
 msgid "Method %s did not start correctly"
 msgstr "Metoden %s startede ikke korrekt"
 
 msgid "Method %s did not start correctly"
 msgstr "Metoden %s startede ikke korrekt"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Indsæt disken med navnet: '%s' i drevet '%s' og tryk retur."
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Indsæt disken med navnet: '%s' i drevet '%s' og tryk retur."


@@ -2888,10 +2917,14 @@ msgstr "G
 msgid "Completely removed %s"
 msgstr "Fjernede %s helt"
 
 msgid "Completely removed %s"
 msgstr "Fjernede %s helt"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Kunne ikke påføre filen %s en lap"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Kunne ikke påføre filen %s en lap"

diff --git a/po/de.po b/po/de.po
index 14f913aba4b3ca56b6fd57720d9c0c797f8c6e21..8dcd52cd8baddcdd6a33fad23f42d1bfb21d9d39 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.14\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt 0.7.14\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2008-11-13 21:31+0100\n"
 "Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
 "Language-Team: <debian-l10n-german@lists.debian.org>\n"
 "PO-Revision-Date: 2008-11-13 21:31+0100\n"
 "Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
 "Language-Team: <debian-l10n-german@lists.debian.org>\n"


@@ -158,7 +158,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s für %s, kompiliert am %s %s\n"
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s für %s, kompiliert am %s %s\n"


@@ -667,7 +667,7 @@ msgstr "Konnte %s nicht in %s umbenennen"
 msgid "Y"
 msgstr "J"
 
 msgid "Y"
 msgstr "J"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Fehler beim Kompilieren eines regulären Ausdrucks – %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Fehler beim Kompilieren eines regulären Ausdrucks – %s"


@@ -828,11 +828,11 @@ msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet."
 msgid "Internal error, Ordering didn't finish"
 msgstr "Interner Fehler, Anordnung beendete nicht"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "Interner Fehler, Anordnung beendete nicht"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "Kann das Downloadverzeichnis nicht sperren."
 
 msgid "Unable to lock the download directory"
 msgstr "Kann das Downloadverzeichnis nicht sperren."
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Die Liste der Quellen konnte nicht gelesen werden."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Die Liste der Quellen konnte nicht gelesen werden."


@@ -863,7 +863,7 @@ msgstr "Nach dieser Operation werden %sB Plattenplatz zusätzlich benutzt.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Nach dieser Operation werden %sB Plattenplatz freigegeben.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Nach dieser Operation werden %sB Plattenplatz freigegeben.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Konnte freien Platz in %s nicht bestimmen"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Konnte freien Platz in %s nicht bestimmen"


@@ -900,7 +900,7 @@ msgstr "Abbruch."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Möchten Sie fortfahren [J/n]? "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "Möchten Sie fortfahren [J/n]? "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Konnte %s nicht holen  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Konnte %s nicht holen  %s\n"


@@ -909,7 +909,7 @@ msgstr "Konnte %s nicht holen  %s\n"
 msgid "Some files failed to download"
 msgstr "Einige Dateien konnten nicht heruntergeladen werden"
 
 msgid "Some files failed to download"
 msgstr "Einige Dateien konnten nicht heruntergeladen werden"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv"
 
 msgid "Download complete and in download only mode"
 msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv"
 


@@ -1009,19 +1009,24 @@ msgstr "Version »%s« für »%s« konnte nicht gefunden werden"
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Gewählte Version %s (%s) für %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Gewählte Version %s (%s) für %s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "Der Befehl »update« akzeptiert keine Argumente"
 
 msgid "The update command takes no arguments"
 msgstr "Der Befehl »update« akzeptiert keine Argumente"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "Kann das Listenverzeichnis nicht sperren"
 
 msgid "Unable to lock the list directory"
 msgstr "Kann das Listenverzeichnis nicht sperren"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Es soll nichts gelöscht werden, kann AutoRemover nicht starten"
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Es soll nichts gelöscht werden, kann AutoRemover nicht starten"
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"


@@ -1029,11 +1034,11 @@ msgstr ""
 "Die folgenden Pakete wurden automatisch installiert und werden nicht länger "
 "benötigt:"
 
 "Die folgenden Pakete wurden automatisch installiert und werden nicht länger "
 "benötigt:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Verwenden Sie »apt-get autoremove«, um sie zu entfernen."
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Verwenden Sie »apt-get autoremove«, um sie zu entfernen."
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1052,44 +1057,44 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr ""
 "Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 "Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Interner Fehler, AutoRemover hat was kaputt gemacht"
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Interner Fehler, AutoRemover hat was kaputt gemacht"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Konnte Task %s nicht finden"
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Konnte Task %s nicht finden"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Konnte Paket %s nicht finden"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Konnte Paket %s nicht finden"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Hinweis: wähle %s für regulären Ausdruck »%s«\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Hinweis: wähle %s für regulären Ausdruck »%s«\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s wurde als manuell installiert festgelegt.\n"
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s wurde als manuell installiert festgelegt.\n"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren:"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren:"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1097,7 +1102,7 @@ msgstr ""
 "Nicht erfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne "
 "jegliche Pakete (oder geben Sie eine Lösung an)."
 
 "Nicht erfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne "
 "jegliche Pakete (oder geben Sie eine Lösung an)."
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1109,120 +1114,120 @@ msgstr ""
 "Unstable-Distribution verwenden, einige erforderliche Pakete noch nicht\n"
 "erstellt wurden oder Incoming noch nicht verlassen haben."
 
 "Unstable-Distribution verwenden, einige erforderliche Pakete noch nicht\n"
 "erstellt wurden oder Incoming noch nicht verlassen haben."
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "Kaputte Pakete"
 
 msgid "Broken packages"
 msgstr "Kaputte Pakete"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "Die folgenden zusätzlichen Pakete werden installiert:"
 
 msgid "The following extra packages will be installed:"
 msgstr "Die folgenden zusätzlichen Pakete werden installiert:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "Vorgeschlagene Pakete:"
 
 msgid "Suggested packages:"
 msgstr "Vorgeschlagene Pakete:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "Empfohlene Pakete:"
 
 msgid "Recommended packages:"
 msgstr "Empfohlene Pakete:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "Berechne Upgrade (Paketaktualisierung) ..."
 
 msgid "Calculating upgrade... "
 msgstr "Berechne Upgrade (Paketaktualisierung) ..."
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "Fertig"
 
 msgid "Done"
 msgstr "Fertig"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden "
 "sollen"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden "
 "sollen"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Kann Quellpaket für %s nicht finden"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Kann Quellpaket für %s nicht finden"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Überspringe schon heruntergeladene Datei »%s«\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Überspringe schon heruntergeladene Datei »%s«\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Sie haben nicht genug freien Platz in %s"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Sie haben nicht genug freien Platz in %s"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Es müssen noch %sB von %sB an Quellarchiven heruntergeladen werden.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Es müssen noch %sB von %sB an Quellarchiven heruntergeladen werden.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Es müssen %sB an Quellarchiven heruntergeladen werden.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Es müssen %sB an Quellarchiven heruntergeladen werden.\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Hole Quelle %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Hole Quelle %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "Konnte einige Archive nicht holen."
 
 msgid "Failed to fetch some archives."
 msgstr "Konnte einige Archive nicht holen."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Überprüfen Sie, ob das Paket »dpkg-dev« installiert ist.\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Überprüfen Sie, ob das Paket »dpkg-dev« installiert ist.\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Build-Befehl »%s« fehlgeschlagen.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Build-Befehl »%s« fehlgeschlagen.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "Kindprozess fehlgeschlagen"
 
 msgid "Child process failed"
 msgstr "Kindprozess fehlgeschlagen"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Es muss zumindest ein Paket angegeben werden, dessen Bau-Abhängigkeiten\n"
 "überprüft werden sollen."
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Es muss zumindest ein Paket angegeben werden, dessen Bau-Abhängigkeiten\n"
 "überprüft werden sollen."
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 "Informationen zu Bau-Abhängigkeiten für %s konnten nicht gefunden werden."
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 "Informationen zu Bau-Abhängigkeiten für %s konnten nicht gefunden werden."
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s hat keine Bau-Abhängigkeiten.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s hat keine Bau-Abhängigkeiten.\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "


@@ -1231,7 +1236,7 @@ msgstr ""
 "%s-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht gefunden "
 "werden kann."
 
 "%s-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht gefunden "
 "werden kann."
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1240,32 +1245,33 @@ msgstr ""
 "%s-Abhängigkeit für %s kann nicht erfüllt werden, da keine verfügbare "
 "Version von Paket %s die Versionsanforderungen erfüllen kann."
 
 "%s-Abhängigkeit für %s kann nicht erfüllt werden, da keine verfügbare "
 "Version von Paket %s die Versionsanforderungen erfüllen kann."
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Konnte die %s-Abhängigkeit für %s nicht erfüllen: Installiertes Paket %s ist "
 "zu neu."
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Konnte die %s-Abhängigkeit für %s nicht erfüllen: Installiertes Paket %s ist "
 "zu neu."
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Konnte die %s-Abhängigkeit für %s nicht erfüllen: %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Konnte die %s-Abhängigkeit für %s nicht erfüllen: %s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Bau-Abhängigkeiten für %s konnten nicht erfüllt werden."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Bau-Abhängigkeiten für %s konnten nicht erfüllt werden."
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "Verarbeitung der Bau-Abhängigkeiten fehlgeschlagen"
 
 msgid "Failed to process build dependencies"
 msgstr "Verarbeitung der Bau-Abhängigkeiten fehlgeschlagen"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "Unterstützte Module:"
 
 msgid "Supported modules:"
 msgstr "Unterstützte Module:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1281,7 +1287,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1895,7 +1901,7 @@ msgstr "Datenverbindungsaufbau erlitt Zeitüberschreitung"
 msgid "Unable to accept connection"
 msgstr "Kann Verbindung nicht annehmen"
 
 msgid "Unable to accept connection"
 msgstr "Kann Verbindung nicht annehmen"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf"
 
 msgid "Problem hashing file"
 msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf"
 


@@ -1981,42 +1987,42 @@ msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Kann nicht mit %s %s verbinden:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "Kann nicht mit %s %s verbinden:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Konnte nicht auf Schlüsselring zugreifen: »%s«"
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Konnte nicht auf Schlüsselring zugreifen: »%s«"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "F: Argumentliste von Acquire::gpgv::Options zu lang. Abbruch."
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "F: Argumentliste von Acquire::gpgv::Options zu lang. Abbruch."
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Interner Fehler: Gültige Signatur, aber konnte den Fingerabdruck des "
 "Schlüssels nicht ermitteln?!"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Interner Fehler: Gültige Signatur, aber konnte den Fingerabdruck des "
 "Schlüssels nicht ermitteln?!"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "Mindestens eine ungültige Signatur wurde entdeckt."
 
 msgid "At least one invalid signature was encountered."
 msgstr "Mindestens eine ungültige Signatur wurde entdeckt."
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Konnte »%s« zum Überprüfen der Signatur nicht ausführen (ist gpgv "
 "installiert?)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Konnte »%s« zum Überprüfen der Signatur nicht ausführen (ist gpgv "
 "installiert?)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "Unbekannter Fehler beim Ausführen von gpgv"
 
 msgid "Unknown error executing gpgv"
 msgstr "Unbekannter Fehler beim Ausführen von gpgv"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "Die folgenden Signaturen waren ungültig:\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "Die folgenden Signaturen waren ungültig:\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -2035,82 +2041,82 @@ msgstr "Konnte keine Pipe (Weiterleitung) für %s öffnen"
 msgid "Read error from %s process"
 msgstr "Lesefehler von Prozess %s"
 
 msgid "Read error from %s process"
 msgstr "Lesefehler von Prozess %s"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "Warte auf Kopfzeilen"
 
 msgid "Waiting for headers"
 msgstr "Warte auf Kopfzeilen"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Erhielt einzelne Kopfzeile aus %u Zeichen"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Erhielt einzelne Kopfzeile aus %u Zeichen"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "Ungültige Kopfzeile"
 
 msgid "Bad header line"
 msgstr "Ungültige Kopfzeile"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "Der HTTP-Server sandte eine ungültige Antwort-Kopfzeile"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Der HTTP-Server sandte eine ungültige Antwort-Kopfzeile"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Der HTTP-Server sandte eine ungültige »Content-Length«-Kopfzeile"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Der HTTP-Server sandte eine ungültige »Content-Length«-Kopfzeile"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Der HTTP-Server sandte eine ungültige »Content-Range«-Kopfzeile"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Der HTTP-Server sandte eine ungültige »Content-Range«-Kopfzeile"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "Der HTTP-Server unterstützt Datei-Teilübertragung nur fehlerhaft."
 
 msgid "This HTTP server has broken range support"
 msgstr "Der HTTP-Server unterstützt Datei-Teilübertragung nur fehlerhaft."
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "Unbekanntes Datumsformat"
 
 msgid "Unknown date format"
 msgstr "Unbekanntes Datumsformat"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "Auswahl fehlgeschlagen"
 
 msgid "Select failed"
 msgstr "Auswahl fehlgeschlagen"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "Verbindung erlitt Zeitüberschreitung"
 
 msgid "Connection timed out"
 msgstr "Verbindung erlitt Zeitüberschreitung"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "Fehler beim Schreiben der Ausgabedatei"
 
 msgid "Error writing to output file"
 msgstr "Fehler beim Schreiben der Ausgabedatei"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "Fehler beim Schreiben einer Datei"
 
 msgid "Error writing to file"
 msgstr "Fehler beim Schreiben einer Datei"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "Fehler beim Schreiben der Datei"
 
 msgid "Error writing to the file"
 msgstr "Fehler beim Schreiben der Datei"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Fehler beim Lesen vom Server: Der Server am anderen Ende hat die Verbindung "
 "geschlossen"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Fehler beim Lesen vom Server: Der Server am anderen Ende hat die Verbindung "
 "geschlossen"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "Fehler beim Lesen vom Server"
 
 msgid "Error reading from server"
 msgstr "Fehler beim Lesen vom Server"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 msgid "Failed to truncate file"
 msgstr "Konnte Datei nicht einkürzen"
 
 msgid "Failed to truncate file"
 msgstr "Konnte Datei nicht einkürzen"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "Fehlerhafte Kopfzeilendaten"
 
 msgid "Bad header data"
 msgstr "Fehlerhafte Kopfzeilendaten"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "Verbindung fehlgeschlagen"
 
 msgid "Connection failed"
 msgstr "Verbindung fehlgeschlagen"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "Interner Fehler"
 
 msgid "Internal error"
 msgstr "Interner Fehler"
 


@@ -2130,7 +2136,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "Auswahl %s nicht gefunden"
 #, c-format
 msgid "Selection %s not found"
 msgstr "Auswahl %s nicht gefunden"


@@ -2561,7 +2591,7 @@ msgstr "Der Treiber für Methode %s konnte nicht gefunden werden."
 msgid "Method %s did not start correctly"
 msgstr "Methode %s ist nicht korrekt gestartet"
 
 msgid "Method %s did not start correctly"
 msgstr "Methode %s ist nicht korrekt gestartet"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""


@@ -2941,12 +2971,16 @@ msgstr "Komplettes Entfernen von %s wird vorbereitet"
 msgid "Completely removed %s"
 msgstr "%s vollständig entfernt"
 
 msgid "Completely removed %s"
 msgstr "%s vollständig entfernt"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Kann Protokoll nicht schreiben, openpty() schlug fehl (/dev/pts nicht "
 "eingehangen?)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Kann Protokoll nicht schreiben, openpty() schlug fehl (/dev/pts nicht "
 "eingehangen?)\n"
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Konnte Datei nicht patchen"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Konnte Datei nicht patchen"

diff --git a/po/dz.po b/po/dz.po
index 2d13de4e4ef53f91f59add57ec9cb682a41c30aa..3f2e11122e9164561ef85bf73be7f493b9e01f58 100644 (file)
--- a/po/dz.po
+++ b/po/dz.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po.pot\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt_po.pot\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2006-09-19 09:49+0530\n"
 "Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n"
 "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
 "PO-Revision-Date: 2006-09-19 09:49+0530\n"
 "Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n"
 "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"


@@ -162,7 +162,7 @@ msgstr "%4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s་གི་དོན་ལུ་%s %sགུར་ཕྱོགས་སྒྲིག་འབད་ཡོད་པའི་%s %s\n"
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s་གི་དོན་ལུ་%s %sགུར་ཕྱོགས་སྒྲིག་འབད་ཡོད་པའི་%s %s\n"


@@ -664,7 +664,7 @@ msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི
 msgid "Y"
 msgstr "ཝའི།"
 
 msgid "Y"
 msgstr "ཝའི།"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s"


@@ -827,11 +827,11 @@ msgstr "ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་བཏ
 msgid "Internal error, Ordering didn't finish"
 msgstr "ནང་འཁོད་འཛོལ་བ་  གོ་རིམ་བཟོ་ནི་ཚུ་མཇུག་མ་བསྡུ་བས།"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "ནང་འཁོད་འཛོལ་བ་  གོ་རིམ་བཟོ་ནི་ཚུ་མཇུག་མ་བསྡུ་བས།"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབས་མ་ཚུགས་པས།"
 
 msgid "Unable to lock the download directory"
 msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབས་མ་ཚུགས་པས།"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "འབྱུང་ཁུངས་ཚུ་ཀྱི་ཐོ་ཡིག་དེ་ལྷག་མི་ཚུགས་པས།"
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "འབྱུང་ཁུངས་ཚུ་ཀྱི་ཐོ་ཡིག་དེ་ལྷག་མི་ཚུགས་པས།"


@@ -862,7 +862,7 @@ msgstr "ཁ་སྐོང་གི་%sB་འདི་བཤུབ་པའི
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "%sB་འདི་ཤུབ་པའི་ཤུལ་ལས་ཀྱི་བར་སྟོང་དེ་དལཝ་སྦེ་ལུས་འོང་།\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "%sB་འདི་ཤུབ་པའི་ཤུལ་ལས་ཀྱི་བར་སྟོང་དེ་དལཝ་སྦེ་ལུས་འོང་།\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s་ནང་བར་སྟོང་"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s་ནང་བར་སྟོང་"


@@ -899,7 +899,7 @@ msgstr "བར་བཤོལ་འབད།"
 msgid "Do you want to continue [Y/n]? "
 msgstr "ཁྱོན་ཀྱི་འཕྲོ་མཐུད་ནི་འབད་ནི་ཨིན་ན་[Y/n]?"
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "ཁྱོན་ཀྱི་འཕྲོ་མཐུད་ནི་འབད་ནི་ཨིན་ན་[Y/n]?"
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s  %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s  %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n"


@@ -908,7 +908,7 @@ msgstr "%s  %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བ
 msgid "Some files failed to download"
 msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
 msgid "Some files failed to download"
 msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "ཕབ་ལེན་ཐབས་ལམ་རྐྱངམ་གཅིག་ནང་མཇུག་བསྡུཝ་སྦེ་རང་ཕབ་ལེན་འབད།"
 
 msgid "Download complete and in download only mode"
 msgstr "ཕབ་ལེན་ཐབས་ལམ་རྐྱངམ་གཅིག་ནང་མཇུག་བསྡུཝ་སྦེ་རང་ཕབ་ལེན་འབད།"
 


@@ -1007,30 +1007,35 @@ msgstr "'%s'་གི་དོན་ལུ་འཐོན་རིམ་'%s'་
 msgid "Selected version %s (%s) for %s\n"
 msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།"
 
 msgid "The update command takes no arguments"
 msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།"
 
 msgid "Unable to lock the list directory"
 msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
 
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1046,44 +1051,44 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "འོག་གི་བརྡ་དོན་དེ་གིས་དུས་སྐབས་འདི་མོས་མཐུན་བཟོ་ནི་ལུ་གྲོགས་རམ་འབད་འོང་:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "འོག་གི་བརྡ་དོན་དེ་གིས་དུས་སྐབས་འདི་མོས་མཐུན་བཟོ་ནི་ལུ་གྲོགས་རམ་འབད་འོང་:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།"
 
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "ནང་འགོད་འཛོལ་བ་  ཡར་བསྐྱེད་ཀྱི་ཅ་ཆས་ཆ་མཉམ་མེདཔ་ཐལ་ཡོད།"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "ནང་འགོད་འཛོལ་བ་  ཡར་བསྐྱེད་ཀྱི་ཅ་ཆས་ཆ་མཉམ་མེདཔ་ཐལ་ཡོད།"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
 
 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "དྲན་འཛིན་ རི་ཇེགསི་'%s'གི་དོན་ལུ་%s་སེལ་འཐུ་འབད་དོ།\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "དྲན་འཛིན་ རི་ཇེགསི་'%s'གི་དོན་ལུ་%s་སེལ་འཐུ་འབད་དོ།\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
 
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "འདི་ཚུ་ནོར་བཅོས་འབད་ནིའི་དོན་ལུ་ཁྱོད་ཀྱི་`apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་:"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "འདི་ཚུ་ནོར་བཅོས་འབད་ནིའི་དོན་ལུ་ཁྱོད་ཀྱི་`apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་:"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1091,7 +1096,7 @@ msgstr ""
 "མ་ཚང་བའི་རྟེན་འབྲེལ་  ཐུས་སྒྲིལ་མེད་མི་ཚུ་དང་གཅིག་ཁར་ 'apt-get -f install'དེ་འབཐ་རྩོལ་བསྐྱེདཔ།"
 "(ཡང་ན་ཐབས་ཤེས་ཅིག་གསལ་བཀོད་འབད།)"
 
 "མ་ཚང་བའི་རྟེན་འབྲེལ་  ཐུས་སྒྲིལ་མེད་མི་ཚུ་དང་གཅིག་ཁར་ 'apt-get -f install'དེ་འབཐ་རྩོལ་བསྐྱེདཔ།"
 "(ཡང་ན་ཐབས་ཤེས་ཅིག་གསལ་བཀོད་འབད།)"
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1102,122 +1107,122 @@ msgstr ""
 "འབད་འབདཝ་འོང་ནི་མས་ ཡང་ན་ད་ལྟོ་ཡང་གསར་བསྐྲུན་མ་འབད་བར་ཡོད་པའི་ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་ཡང་ན་ནང་"
 "འབྱོར་གྱི་ཕྱི་ཁར་རྩ་བསྐྲད་བཏང་ཡོད་པའི་རྩ་བརྟན་མེད་པའི་བགོ་འགྲེམ་ཚུ་ལག་ལེན་འཐབ་དོ་ཡོདཔ་འོང་ནི་ཨིན་པས།"
 
 "འབད་འབདཝ་འོང་ནི་མས་ ཡང་ན་ད་ལྟོ་ཡང་གསར་བསྐྲུན་མ་འབད་བར་ཡོད་པའི་ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་ཡང་ན་ནང་"
 "འབྱོར་གྱི་ཕྱི་ཁར་རྩ་བསྐྲད་བཏང་ཡོད་པའི་རྩ་བརྟན་མེད་པའི་བགོ་འགྲེམ་ཚུ་ལག་ལེན་འཐབ་དོ་ཡོདཔ་འོང་ནི་ཨིན་པས།"
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ།"
 
 msgid "Broken packages"
 msgstr "ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ།"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཐེབས་ཚུ་གཞི་བཙུགས་འབད་འོང་:"
 
 msgid "The following extra packages will be installed:"
 msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཐེབས་ཚུ་གཞི་བཙུགས་འབད་འོང་:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "བསམ་འཆར་བཀོད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
 
 msgid "Suggested packages:"
 msgstr "བསམ་འཆར་བཀོད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "འོས་སྦྱོར་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
 
 msgid "Recommended packages:"
 msgstr "འོས་སྦྱོར་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... "
 
 msgid "Calculating upgrade... "
 msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
 
 msgid "Failed"
 msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "འབད་ཚར་ཡི།"
 
 msgid "Done"
 msgstr "འབད་ཚར་ཡི།"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s་གི་དོན་ལུ་འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་ཅིག་འཚོལ་མ་འཐོབ"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s་གི་དོན་ལུ་འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་ཅིག་འཚོལ་མ་འཐོབ"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr " %s་ནང་ཁྱོད་ལུ་བར་སྟོང་ཚུ་ལངམ་སྦེ་མིན་འདུག་"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr " %s་ནང་ཁྱོད་ལུ་བར་སྟོང་ཚུ་ལངམ་སྦེ་མིན་འདུག་"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "%sB་ལེན་དགོཔ་འདུག་  འབྱུང་ཁུངས་ཡིག་མཛོད་ཀྱི་%sB།\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "%sB་ལེན་དགོཔ་འདུག་  འབྱུང་ཁུངས་ཡིག་མཛོད་ཀྱི་%sB།\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "འབྱུང་ཁུངས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསས།\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "འབྱུང་ཁུངས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསས།\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "%s་འབྱུང་ཁུངས་ལེན།\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "%s་འབྱུང་ཁུངས་ལེན།\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
 msgid "Failed to fetch some archives."
 msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོ།\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོ།\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འཐུས་ཤོར་བྱུང་ཡོད།\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འཐུས་ཤོར་བྱུང་ཡོད།\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འཐུས་ཤོར་བྱུང་ནུག"
 
 msgid "Child process failed"
 msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འཐུས་ཤོར་བྱུང་ནུག"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགས།"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགས།"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།"
 
 #, 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:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1226,32 +1231,32 @@ msgstr ""
 "%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་སྐོང་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་ཐུམ་སྒརིལ་%s་གི་འཐོན་རིམ་"
 "ཚུ་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་འཐོན་རིམ་དགོས་མཁོ་ཚུ་གི་རེ་བ་དོ་སྐོང་མ་ཚུགས་པས།"
 
 "%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་སྐོང་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་ཐུམ་སྒརིལ་%s་གི་འཐོན་རིམ་"
 "ཚུ་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་འཐོན་རིམ་དགོས་མཁོ་ཚུ་གི་རེ་བ་དོ་སྐོང་མ་ཚུགས་པས།"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "%s:གི་དོན་ལུ་%s་རྟེན་འབྲེལ་དེ་གི་རེ་བ་སྐོང་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན་  གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་"
 "སྒྲིལ་%s་དེ་གནམ་མེད་ས་མེད་གསརཔ་ཨིན་པས།"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "%s:གི་དོན་ལུ་%s་རྟེན་འབྲེལ་དེ་གི་རེ་བ་སྐོང་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན་  གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་"
 "སྒྲིལ་%s་དེ་གནམ་མེད་ས་མེད་གསརཔ་ཨིན་པས།"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འཐུས་ཤོར་བྱུང་ནུག"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འཐུས་ཤོར་བྱུང་ནུག"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས།"
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས།"
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།"
 
 msgid "Failed to process build dependencies"
 msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:"
 
 msgid "Supported modules:"
 msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628

 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"


@@ -1268,7 +1273,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1872,7 +1877,7 @@ msgstr "གནད་སྡུད་སོ་ཀེཊི་ མཐུད་ན
 msgid "Unable to accept connection"
 msgstr "མཐུད་ལམ་འདི་དང་ལེན་འབད་མ་ཚུགས།"
 
 msgid "Unable to accept connection"
 msgstr "མཐུད་ལམ་འདི་དང་ལེན་འབད་མ་ཚུགས།"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "ཡིག་སྣོད་ལུ་་དྲྭ་རྟགས་བཀལ་བའི་བསྒང་དཀའ་ངལ།"
 
 msgid "Problem hashing file"
 msgstr "ཡིག་སྣོད་ལུ་་དྲྭ་རྟགས་བཀལ་བའི་བསྒང་དཀའ་ངལ།"
 


@@ -1956,43 +1961,43 @@ msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་
 msgid "Unable to connect to %s %s:"
 msgstr "%s %s:ལུ་མཐུད་མ་ཚུགས།"
 
 msgid "Unable to connect to %s %s:"
 msgstr "%s %s:ལུ་མཐུད་མ་ཚུགས།"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "'%s'ལྡེ་འཁོར་འདི་འཛུལ་སྤྱོད་འབད་མ་ཚུགས།"
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "'%s'ལྡེ་འཁོར་འདི་འཛུལ་སྤྱོད་འབད་མ་ཚུགས།"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: Acquire::gpgv::Options་ནང་ལས་ཀྱི་སྒྲུབ་རྟགས་ཀྱི་ཐོ་ཡིག་དེ་གནམ་མེད་ས་མེད་རིངམ་འདུག  ཕྱིར་"
 "འཐོན་དོ།"
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: Acquire::gpgv::Options་ནང་ལས་ཀྱི་སྒྲུབ་རྟགས་ཀྱི་ཐོ་ཡིག་དེ་གནམ་མེད་ས་མེད་རིངམ་འདུག  ཕྱིར་"
 "འཐོན་དོ།"
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "ནང་འཁོད་འཛོལ་བ: མིང་རྟགས་འདི་ལེགས་ཤོམ་ཅིག་འདུག་  འདི་འབདཝ་ད་མཛུབ་རྗེས་ལྡེ་མིག་དེ་གཏན་འབེབས་བཟོ་"
 "མ་ཚུགས?!"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "ནང་འཁོད་འཛོལ་བ: མིང་རྟགས་འདི་ལེགས་ཤོམ་ཅིག་འདུག་  འདི་འབདཝ་ད་མཛུབ་རྗེས་ལྡེ་མིག་དེ་གཏན་འབེབས་བཟོ་"
 "མ་ཚུགས?!"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "ཉུང་མཐའ་རང་ནུས་མེད་ཀྱི་མིང་རྟགས་ཅིག་གདོང་ཐུག་བྱུང་སྟེ་ཡོདཔ་ཨིན།"
 
 msgid "At least one invalid signature was encountered."
 msgstr "ཉུང་མཐའ་རང་ནུས་མེད་ཀྱི་མིང་རྟགས་ཅིག་གདོང་ཐུག་བྱུང་སྟེ་ཡོདཔ་ཨིན།"
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་'%s'འདི་ལག་ལེན་འཐབ་མ་ཚུགས། (gpgv་དེ་ཁཞི་བཙུགས་འབད་ཡོདཔ་ཨིན་ན།?)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་'%s'འདི་ལག་ལེན་འཐབ་མ་ཚུགས། (gpgv་དེ་ཁཞི་བཙུགས་འབད་ཡོདཔ་ཨིན་ན།?)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "gpgv་ལག་ལེན་འཐབ་ནི་ལུ་མ་ཤེས་པའི་འཛོལ་བ་།"
 
 msgid "Unknown error executing gpgv"
 msgstr "gpgv་ལག་ལེན་འཐབ་ནི་ལུ་མ་ཤེས་པའི་འཛོལ་བ་།"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "འོག་གི་མིང་རྟགས་ཚུ་ནུས་མེད་ཨིན་པས།:\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "འོག་གི་མིང་རྟགས་ཚུ་ནུས་མེད་ཨིན་པས།:\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -2009,81 +2014,81 @@ msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འད
 msgid "Read error from %s process"
 msgstr "%s་ལས་སྦྱོར་ནང་ལས་འཛོལ་བ་ཚུ་ལྷག"
 
 msgid "Read error from %s process"
 msgstr "%s་ལས་སྦྱོར་ནང་ལས་འཛོལ་བ་ཚུ་ལྷག"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "མགོ་ཡིག་ཚུ་གི་དོན་ལུ་བསྒ྄ག་དོ།"
 
 msgid "Waiting for headers"
 msgstr "མགོ་ཡིག་ཚུ་གི་དོན་ལུ་བསྒ྄ག་དོ།"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "%u་ཡིག་འབྲུ་ཚུ་གི་ལྟག་ལས་མགོ་ཡིག་རྐྱང་པ་ཅིག་ཐོབ་ཡོད།"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "%u་ཡིག་འབྲུ་ཚུ་གི་ལྟག་ལས་མགོ་ཡིག་རྐྱང་པ་ཅིག་ཐོབ་ཡོད།"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "མགོ་ཡིག་གི་གྲལ་ཐིག་བྱང་ཉེས།"
 
 msgid "Bad header line"
 msgstr "མགོ་ཡིག་གི་གྲལ་ཐིག་བྱང་ཉེས།"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ནུས་མེད་ལན་གསལ་གི་མགོ་ཡིག་ཅིག་བཏང་ཡོད།"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ནུས་མེད་ལན་གསལ་གི་མགོ་ཡིག་ཅིག་བཏང་ཡོད།"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "ཨེཆི་ཊི་ཊི་པི་སར་བར་འདི་གིས་ནུས་མེད་ནང་དོན་རིང་-ཚད་ཀྱི་མགོ་ཡིག་ཅིག་བཏང་ཡོད།"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "ཨེཆི་ཊི་ཊི་པི་སར་བར་འདི་གིས་ནུས་མེད་ནང་དོན་རིང་-ཚད་ཀྱི་མགོ་ཡིག་ཅིག་བཏང་ཡོད།"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ ནུས་མེད་ ནང་དོན་-ཁྱབ་ཚད་ཀྱི་མགོ་ཡིག་ཅིག་བཏང་ཡོད།"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ ནུས་མེད་ ནང་དོན་-ཁྱབ་ཚད་ཀྱི་མགོ་ཡིག་ཅིག་བཏང་ཡོད།"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "འ་ནི་ ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ ཁྱབ་ཚད་ཀྱི་རྒྱབ་སྐྱོར་དེ་ཆད་པ་བཟོ་བཏང་ནུག"
 
 msgid "This HTTP server has broken range support"
 msgstr "འ་ནི་ ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ ཁྱབ་ཚད་ཀྱི་རྒྱབ་སྐྱོར་དེ་ཆད་པ་བཟོ་བཏང་ནུག"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "མ་ཤེས་པའི་ཚེས་རྩ་སྒྲིག"
 
 msgid "Unknown date format"
 msgstr "མ་ཤེས་པའི་ཚེས་རྩ་སྒྲིག"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "སེལ་འཐུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
 msgid "Select failed"
 msgstr "སེལ་འཐུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "མཐུད་ལམ་ངལ་མཚམས་འབད་ཡོད།"
 
 msgid "Connection timed out"
 msgstr "མཐུད་ལམ་ངལ་མཚམས་འབད་ཡོད།"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "ཨའུཊི་པུཊི་ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
 
 msgid "Error writing to output file"
 msgstr "ཨའུཊི་པུཊི་ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
 
 msgid "Error writing to file"
 msgstr "ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "ཡིག་སྣོད་འདི་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
 
 msgid "Error writing to the file"
 msgstr "ཡིག་སྣོད་འདི་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ། ཐག་རིང་མཇུག་གི་མཐུད་ལམ་དེ་ཁ་བསྡམས།"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ། ཐག་རིང་མཇུག་གི་མཐུད་ལམ་དེ་ཁ་བསྡམས།"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ།"
 
 msgid "Error reading from server"
 msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ།"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "མགོ་ཡིག་གནད་སྡུད་བྱང་ཉེས།"
 
 msgid "Bad header data"
 msgstr "མགོ་ཡིག་གནད་སྡུད་བྱང་ཉེས།"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
 msgid "Connection failed"
 msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོད།"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "ནང་འཁོད་འཛོལ་བ།"
 
 msgid "Internal error"
 msgstr "ནང་འཁོད་འཛོལ་བ།"
 


@@ -2103,7 +2108,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "སེལ་འཐུ་%s ་མ་འཐོབ།"
 #, c-format
 msgid "Selection %s not found"
 msgstr "སེལ་འཐུ་%s ་མ་འཐོབ།"


@@ -2534,7 +2563,7 @@ msgstr "ཐབས་ལམ་འདྲེན་བྱེད་%s་འདི་
 msgid "Method %s did not start correctly"
 msgstr "ཐབས་ལམ་ %s འདི་ངེས་བདེན་སྦེ་འགོ་མ་བཙུགས་འབད།"
 
 msgid "Method %s did not start correctly"
 msgstr "ཐབས་ལམ་ %s འདི་ངེས་བདེན་སྦེ་འགོ་མ་བཙུགས་འབད།"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "ཁ་ཡིག་བཀོད་ཡོད་པའི་ ཌིསི་འདི་བཙུགས་གནང་། '%s'འདྲེན་འཕྲུལ་ནང་'%s' དང་ལོག་ལྡེ་འདི་ཨེབ།་"
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "ཁ་ཡིག་བཀོད་ཡོད་པའི་ ཌིསི་འདི་བཙུགས་གནང་། '%s'འདྲེན་འཕྲུལ་ནང་'%s' དང་ལོག་ལྡེ་འདི་ཨེབ།་"


@@ -2900,10 +2929,14 @@ msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བས
 msgid "Completely removed %s"
 msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།"
 
 msgid "Completely removed %s"
 msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 #, fuzzy
 msgid "Could not patch file"
 #: methods/rred.cc:219
 #, fuzzy
 msgid "Could not patch file"

diff --git a/po/el.po b/po/el.po
index a2f53c13fa63cab207d8aa29bac937ebf003d830..f02d04f853d48f385d25160347e8f5acb7d43964 100644 (file)
--- a/po/el.po
+++ b/po/el.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_el\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt_po_el\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2008-08-26 18:25+0300\n"
 "Last-Translator: quad-nrg.net <yodesy@quad-nrg.net>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
 "PO-Revision-Date: 2008-08-26 18:25+0300\n"
 "Last-Translator: quad-nrg.net <yodesy@quad-nrg.net>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"


@@ -168,7 +168,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s για %s είναι μεταγλωττισμένο σε %s %s\n"
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s για %s είναι μεταγλωττισμένο σε %s %s\n"


@@ -672,7 +672,7 @@ msgstr "Αποτυχία μετονομασίας του %s σε %s"
 msgid "Y"
 msgstr "Y"
 
 msgid "Y"
 msgstr "Y"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "σφάλμα μεταγλωτισμου - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "σφάλμα μεταγλωτισμου - %s"


@@ -836,11 +836,11 @@ msgstr ""
 msgid "Internal error, Ordering didn't finish"
 msgstr "Εσωτερικό Σφάλμα, η Ταξινόμηση δεν ολοκληρώθηκε"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "Εσωτερικό Σφάλμα, η Ταξινόμηση δεν ολοκληρώθηκε"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης"
 
 msgid "Unable to lock the download directory"
 msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Αδύνατη η ανάγνωση της λίστας πηγών."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Αδύνατη η ανάγνωση της λίστας πηγών."


@@ -872,7 +872,7 @@ msgstr ""
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Μετά από αυτή τη λειτουργία, θα ελευθερωθούν %sB χώρου από το δίσκο.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Μετά από αυτή τη λειτουργία, θα ελευθερωθούν %sB χώρου από το δίσκο.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s"


@@ -909,7 +909,7 @@ msgstr "Εγκατάλειψη."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Θέλετε να συνεχίσετε [Ν/ο]; "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "Θέλετε να συνεχίσετε [Ν/ο]; "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Αποτυχία ανάκτησης του %s   %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Αποτυχία ανάκτησης του %s   %s\n"


@@ -918,7 +918,7 @@ msgstr "Αποτυχία ανάκτησης του %s   %s\n"
 msgid "Some files failed to download"
 msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση"
 
 msgid "Some files failed to download"
 msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο"
 
 msgid "Download complete and in download only mode"
 msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο"
 


@@ -1020,30 +1020,35 @@ msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Επιλέχθηκε η έκδοση %s (%s) για το%s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Επιλέχθηκε η έκδοση %s (%s) για το%s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "Η εντολή update δεν παίρνει ορίσματα"
 
 msgid "The update command takes no arguments"
 msgstr "Η εντολή update δεν παίρνει ορίσματα"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "Αδύνατο το κλείδωμα του καταλόγου"
 
 msgid "Unable to lock the list directory"
 msgstr "Αδύνατο το κλείδωμα του καταλόγου"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Δεν επιτρέπεται οποιαδήποτε διαγραφή· αδυναμία εκκίνησης του AutoRemover"
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Δεν επιτρέπεται οποιαδήποτε διαγραφή· αδυναμία εκκίνησης του AutoRemover"
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:"
 
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Χρησιμοποιήστε 'apt-get autoremove' για να τα διαγράψετε."
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Χρησιμοποιήστε 'apt-get autoremove' για να τα διαγράψετε."
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1061,43 +1066,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Εσωτερικό Σφάλμα, το AutoRemover δημιούργησε κάποιο πρόβλημα"
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Εσωτερικό Σφάλμα, το AutoRemover δημιούργησε κάποιο πρόβλημα"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Εσωτερικό Σφάλμα, η διαδικασία αναβάθμισης χάλασε"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Εσωτερικό Σφάλμα, η διαδικασία αναβάθμισης χάλασε"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Αδύνατη η εύρεση του συνόλου πακέτων %s"
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Αδύνατη η εύρεση του συνόλου πακέτων %s"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Αδύνατη η εύρεση του πακέτου %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Αδύνατη η εύρεση του πακέτου %s"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "το %s έχει εγκατασταθεί με το χέρι\n"
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "το %s έχει εγκατασταθεί με το χέρι\n"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Aν τρέξετε 'apt-get -f install' ίσως να διορθώσετε αυτά τα προβλήματα:"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Aν τρέξετε 'apt-get -f install' ίσως να διορθώσετε αυτά τα προβλήματα:"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1105,7 +1110,7 @@ msgstr ""
 "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε "
 "πακέτο (ή καθορίστε μια λύση)."
 
 "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε "
 "πακέτο (ή καθορίστε μια λύση)."
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1117,120 +1122,120 @@ msgstr ""
 "διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n"
 "μετακινηθεί από τα εισερχόμενα."
 
 "διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n"
 "μετακινηθεί από τα εισερχόμενα."
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "Χαλασμένα πακέτα"
 
 msgid "Broken packages"
 msgstr "Χαλασμένα πακέτα"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:"
 
 msgid "The following extra packages will be installed:"
 msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "Προτεινόμενα πακέτα:"
 
 msgid "Suggested packages:"
 msgstr "Προτεινόμενα πακέτα:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "Συνιστώμενα πακέτα:"
 
 msgid "Recommended packages:"
 msgstr "Συνιστώμενα πακέτα:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "Υπολογισμός της αναβάθμισης... "
 
 msgid "Calculating upgrade... "
 msgstr "Υπολογισμός της αναβάθμισης... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "Απέτυχε"
 
 msgid "Failed"
 msgstr "Απέτυχε"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "Ετοιμο"
 
 msgid "Done"
 msgstr "Ετοιμο"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο "
 "υλικό"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο "
 "υλικό"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον "
 "κωδικάτου"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον "
 "κωδικάτου"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Μεταφόρτωση Κωδικα %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Μεταφόρτωση Κωδικα %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών."
 
 msgid "Failed to fetch some archives."
 msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Απέτυχε η εντολή χτισίματος %s.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Απέτυχε η εντολή χτισίματος %s.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "Η απογονική διεργασία απέτυχε"
 
 msgid "Child process failed"
 msgstr "Η απογονική διεργασία απέτυχε"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "


@@ -1238,7 +1243,7 @@ msgid ""
 msgstr ""
 "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε"
 
 msgstr ""
 "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1247,32 +1252,33 @@ msgstr ""
 "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες "
 "εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης"
 
 "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες "
 "εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s "
 "είναι νεώτερο"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s "
 "είναι νεώτερο"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται."
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος"
 
 msgid "Failed to process build dependencies"
 msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "Υποστηριζόμενοι Οδηγοί:"
 
 msgid "Supported modules:"
 msgstr "Υποστηριζόμενοι Οδηγοί:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1288,7 +1294,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1888,7 +1894,7 @@ msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδο
 msgid "Unable to accept connection"
 msgstr "Αδύνατη η αποδοχή συνδέσεων"
 
 msgid "Unable to accept connection"
 msgstr "Αδύνατη η αποδοχή συνδέσεων"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "Πρόβλημα κατά το hashing του αρχείου"
 
 msgid "Problem hashing file"
 msgstr "Πρόβλημα κατά το hashing του αρχείου"
 


@@ -1972,42 +1978,42 @@ msgstr "Κάτι παράξενο συνέβη κατά την εύρεση το
 msgid "Unable to connect to %s %s:"
 msgstr "Αδύνατη η σύνδεση στο %s %s:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "Αδύνατη η σύνδεση στο %s %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Αδύνατη η εύρεση του συνόλου κλειδιών '%s'"
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Αδύνατη η εύρεση του συνόλου κλειδιών '%s'"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "Ε: Λίστα Ορισμάτων από Acquire::gpgv::Options πολύ μεγάλη. Έξοδος."
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "Ε: Λίστα Ορισμάτων από Acquire::gpgv::Options πολύ μεγάλη. Έξοδος."
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Εσωτερικό σφάλμα: Η υπογραφή είναι καλή, αλλά αδυναμία προσδιορισμού του "
 "αποτυπώματος?!"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Εσωτερικό σφάλμα: Η υπογραφή είναι καλή, αλλά αδυναμία προσδιορισμού του "
 "αποτυπώματος?!"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "Βρέθηκε τουλάχιστον μια μη έγκυρη υπογραφή."
 
 msgid "At least one invalid signature was encountered."
 msgstr "Βρέθηκε τουλάχιστον μια μη έγκυρη υπογραφή."
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Αδυναμία εκτέλεσης του '%s' για την επαλήθευση της υπογραφής (είναι "
 "εγκατεστημένο το gpgv;)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Αδυναμία εκτέλεσης του '%s' για την επαλήθευση της υπογραφής (είναι "
 "εγκατεστημένο το gpgv;)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "Άγνωστο σφάλμα κατά την εκτέλεση του gpgv"
 
 msgid "Unknown error executing gpgv"
 msgstr "Άγνωστο σφάλμα κατά την εκτέλεση του gpgv"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "Οι παρακάτω υπογραφές ήταν μη έγκυρες:\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "Οι παρακάτω υπογραφές ήταν μη έγκυρες:\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -2025,82 +2031,82 @@ msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το
 msgid "Read error from %s process"
 msgstr "Σφάλμα ανάγνωσης από τη διεργασία %s"
 
 msgid "Read error from %s process"
 msgstr "Σφάλμα ανάγνωσης από τη διεργασία %s"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "Αναμονή επικεφαλίδων"
 
 msgid "Waiting for headers"
 msgstr "Αναμονή επικεφαλίδων"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Λήψη μίας και μόνης γραμμής επικεφαλίδας πάνω από %u χαρακτήρες"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Λήψη μίας και μόνης γραμμής επικεφαλίδας πάνω από %u χαρακτήρες"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "Ελαττωματική γραμμή επικεφαλίδας"
 
 msgid "Bad header line"
 msgstr "Ελαττωματική γραμμή επικεφαλίδας"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα απάντησης"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα απάντησης"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Length"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Length"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Range"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Range"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρως το range"
 
 msgid "This HTTP server has broken range support"
 msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρως το range"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "Άγνωστη μορφή ημερομηνίας"
 
 msgid "Unknown date format"
 msgstr "Άγνωστη μορφή ημερομηνίας"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "Η επιλογή απέτυχε"
 
 msgid "Select failed"
 msgstr "Η επιλογή απέτυχε"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "Λήξη χρόνου σύνδεσης"
 
 msgid "Connection timed out"
 msgstr "Λήξη χρόνου σύνδεσης"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου"
 
 msgid "Error writing to output file"
 msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "Σφάλμα στην εγγραφή στο αρχείο"
 
 msgid "Error writing to file"
 msgstr "Σφάλμα στην εγγραφή στο αρχείο"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "Σφάλμα στην εγγραφή στο αρχείο"
 
 msgid "Error writing to the file"
 msgstr "Σφάλμα στην εγγραφή στο αρχείο"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "Σφάλμα στην ανάγνωση από το διακομιστή"
 
 msgid "Error reading from server"
 msgstr "Σφάλμα στην ανάγνωση από το διακομιστή"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Αποτυχία εγγραφής του αρχείου %s"
 
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Αποτυχία εγγραφής του αρχείου %s"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "Ελαττωματικά δεδομένα επικεφαλίδας"
 
 msgid "Bad header data"
 msgstr "Ελαττωματικά δεδομένα επικεφαλίδας"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "Η σύνδεση απέτυχε"
 
 msgid "Connection failed"
 msgstr "Η σύνδεση απέτυχε"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "Εσωτερικό Σφάλμα"
 
 msgid "Internal error"
 msgstr "Εσωτερικό Σφάλμα"
 


@@ -2120,7 +2126,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "Η επιλογή %s δε βρέθηκε"
 #, c-format
 msgid "Selection %s not found"
 msgstr "Η επιλογή %s δε βρέθηκε"


@@ -2554,7 +2584,7 @@ msgstr "Ο οδηγός μεθόδου %s δεν μπορεί να εντοπι
 msgid "Method %s did not start correctly"
 msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά"
 
 msgid "Method %s did not start correctly"
 msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""


@@ -2926,12 +2956,16 @@ msgstr "Προετοιμασία πλήρης αφαίρεσης του %s"
 msgid "Completely removed %s"
 msgstr "Το %s διαγράφηκε πλήρως"
 
 msgid "Completely removed %s"
 msgstr "Το %s διαγράφηκε πλήρως"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Αδυναμία εγγραφής στο αρχείο γεγονότων, λόγω αποτυχίας του openpyt() (είναι "
 "προσαρτημένο το /dev/pts;)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Αδυναμία εγγραφής στο αρχείο γεγονότων, λόγω αποτυχίας του openpyt() (είναι "
 "προσαρτημένο το /dev/pts;)\n"
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Αδύνατη η διόρθωση του αρχείου"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Αδύνατη η διόρθωση του αρχείου"

diff --git a/po/en_GB.po b/po/en_GB.po
index a5b09aa3c067d3a6a29e185eaf4e7a87029029a3..dc854782e22f0d4cf7b95d8041f97cac333de5bd 100644 (file)
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.18\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt 0.7.18\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2008-11-13 11:47+0000\n"
 "Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
 "Language-Team: en_GB <en_gb@li.org>\n"
 "PO-Revision-Date: 2008-11-13 11:47+0000\n"
 "Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
 "Language-Team: en_GB <en_gb@li.org>\n"


@@ -156,7 +156,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s compiled on %s %s\n"
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s compiled on %s %s\n"


@@ -651,7 +651,7 @@ msgstr "Failed to rename %s to %s"
 msgid "Y"
 msgstr "Y"
 
 msgid "Y"
 msgstr "Y"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex compilation error - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex compilation error - %s"


@@ -812,11 +812,11 @@ msgstr "Packages need to be removed but remove is disabled."
 msgid "Internal error, Ordering didn't finish"
 msgstr "Internal error, Ordering didn't finish"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "Internal error, Ordering didn't finish"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "Unable to lock the download directory"
 
 msgid "Unable to lock the download directory"
 msgstr "Unable to lock the download directory"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "The list of sources could not be read."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "The list of sources could not be read."


@@ -845,7 +845,7 @@ msgstr "After this operation, %sB of additional disk space will be used.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "After this operation, %sB disk space will be freed.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "After this operation, %sB disk space will be freed.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Couldn't determine free space in %s"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Couldn't determine free space in %s"


@@ -882,7 +882,7 @@ msgstr "Abort."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Do you want to continue [Y/n]? "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "Do you want to continue [Y/n]? "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Failed to fetch %s  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Failed to fetch %s  %s\n"


@@ -891,7 +891,7 @@ msgstr "Failed to fetch %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Some files failed to download"
 
 msgid "Some files failed to download"
 msgstr "Some files failed to download"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "Download complete and in download only mode"
 
 msgid "Download complete and in download only mode"
 msgstr "Download complete and in download only mode"
 


@@ -988,19 +988,24 @@ msgstr "Version ‘%s’ for ‘%s’ was not found"
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Selected version %s (%s) for %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Selected version %s (%s) for %s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "The update command takes no arguments"
 
 msgid "The update command takes no arguments"
 msgstr "The update command takes no arguments"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "Unable to lock the list directory"
 
 msgid "Unable to lock the list directory"
 msgstr "Unable to lock the list directory"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "We are not supposed to delete stuff, cannot start AutoRemover"
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "We are not supposed to delete stuff, cannot start AutoRemover"
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"


@@ -1008,11 +1013,11 @@ msgstr ""
 "The following packages were automatically installed and are no longer "
 "required:"
 
 "The following packages were automatically installed and are no longer "
 "required:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Use 'apt-get autoremove' to remove them."
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Use 'apt-get autoremove' to remove them."
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1030,43 +1035,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "The following information may help to resolve the situation:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "The following information may help to resolve the situation:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Internal Error, AutoRemoved broke stuff"
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Internal Error, AutoRemoved broke stuff"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Internal error, AllUpgrade broke stuff"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Internal error, AllUpgrade broke stuff"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Couldn't find task %s"
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Couldn't find task %s"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Couldn't find package %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Couldn't find package %s"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Note, selecting %s for regex ‘%s’\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Note, selecting %s for regex ‘%s’\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s set to manually installed.\n"
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s set to manually installed.\n"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "You might want to run 'apt-get -f install' to correct these:"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "You might want to run 'apt-get -f install' to correct these:"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1074,7 +1079,7 @@ msgstr ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1086,116 +1091,116 @@ msgstr ""
 "distribution that some required packages have not yet been created\n"
 "or been moved out of Incoming."
 
 "distribution that some required packages have not yet been created\n"
 "or been moved out of Incoming."
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "Broken packages"
 
 msgid "Broken packages"
 msgstr "Broken packages"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "The following extra packages will be installed:"
 
 msgid "The following extra packages will be installed:"
 msgstr "The following extra packages will be installed:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "Suggested packages:"
 
 msgid "Suggested packages:"
 msgstr "Suggested packages:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "Recommended packages:"
 
 msgid "Recommended packages:"
 msgstr "Recommended packages:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "Calculating upgrade... "
 
 msgid "Calculating upgrade... "
 msgstr "Calculating upgrade... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "Failed"
 
 msgid "Failed"
 msgstr "Failed"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "Done"
 
 msgid "Done"
 msgstr "Done"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr "Internal error, problem resolver broke stuff"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Internal error, problem resolver broke stuff"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr "Must specify at least one package for which to fetch source"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "Must specify at least one package for which to fetch source"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Unable to find a source package for %s"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Unable to find a source package for %s"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Skipping already downloaded file '%s'\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Skipping already downloaded file '%s'\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "You don't have enough free space in %s"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "You don't have enough free space in %s"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Need to get %sB/%sB of source archives.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Need to get %sB/%sB of source archives.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Need to get %sB of source archives.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Need to get %sB of source archives.\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Fetch source %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Fetch source %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "Failed to fetch some archives."
 
 msgid "Failed to fetch some archives."
 msgstr "Failed to fetch some archives."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Skipping unpack of already unpacked source in %s\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Skipping unpack of already unpacked source in %s\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Unpack command ‘%s’ failed.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Unpack command ‘%s’ failed.\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Check if the 'dpkg-dev' package is installed.\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Check if the 'dpkg-dev' package is installed.\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Build command ‘%s’ failed.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Build command ‘%s’ failed.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "Child process failed"
 
 msgid "Child process failed"
 msgstr "Child process failed"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Must specify at least one package for which you want to check builddeps"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Must specify at least one package for which you want to check builddeps"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Unable to get build-dependency information for %s"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Unable to get build-dependency information for %s"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s has no build depends.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s has no build depends.\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "


@@ -1204,7 +1209,7 @@ msgstr ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1213,31 +1218,32 @@ msgstr ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Failed to satisfy %s dependency for %s: %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Failed to satisfy %s dependency for %s: %s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Build-dependencies for %s could not be satisfied."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Build-dependencies for %s could not be satisfied."
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "Failed to process build dependencies"
 
 msgid "Failed to process build dependencies"
 msgstr "Failed to process build dependencies"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "Supported modules:"
 
 msgid "Supported modules:"
 msgstr "Supported modules:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1253,7 +1259,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1850,7 +1856,7 @@ msgstr "Data socket connect timed out"
 msgid "Unable to accept connection"
 msgstr "Unable to accept connection"
 
 msgid "Unable to accept connection"
 msgstr "Unable to accept connection"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "Problem hashing file"
 
 msgid "Problem hashing file"
 msgstr "Problem hashing file"
 


@@ -1934,39 +1940,39 @@ msgstr "Something wicked happened resolving ‘%s:%s’ (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Unable to connect to %s %s:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "Unable to connect to %s %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Couldn't access keyring: '%s'"
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Couldn't access keyring: '%s'"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "At least one invalid signature was encountered."
 
 msgid "At least one invalid signature was encountered."
 msgstr "At least one invalid signature was encountered."
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "Could not execute '%s' to verify signature (is gpgv installed?)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "Could not execute '%s' to verify signature (is gpgv installed?)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "Unknown error executing gpgv"
 
 msgid "Unknown error executing gpgv"
 msgstr "Unknown error executing gpgv"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "The following signatures were invalid:\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "The following signatures were invalid:\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -1984,80 +1990,80 @@ msgstr "Couldn't open pipe for %s"
 msgid "Read error from %s process"
 msgstr "Read error from %s process"
 
 msgid "Read error from %s process"
 msgstr "Read error from %s process"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "Waiting for headers"
 
 msgid "Waiting for headers"
 msgstr "Waiting for headers"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Got a single header line over %u chars"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Got a single header line over %u chars"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "Bad header line"
 
 msgid "Bad header line"
 msgstr "Bad header line"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "The HTTP server sent an invalid reply header"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "The HTTP server sent an invalid reply header"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "The HTTP server sent an invalid Content-Length header"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "The HTTP server sent an invalid Content-Length header"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "The HTTP server sent an invalid Content-Range header"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "The HTTP server sent an invalid Content-Range header"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "This HTTP server has broken range support"
 
 msgid "This HTTP server has broken range support"
 msgstr "This HTTP server has broken range support"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "Unknown date format"
 
 msgid "Unknown date format"
 msgstr "Unknown date format"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "Select failed"
 
 msgid "Select failed"
 msgstr "Select failed"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "Connection timed out"
 
 msgid "Connection timed out"
 msgstr "Connection timed out"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "Error writing to output file"
 
 msgid "Error writing to output file"
 msgstr "Error writing to output file"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "Error writing to file"
 
 msgid "Error writing to file"
 msgstr "Error writing to file"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "Error writing to the file"
 
 msgid "Error writing to the file"
 msgstr "Error writing to the file"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "Error reading from server. Remote end closed connection"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Error reading from server. Remote end closed connection"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "Error reading from server"
 
 msgid "Error reading from server"
 msgstr "Error reading from server"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 msgid "Failed to truncate file"
 msgstr "Failed to truncate file"
 
 msgid "Failed to truncate file"
 msgstr "Failed to truncate file"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "Bad header data"
 
 msgid "Bad header data"
 msgstr "Bad header data"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "Connection failed"
 
 msgid "Connection failed"
 msgstr "Connection failed"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "Internal error"
 
 msgid "Internal error"
 msgstr "Internal error"
 


@@ -2077,7 +2083,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "Selection %s not found"
 #, c-format
 msgid "Selection %s not found"
 msgstr "Selection %s not found"


@@ -2504,7 +2534,7 @@ msgstr "The method driver %s could not be found."
 msgid "Method %s did not start correctly"
 msgstr "Method %s did not start correctly"
 
 msgid "Method %s did not start correctly"
 msgstr "Method %s did not start correctly"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""


@@ -2867,10 +2897,14 @@ msgstr "Preparing to completely remove %s"
 msgid "Completely removed %s"
 msgstr "Completely removed %s"
 
 msgid "Completely removed %s"
 msgstr "Completely removed %s"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Could not patch file"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Could not patch file"

diff --git a/po/es.po b/po/es.po
index 3a51890aaf24ade13816efbedfbf3c597bee2198..c7a16b46db287b2d3d1923e09b11bd78ee62994c 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.18\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt 0.7.18\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2008-11-15 21:52+0100\n"
 "Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
 "PO-Revision-Date: 2008-11-15 21:52+0100\n"
 "Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"


@@ -160,7 +160,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para %s compilado en %s %s\n"
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para %s compilado en %s %s\n"


@@ -666,7 +666,7 @@ msgstr "Fall
 msgid "Y"
 msgstr "S"
 
 msgid "Y"
 msgstr "S"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Error de compilación de expresiones regulares - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Error de compilación de expresiones regulares - %s"


@@ -827,11 +827,11 @@ msgstr "Los paquetes necesitan eliminarse pero Remove est
 msgid "Internal error, Ordering didn't finish"
 msgstr "Error interno, no terminó el ordenamiento"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "Error interno, no terminó el ordenamiento"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "No se puede bloquear el directorio de descarga"
 
 msgid "Unable to lock the download directory"
 msgstr "No se puede bloquear el directorio de descarga"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "No se pudieron leer las listas de fuentes."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "No se pudieron leer las listas de fuentes."


@@ -863,7 +863,7 @@ msgstr ""
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Se liberarán %sB después de esta operación.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Se liberarán %sB después de esta operación.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "No pude determinar el espacio libre en %s"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "No pude determinar el espacio libre en %s"


@@ -900,7 +900,7 @@ msgstr "Abortado."
 msgid "Do you want to continue [Y/n]? "
 msgstr "¿Desea continuar [S/n]? "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "¿Desea continuar [S/n]? "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Imposible obtener %s  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Imposible obtener %s  %s\n"


@@ -909,7 +909,7 @@ msgstr "Imposible obtener %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Algunos archivos no pudieron descargarse"
 
 msgid "Some files failed to download"
 msgstr "Algunos archivos no pudieron descargarse"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "Descarga completa y en modo de sólo descarga"
 
 msgid "Download complete and in download only mode"
 msgstr "Descarga completa y en modo de sólo descarga"
 


@@ -1006,20 +1006,25 @@ msgstr "No se encontr
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Versión seleccionada %s (%s) para %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Versión seleccionada %s (%s) para %s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "El comando de actualización no toma argumentos"
 
 msgid "The update command takes no arguments"
 msgstr "El comando de actualización no toma argumentos"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "No se pudo bloquear el directorio de listas"
 
 msgid "Unable to lock the list directory"
 msgstr "No se pudo bloquear el directorio de listas"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Se supone que no vamos a eliminar cosas, no se pudo iniciar «AutoRemover»"
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Se supone que no vamos a eliminar cosas, no se pudo iniciar «AutoRemover»"
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"


@@ -1027,11 +1032,11 @@ msgstr ""
 "Se instalaron de forma automática los siguientes paquetes y ya no son "
 "necesarios."
 
 "Se instalaron de forma automática los siguientes paquetes y ya no son "
 "necesarios."
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Utilice «apt-get autoremove» para eliminarlos."
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Utilice «apt-get autoremove» para eliminarlos."
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1049,43 +1054,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "La siguiente información puede ayudar a resolver la situación:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "La siguiente información puede ayudar a resolver la situación:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Error interno, «AutoRemover» rompió cosas"
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Error interno, «AutoRemover» rompió cosas"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Error Interno, AllUpgrade rompió cosas"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Error Interno, AllUpgrade rompió cosas"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr "No se pudo encontrar la tarea %s"
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "No se pudo encontrar la tarea %s"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "No se pudo encontrar el paquete %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "No se pudo encontrar el paquete %s"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Nota, seleccionando %s para la expresión regular '%s'\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Nota, seleccionando %s para la expresión regular '%s'\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "fijado %s como instalado manualmente.\n"
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "fijado %s como instalado manualmente.\n"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo:"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo:"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1093,7 +1098,7 @@ msgstr ""
 "Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o "
 "especifique una solución)."
 
 "Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o "
 "especifique una solución)."
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1105,119 +1110,119 @@ msgstr ""
 "inestable, que algunos paquetes necesarios no han sido creados o han\n"
 "sido movidos fuera de Incoming."
 
 "inestable, que algunos paquetes necesarios no han sido creados o han\n"
 "sido movidos fuera de Incoming."
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "Paquetes rotos"
 
 msgid "Broken packages"
 msgstr "Paquetes rotos"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "Se instalarán los siguientes paquetes extras:"
 
 msgid "The following extra packages will be installed:"
 msgstr "Se instalarán los siguientes paquetes extras:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "Paquetes sugeridos:"
 
 msgid "Suggested packages:"
 msgstr "Paquetes sugeridos:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "Paquetes recomendados"
 
 msgid "Recommended packages:"
 msgstr "Paquetes recomendados"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "Calculando la actualización... "
 
 msgid "Calculating upgrade... "
 msgstr "Calculando la actualización... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "Falló"
 
 msgid "Failed"
 msgstr "Falló"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "Listo"
 
 msgid "Done"
 msgstr "Listo"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "Error interno, el sistema de solución de problemas rompió\n"
 "algunas cosas"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "Error interno, el sistema de solución de problemas rompió\n"
 "algunas cosas"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr "Debe especificar al menos un paquete para obtener su código fuente"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "Debe especificar al menos un paquete para obtener su código fuente"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "No se pudo encontrar un paquete de fuentes para %s"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "No se pudo encontrar un paquete de fuentes para %s"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Ignorando fichero ya descargado '%s'\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Ignorando fichero ya descargado '%s'\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "No tiene suficiente espacio libre en %s"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "No tiene suficiente espacio libre en %s"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Necesito descargar %sB/%sB de archivos fuente.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Necesito descargar %sB/%sB de archivos fuente.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Necesito descargar %sB de archivos fuente.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Necesito descargar %sB de archivos fuente.\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Fuente obtenida %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Fuente obtenida %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "No se pudieron obtener algunos archivos."
 
 msgid "Failed to fetch some archives."
 msgstr "No se pudieron obtener algunos archivos."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Falló la orden de desempaquetamiento '%s'.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Falló la orden de desempaquetamiento '%s'.\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Compruebe que el paquete «dpkg-dev» esté instalado.\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Compruebe que el paquete «dpkg-dev» esté instalado.\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Falló la orden de construcción '%s'.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Falló la orden de construcción '%s'.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "Falló el proceso hijo"
 
 msgid "Child process failed"
 msgstr "Falló el proceso hijo"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Debe especificar al menos un paquete para verificar sus\n"
 "dependencias de construcción"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Debe especificar al menos un paquete para verificar sus\n"
 "dependencias de construcción"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "No se pudo obtener información de dependencias de construcción para %s"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "No se pudo obtener información de dependencias de construcción para %s"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s no tiene dependencias de construcción.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s no tiene dependencias de construcción.\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "


@@ -1226,7 +1231,7 @@ msgstr ""
 "La dependencia %s en %s no puede satisfacerse porque no se puede \n"
 "encontrar el paquete %s"
 
 "La dependencia %s en %s no puede satisfacerse porque no se puede \n"
 "encontrar el paquete %s"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1235,32 +1240,33 @@ msgstr ""
 "La dependencia %s en %s no puede satisfacerse porque ninguna versión\n"
 "disponible del paquete %s satisface los requisitos de versión"
 
 "La dependencia %s en %s no puede satisfacerse porque ninguna versión\n"
 "disponible del paquete %s satisface los requisitos de versión"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es "
 "demasiado nuevo"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es "
 "demasiado nuevo"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "No se pudo satisfacer la dependencia %s para %s: %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "No se pudo satisfacer la dependencia %s para %s: %s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "No se pudieron satisfacer las dependencias de construcción de %s."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "No se pudieron satisfacer las dependencias de construcción de %s."
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "No se pudieron procesar las dependencias de construcción"
 
 msgid "Failed to process build dependencies"
 msgstr "No se pudieron procesar las dependencias de construcción"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "Módulos soportados:"
 
 msgid "Supported modules:"
 msgstr "Módulos soportados:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1276,7 +1282,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1881,7 +1887,7 @@ msgstr "Expir
 msgid "Unable to accept connection"
 msgstr "No pude aceptar la conexión"
 
 msgid "Unable to accept connection"
 msgstr "No pude aceptar la conexión"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "Hay problemas enlazando fichero"
 
 msgid "Problem hashing file"
 msgstr "Hay problemas enlazando fichero"
 


@@ -1965,41 +1971,41 @@ msgstr "Algo raro pas
 msgid "Unable to connect to %s %s:"
 msgstr "No pude conectarme a %s %s:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "No pude conectarme a %s %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "No se pudo acceder al anillo de claves: '%s'"
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "No se pudo acceder al anillo de claves: '%s'"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: Lista de argumentos de Acquire::gpgv::Options demasiado larga. Terminando."
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: Lista de argumentos de Acquire::gpgv::Options demasiado larga. Terminando."
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Error interno: Firma correcta, pero no se pudo determinar su huella digital?!"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Error interno: Firma correcta, pero no se pudo determinar su huella digital?!"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "Se encontró al menos una firma inválida."
 
 msgid "At least one invalid signature was encountered."
 msgstr "Se encontró al menos una firma inválida."
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "No se pudo ejecutar '%s'  para verificar la firma (¿está instalado gpgv?)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "No se pudo ejecutar '%s'  para verificar la firma (¿está instalado gpgv?)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "Error desconocido ejecutando gpgv"
 
 msgid "Unknown error executing gpgv"
 msgstr "Error desconocido ejecutando gpgv"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "Las siguientes firms fueron inválidas:\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "Las siguientes firms fueron inválidas:\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -2017,80 +2023,80 @@ msgstr "No pude abrir una tuber
 msgid "Read error from %s process"
 msgstr "Error de lectura de %s procesos"
 
 msgid "Read error from %s process"
 msgstr "Error de lectura de %s procesos"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "Esperando las cabeceras"
 
 msgid "Waiting for headers"
 msgstr "Esperando las cabeceras"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Obtuve una sola línea de cabecera arriba de %u caracteres"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Obtuve una sola línea de cabecera arriba de %u caracteres"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "Mala línea de cabecera"
 
 msgid "Bad header line"
 msgstr "Mala línea de cabecera"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "El servidor de http envió una cabecera de respuesta inválida"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "El servidor de http envió una cabecera de respuesta inválida"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "El servidor de http envió una cabecera de Content-Length inválida"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "El servidor de http envió una cabecera de Content-Length inválida"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "El servidor de http envió una cabecera de Content-Range inválida"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "El servidor de http envió una cabecera de Content-Range inválida"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "Éste servidor de http tiene el soporte de alcance roto"
 
 msgid "This HTTP server has broken range support"
 msgstr "Éste servidor de http tiene el soporte de alcance roto"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "Formato de fecha desconocido"
 
 msgid "Unknown date format"
 msgstr "Formato de fecha desconocido"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "Falló la selección"
 
 msgid "Select failed"
 msgstr "Falló la selección"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "Expiró la conexión"
 
 msgid "Connection timed out"
 msgstr "Expiró la conexión"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "Error escribiendo al archivo de salida"
 
 msgid "Error writing to output file"
 msgstr "Error escribiendo al archivo de salida"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "Error escribiendo a archivo"
 
 msgid "Error writing to file"
 msgstr "Error escribiendo a archivo"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "Error escribiendo al archivo"
 
 msgid "Error writing to the file"
 msgstr "Error escribiendo al archivo"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "Error leyendo del servidor, el lado remoto cerró la conexión."
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Error leyendo del servidor, el lado remoto cerró la conexión."
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "Error leyendo del servidor"
 
 msgid "Error reading from server"
 msgstr "Error leyendo del servidor"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 msgid "Failed to truncate file"
 msgstr "Falló al truncar el archivo"
 
 msgid "Failed to truncate file"
 msgstr "Falló al truncar el archivo"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "Mala cabecera Data"
 
 msgid "Bad header data"
 msgstr "Mala cabecera Data"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "Fallo la conexión"
 
 msgid "Connection failed"
 msgstr "Fallo la conexión"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "Error interno"
 
 msgid "Internal error"
 msgstr "Error interno"
 


@@ -2110,7 +2116,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "Selección %s no encontrada"
 #, c-format
 msgid "Selection %s not found"
 msgstr "Selección %s no encontrada"


@@ -2545,7 +2575,7 @@ msgstr "No se pudo encontrar el m
 msgid "Method %s did not start correctly"
 msgstr "El método %s no se inició correctamente"
 
 msgid "Method %s did not start correctly"
 msgstr "El método %s no se inició correctamente"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Por favor, inserte el disco «%s» en la unidad «%s» y presione Intro"
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Por favor, inserte el disco «%s» en la unidad «%s» y presione Intro"


@@ -2921,12 +2951,16 @@ msgstr "Prepar
 msgid "Completely removed %s"
 msgstr "Se borró completamente %s"
 
 msgid "Completely removed %s"
 msgstr "Se borró completamente %s"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "No se pudo escbribir en el registro, falló la llamada a «openpty()» (¿está "
 "montado /dev/pts?)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "No se pudo escbribir en el registro, falló la llamada a «openpty()» (¿está "
 "montado /dev/pts?)\n"
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "No pude parchear el fichero"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "No pude parchear el fichero"

diff --git a/po/eu.po b/po/eu.po
index d89b6120b7a6c9709683e379cd67d3c24d477f38..7b1f5958438a13a9c7386f46cdcf655e4a567e0a 100644 (file)
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_eu\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt_po_eu\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2008-11-18 10:32+0100\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
 "PO-Revision-Date: 2008-11-18 10:32+0100\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"


@@ -160,7 +160,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s %s-rentzat %s %s-ean konpilatua\n"
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s %s-rentzat %s %s-ean konpilatua\n"


@@ -654,7 +654,7 @@ msgstr "Huts egin du %s izenaren ordez %s ipintzean"
 msgid "Y"
 msgstr "Y"
 
 msgid "Y"
 msgstr "Y"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Adierazpen erregularren konpilazio errorea - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Adierazpen erregularren konpilazio errorea - %s"


@@ -815,11 +815,11 @@ msgstr "Paketeak ezabatu beharra dute baina Ezabatzea ezgaiturik dago."
 msgid "Internal error, Ordering didn't finish"
 msgstr "Barne errorea, ez da ordenatzeaz amaitu"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "Barne errorea, ez da ordenatzeaz amaitu"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "Ezin da deskarga direktorioa blokeatu"
 
 msgid "Unable to lock the download directory"
 msgstr "Ezin da deskarga direktorioa blokeatu"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Ezin izan da Iturburu zerrenda irakurri."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Ezin izan da Iturburu zerrenda irakurri."


@@ -850,7 +850,7 @@ msgstr "Ekintza honen ondoren, %sB gehiago erabiliko dira diskoan.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Ekintza honen ondoren, %sB libratuko dira diskoan.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Ekintza honen ondoren, %sB libratuko dira diskoan.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Ezin da %s(e)n duzun leku librea atzeman."
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Ezin da %s(e)n duzun leku librea atzeman."


@@ -887,7 +887,7 @@ msgstr "Abortatu."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Aurrera jarraitu nahi al duzu [B/e]? "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "Aurrera jarraitu nahi al duzu [B/e]? "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Ezin da lortu %s  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Ezin da lortu %s  %s\n"


@@ -896,7 +896,7 @@ msgstr "Ezin da lortu %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Fitxategi batzuk ezin izan dira deskargatu"
 
 msgid "Some files failed to download"
 msgstr "Fitxategi batzuk ezin izan dira deskargatu"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "Deskarga amaituta eta deskarga soileko moduan"
 
 msgid "Download complete and in download only mode"
 msgstr "Deskarga amaituta eta deskarga soileko moduan"
 


@@ -993,19 +993,24 @@ msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu"
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "Eguneratzeko komandoak ez du argumenturik hartzen"
 
 msgid "The update command takes no arguments"
 msgstr "Eguneratzeko komandoak ez du argumenturik hartzen"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "Ezin da zerrenda direktorioa blokeatu"
 
 msgid "Unable to lock the list directory"
 msgstr "Ezin da zerrenda direktorioa blokeatu"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Suposatu ez dugun zerbait ezabatuko da, ezin da AutoRemover abiarazi"
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Suposatu ez dugun zerbait ezabatuko da, ezin da AutoRemover abiarazi"
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"


@@ -1013,11 +1018,11 @@ msgstr ""
 "Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago "
 "behar."
 
 "Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago "
 "behar."
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "'apt-get autoremove' erabili ezabatzeko."
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "'apt-get autoremove' erabili ezabatzeko."
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1035,43 +1040,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "Informazio honek arazoa konpontzen lagun dezake:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "Informazio honek arazoa konpontzen lagun dezake:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Barne Errorea, AutoRemover-ek zerbait apurtu du"
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Barne Errorea, AutoRemover-ek zerbait apurtu du"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Ezin izan da %s zeregina aurkitu"
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Ezin izan da %s zeregina aurkitu"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Ezin izan da %s paketea aurkitu"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Ezin izan da %s paketea aurkitu"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s eskuz instalatua bezala ezarri.\n"
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s eskuz instalatua bezala ezarri.\n"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1079,7 +1084,7 @@ msgstr ""
 "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo "
 "zehaztu konponbide bat)."
 
 "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo "
 "zehaztu konponbide bat)."
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1091,117 +1096,117 @@ msgstr ""
 "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n"
 "Sarrerakoetan (Incoming) egoten jarraituko dute."
 
 "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n"
 "Sarrerakoetan (Incoming) egoten jarraituko dute."
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "Hautsitako paketeak"
 
 msgid "Broken packages"
 msgstr "Hautsitako paketeak"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "Ondorengo pakete gehigarriak instalatuko dira:"
 
 msgid "The following extra packages will be installed:"
 msgstr "Ondorengo pakete gehigarriak instalatuko dira:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "Iradokitako paketeak:"
 
 msgid "Suggested packages:"
 msgstr "Iradokitako paketeak:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "Gomendatutako paketeak:"
 
 msgid "Recommended packages:"
 msgstr "Gomendatutako paketeak:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "Berriketak kalkulatzen... "
 
 msgid "Calculating upgrade... "
 msgstr "Berriketak kalkulatzen... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "Huts egin du"
 
 msgid "Failed"
 msgstr "Huts egin du"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "Eginda"
 
 msgid "Done"
 msgstr "Eginda"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Ez daukazu nahikoa leku libre %s(e)n."
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Ez daukazu nahikoa leku libre %s(e)n."
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Iturburu artxiboetako %sB/%sB eskuratu behar dira.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Iturburu artxiboetako %sB/%sB eskuratu behar dira.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Iturburu artxiboetako %sB eskuratu behar dira.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Iturburu artxiboetako %sB eskuratu behar dira.\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Eskuratu %s iturburua\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Eskuratu %s iturburua\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "Huts egin du zenbat artxibo lortzean."
 
 msgid "Failed to fetch some archives."
 msgstr "Huts egin du zenbat artxibo lortzean."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Eraikitzeko '%s' komandoak huts egin du.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Eraikitzeko '%s' komandoak huts egin du.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "Prozesu umeak huts egin du"
 
 msgid "Child process failed"
 msgstr "Prozesu umeak huts egin du"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Gutxienez pakete bat zehaztu behar duzu eraikitze mendekotasunak egiaztatzeko"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Gutxienez pakete bat zehaztu behar duzu eraikitze mendekotasunak egiaztatzeko"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Ezin izan da %s(r)en eraikitze mendekotasunen informazioa eskuratu"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Ezin izan da %s(r)en eraikitze mendekotasunen informazioa eskuratu"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s: ez du eraikitze mendekotasunik.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s: ez du eraikitze mendekotasunik.\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "


@@ -1209,7 +1214,7 @@ msgid ""
 msgstr ""
 "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
 
 msgstr ""
 "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1218,32 +1223,33 @@ msgstr ""
 "%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak "
 "betetzen dituen %3$s paketearen bertsio erabilgarririk"
 
 "%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak "
 "betetzen dituen %3$s paketearen bertsio erabilgarririk"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: instalatutako %3$s "
 "paketea berriegia da"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: instalatutako %3$s "
 "paketea berriegia da"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: %3$s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: %3$s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s(r)en eraikitze mendekotasunak ezin izan dira bete."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s(r)en eraikitze mendekotasunak ezin izan dira bete."
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "Huts egin du eraikitze mendekotasunak prozesatzean"
 
 msgid "Failed to process build dependencies"
 msgstr "Huts egin du eraikitze mendekotasunak prozesatzean"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "Onartutako Moduluak:"
 
 msgid "Supported modules:"
 msgstr "Onartutako Moduluak:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1259,7 +1265,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1862,7 +1868,7 @@ msgstr "Datu-socket konexioak denbora muga gainditu du"
 msgid "Unable to accept connection"
 msgstr "Ezin da konexioa onartu"
 
 msgid "Unable to accept connection"
 msgstr "Ezin da konexioa onartu"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "Arazoa fitxategiaren hash egitean"
 
 msgid "Problem hashing file"
 msgstr "Arazoa fitxategiaren hash egitean"
 


@@ -1947,38 +1953,38 @@ msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean"
 msgid "Unable to connect to %s %s:"
 msgstr "Ezin da konektatu -> %s %s:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "Ezin da konektatu -> %s %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Ezin da eraztuna ebatzi: '%s'"
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Ezin da eraztuna ebatzi: '%s'"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: Acquire::gpgv::Options argumentu zerrenda luzeegia. Uzten."
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: Acquire::gpgv::Options argumentu zerrenda luzeegia. Uzten."
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "Barne errorea: Sinadura zuzena, baina ezin da egiaztapen marka zehaztu"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "Barne errorea: Sinadura zuzena, baina ezin da egiaztapen marka zehaztu"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "Beintza sinadura baliogabe bat aurkitu da."
 
 msgid "At least one invalid signature was encountered."
 msgstr "Beintza sinadura baliogabe bat aurkitu da."
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "Ezin da %s abiarazi sinadura egiaztatzeko (gpgv instalaturik al dago?)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "Ezin da %s abiarazi sinadura egiaztatzeko (gpgv instalaturik al dago?)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "Errore ezezaguna gpgv exekutatzean"
 
 msgid "Unknown error executing gpgv"
 msgstr "Errore ezezaguna gpgv exekutatzean"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "Ondorengo sinadurak baliogabeak dira:\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "Ondorengo sinadurak baliogabeak dira:\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -1996,80 +2002,80 @@ msgstr "Ezin izan da %s(r)en kanalizazioa ireki"
 msgid "Read error from %s process"
 msgstr "Irakurri errorea %s prozesutik"
 
 msgid "Read error from %s process"
 msgstr "Irakurri errorea %s prozesutik"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "Goiburuen zain"
 
 msgid "Waiting for headers"
 msgstr "Goiburuen zain"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Goiburu-lerro bakarra eskuratu da %u karaktereen gainean"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Goiburu-lerro bakarra eskuratu da %u karaktereen gainean"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "Okerreko goiburu-lerroa"
 
 msgid "Bad header line"
 msgstr "Okerreko goiburu-lerroa"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "http zerbitzariak erantzun goiburu baliogabe bat bidali du."
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "http zerbitzariak erantzun goiburu baliogabe bat bidali du."
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "http zerbitzariak Content-Length buru baliogabe bat bidali du"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "http zerbitzariak Content-Length buru baliogabe bat bidali du"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "http zerbitzariak Content-Range buru baliogabe bat bidali du"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "http zerbitzariak Content-Range buru baliogabe bat bidali du"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "http zerbitzariak barruti onarpena apurturik du"
 
 msgid "This HTTP server has broken range support"
 msgstr "http zerbitzariak barruti onarpena apurturik du"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "Datu formatu ezezaguna"
 
 msgid "Unknown date format"
 msgstr "Datu formatu ezezaguna"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "Hautapenak huts egin du"
 
 msgid "Select failed"
 msgstr "Hautapenak huts egin du"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "Konexioaren denbora muga gainditu da"
 
 msgid "Connection timed out"
 msgstr "Konexioaren denbora muga gainditu da"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "Errorea irteerako fitxategian idaztean"
 
 msgid "Error writing to output file"
 msgstr "Errorea irteerako fitxategian idaztean"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "Errorea fitxategian idaztean"
 
 msgid "Error writing to file"
 msgstr "Errorea fitxategian idaztean"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "Errorea fitxategian idaztean"
 
 msgid "Error writing to the file"
 msgstr "Errorea fitxategian idaztean"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "Errorea zerbitzaritik irakurtzean"
 
 msgid "Error reading from server"
 msgstr "Errorea zerbitzaritik irakurtzean"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 msgid "Failed to truncate file"
 msgstr "Huts fitxategia mozterakoan"
 
 msgid "Failed to truncate file"
 msgstr "Huts fitxategia mozterakoan"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "Goiburu data gaizki dago"
 
 msgid "Bad header data"
 msgstr "Goiburu data gaizki dago"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "Konexioak huts egin du"
 
 msgid "Connection failed"
 msgstr "Konexioak huts egin du"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "Barne errorea"
 
 msgid "Internal error"
 msgstr "Barne errorea"
 


@@ -2089,7 +2095,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "%s hautapena ez da aurkitu"
 #, c-format
 msgid "Selection %s not found"
 msgstr "%s hautapena ez da aurkitu"


@@ -2521,7 +2551,7 @@ msgstr "Ezin izan da %s metodo kontrolatzailea aurkitu."
 msgid "Method %s did not start correctly"
 msgstr "%s metodoa ez da behar bezala abiarazi"
 
 msgid "Method %s did not start correctly"
 msgstr "%s metodoa ez da behar bezala abiarazi"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Mesedez sa ''%s' izeneko diska '%s' gailuan eta enter sakatu"
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Mesedez sa ''%s' izeneko diska '%s' gailuan eta enter sakatu"


@@ -2885,12 +2915,16 @@ msgstr "%s guztiz ezabatzeko prestatzen"
 msgid "Completely removed %s"
 msgstr "%s guztiz ezabatu da"
 
 msgid "Completely removed %s"
 msgstr "%s guztiz ezabatu da"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Ezin da erregistroa idatzi, openpty() -ek huts egin du (/dev/pts ez dago "
 "muntaturik?)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Ezin da erregistroa idatzi, openpty() -ek huts egin du (/dev/pts ez dago "
 "muntaturik?)\n"
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Ezin izan zaio fitxategiari adabakia ezarri"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Ezin izan zaio fitxategiari adabakia ezarri"

diff --git a/po/fi.po b/po/fi.po
index d6778d4f7b66caeac45f313020747d0d017b3ca4..1ae7ffea311cae2043d42c05890ac0d63c2e2ba7 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2008-12-11 14:52+0200\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
 "PO-Revision-Date: 2008-12-11 14:52+0200\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"


@@ -158,7 +158,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s laitealustalle %s käännöksen päiväys %s %s\n"
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s laitealustalle %s käännöksen päiväys %s %s\n"


@@ -655,7 +655,7 @@ msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
 msgid "Y"
 msgstr "K"
 
 msgid "Y"
 msgstr "K"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Käännösvirhe lausekkeessa - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Käännösvirhe lausekkeessa - %s"


@@ -816,11 +816,11 @@ msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä."
 msgid "Internal error, Ordering didn't finish"
 msgstr "Tapahtui sisäinen virhe, järjestäminen keskeytyi"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "Tapahtui sisäinen virhe, järjestäminen keskeytyi"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "Noutokansiota ei saatu lukittua"
 
 msgid "Unable to lock the download directory"
 msgstr "Noutokansiota ei saatu lukittua"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Lähteiden luetteloa ei pystynyt lukemaan."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Lähteiden luetteloa ei pystynyt lukemaan."


@@ -850,7 +850,7 @@ msgstr "Toiminnon jälkeen käytetään %s t lisää levytilaa.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Toiminnon jälkeen vapautuu %s t levytilaa.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Toiminnon jälkeen vapautuu %s t levytilaa.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kansion %s vapaan tilan määrä ei selvinnyt"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kansion %s vapaan tilan määrä ei selvinnyt"


@@ -888,7 +888,7 @@ msgstr "Keskeytä."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Haluatko jatkaa [K/e]? "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "Haluatko jatkaa [K/e]? "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Tiedoston %s nouto ei onnistunut  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Tiedoston %s nouto ei onnistunut  %s\n"


@@ -897,7 +897,7 @@ msgstr "Tiedoston %s nouto ei onnistunut  %s\n"
 msgid "Some files failed to download"
 msgstr "Joidenkin tiedostojen nouto ei onnistunut"
 
 msgid "Some files failed to download"
 msgstr "Joidenkin tiedostojen nouto ei onnistunut"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "Nouto on valmis ja määrätty vain nouto"
 
 msgid "Download complete and in download only mode"
 msgstr "Nouto on valmis ja määrätty vain nouto"
 


@@ -994,20 +994,25 @@ msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt"
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Valittiin versio %s (%s) paketille %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Valittiin versio %s (%s) paketille %s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "Komento update ei käytä parametreja"
 
 msgid "The update command takes no arguments"
 msgstr "Komento update ei käytä parametreja"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "Luettelokansiota ei voitu lukita"
 
 msgid "Unable to lock the list directory"
 msgstr "Luettelokansiota ei voitu lukita"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "On tarkoitus olla poistamatta mitään, joten AutoRemover:ia ei voi käynnistää"
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "On tarkoitus olla poistamatta mitään, joten AutoRemover:ia ei voi käynnistää"
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"


@@ -1015,11 +1020,11 @@ msgstr ""
 "Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
 "vaadittuja:"
 
 "Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
 "vaadittuja:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Poista ne komennolla \"apt-get autoremove\"."
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Poista ne komennolla \"apt-get autoremove\"."
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1037,43 +1042,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Sisäinen virhe, AutoRemover rikkoi jotain"
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Sisäinen virhe, AutoRemover rikkoi jotain"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Tehtävää %s ei löytynyt"
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Tehtävää %s ei löytynyt"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Pakettia %s ei löytynyt"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Pakettia %s ei löytynyt"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1081,7 +1086,7 @@ msgstr ""
 "Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" "
 "ilmanpaketteja (tai ratkaise itse)."
 
 "Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" "
 "ilmanpaketteja (tai ratkaise itse)."
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1092,116 +1097,116 @@ msgstr ""
 "jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n"
 "vielä luotu tai siirretty Incoming-kansiosta."
 
 "jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n"
 "vielä luotu tai siirretty Incoming-kansiosta."
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "Rikkinäiset paketit"
 
 msgid "Broken packages"
 msgstr "Rikkinäiset paketit"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:"
 
 msgid "The following extra packages will be installed:"
 msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "Ehdotetut paketit:"
 
 msgid "Suggested packages:"
 msgstr "Ehdotetut paketit:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "Suositellut paketit:"
 
 msgid "Recommended packages:"
 msgstr "Suositellut paketit:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "Käsitellään päivitystä ... "
 
 msgid "Calculating upgrade... "
 msgstr "Käsitellään päivitystä ... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "Ei onnistunut"
 
 msgid "Failed"
 msgstr "Ei onnistunut"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "Valmis"
 
 msgid "Done"
 msgstr "Valmis"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr "Sisäinen virhe, resolver rikkoi jotain"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Sisäinen virhe, resolver rikkoi jotain"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Paketin %s lähdekoodipakettia ei löytynyt"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Paketin %s lähdekoodipakettia ei löytynyt"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "On noudettava %st lähdekoodiarkistoja.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "On noudettava %st lähdekoodiarkistoja.\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Nouda lähdekoodi %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Nouda lähdekoodi %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "Joidenkin arkistojen noutaminen ei onnistunut."
 
 msgid "Failed to fetch some archives."
 msgstr "Joidenkin arkistojen noutaminen ei onnistunut."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Purkukomento \"%s\" ei onnistunut.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Purkukomento \"%s\" ei onnistunut.\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Paketointikomento \"%s\" ei onnistunut.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Paketointikomento \"%s\" ei onnistunut.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "Lapsiprosessi kaatui"
 
 msgid "Child process failed"
 msgstr "Lapsiprosessi kaatui"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Paketille %s ei ole saatavilla riippuvuustietoja"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Paketille %s ei ole saatavilla riippuvuustietoja"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "


@@ -1209,7 +1214,7 @@ msgid ""
 msgstr ""
 "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
 
 msgstr ""
 "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1218,32 +1223,33 @@ msgstr ""
 "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio "
 "ei vastaa versioriippuvuuksia"
 
 "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio "
 "ei vastaa versioriippuvuuksia"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Riippuvutta %s paketille %s ei voi tyydyttää: Asennettu paketti %s on liian "
 "uusi"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Riippuvutta %s paketille %s ei voi tyydyttää: Asennettu paketti %s on liian "
 "uusi"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää."
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
 
 msgid "Failed to process build dependencies"
 msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "Tuetut moduulit:"
 
 msgid "Supported modules:"
 msgstr "Tuetut moduulit:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1259,7 +1265,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1859,7 +1865,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin"
 msgid "Unable to accept connection"
 msgstr "Yhteyttä ei voitu hyväksyä"
 
 msgid "Unable to accept connection"
 msgstr "Yhteyttä ei voitu hyväksyä"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "Pulmia tiedoston hajautuksessa"
 
 msgid "Problem hashing file"
 msgstr "Pulmia tiedoston hajautuksessa"
 


@@ -1943,41 +1949,41 @@ msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Ei ole mahdollista muodostaa yhteyttä %s %s:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "Ei ole mahdollista muodostaa yhteyttä %s %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Avainrengasta \"%s\" ei saatavilla"
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Avainrengasta \"%s\" ei saatavilla"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: Parametrien luettelo Acquire::gpgv::Options liian pitkä. Lopetetaan."
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: Parametrien luettelo Acquire::gpgv::Options liian pitkä. Lopetetaan."
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Sisäinen virhe: Allekirjoitus kelpaa, mutta avaimen sormenjälki tuntematon?!"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Sisäinen virhe: Allekirjoitus kelpaa, mutta avaimen sormenjälki tuntematon?!"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "LÖytyi ainakin yksi kelvoton allekirjoitus."
 
 msgid "At least one invalid signature was encountered."
 msgstr "LÖytyi ainakin yksi kelvoton allekirjoitus."
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Ei käynnistynyt \"%s\" allekirjoitusta tarkistamaan (onko gpgv asennettu?)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Ei käynnistynyt \"%s\" allekirjoitusta tarkistamaan (onko gpgv asennettu?)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "Tapahtui tuntematon virhe suoritettaessa gpgv"
 
 msgid "Unknown error executing gpgv"
 msgstr "Tapahtui tuntematon virhe suoritettaessa gpgv"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "Seuraavat allekirjoitukset eivät olleet kelvollisia:\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "Seuraavat allekirjoitukset eivät olleet kelvollisia:\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -1995,80 +2001,80 @@ msgstr "Putkea %s ei voitu avata"
 msgid "Read error from %s process"
 msgstr "Prosessi %s ilmoitti lukuvirheestä"
 
 msgid "Read error from %s process"
 msgstr "Prosessi %s ilmoitti lukuvirheestä"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "Odotetaan otsikoita"
 
 msgid "Waiting for headers"
 msgstr "Odotetaan otsikoita"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Vastaanotettiin yksi otsikkorivi pituudeltaan yli %u merkkiä"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Vastaanotettiin yksi otsikkorivi pituudeltaan yli %u merkkiä"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "Virheellinen otsikkorivi"
 
 msgid "Bad header line"
 msgstr "Virheellinen otsikkorivi"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP-palvelin lähetti virheellisen vastausotsikon"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP-palvelin lähetti virheellisen vastausotsikon"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP-palvelin lähetti virheellisen Content-Length-otsikon"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP-palvelin lähetti virheellisen Content-Length-otsikon"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP-palvelin lähetti virheellisen Content-Range-otsikon"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP-palvelin lähetti virheellisen Content-Range-otsikon"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "HTTP-palvelimen arvoaluetuki on rikki"
 
 msgid "This HTTP server has broken range support"
 msgstr "HTTP-palvelimen arvoaluetuki on rikki"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "Tuntematon päiväysmuoto"
 
 msgid "Unknown date format"
 msgstr "Tuntematon päiväysmuoto"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "Select ei toiminut"
 
 msgid "Select failed"
 msgstr "Select ei toiminut"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "Yhteys aikakatkaistiin"
 
 msgid "Connection timed out"
 msgstr "Yhteys aikakatkaistiin"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon"
 
 msgid "Error writing to output file"
 msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
 
 msgid "Error writing to file"
 msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
 
 msgid "Error writing to the file"
 msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "Tapahtui virhe luettaessa palvelimelta"
 
 msgid "Error reading from server"
 msgstr "Tapahtui virhe luettaessa palvelimelta"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 msgid "Failed to truncate file"
 msgstr "Tiedoston typistäminen ei onnistunut"
 
 msgid "Failed to truncate file"
 msgstr "Tiedoston typistäminen ei onnistunut"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "Virheellinen otsikkotieto"
 
 msgid "Bad header data"
 msgstr "Virheellinen otsikkotieto"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "Yhteys ei toiminut"
 
 msgid "Connection failed"
 msgstr "Yhteys ei toiminut"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "Sisäinen virhe"
 
 msgid "Internal error"
 msgstr "Sisäinen virhe"
 


@@ -2088,7 +2094,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "Valintaa %s ei löydy"
 #, c-format
 msgid "Selection %s not found"
 msgstr "Valintaa %s ei löydy"


@@ -2514,7 +2544,7 @@ msgstr "Menetelmän ajuria %s ei löytynyt"
 msgid "Method %s did not start correctly"
 msgstr "Menetelmä %s ei käynnistynyt oikein"
 
 msgid "Method %s did not start correctly"
 msgstr "Menetelmä %s ei käynnistynyt oikein"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Pistä levy nimeltään: \"%s\" asemaan \"%s\" ja paina Enter."
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Pistä levy nimeltään: \"%s\" asemaan \"%s\" ja paina Enter."


@@ -2881,12 +2911,16 @@ msgstr "Valmistaudutaan poistamaan %s kokonaan"
 msgid "Completely removed %s"
 msgstr "%s poistettiin kokonaan"
 
 msgid "Completely removed %s"
 msgstr "%s poistettiin kokonaan"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Lokiin ei voi kirjoittaa, openpty() epäonnistui (onko /dev/pts "
 "liittämättä?)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Lokiin ei voi kirjoittaa, openpty() epäonnistui (onko /dev/pts "
 "liittämättä?)\n"
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Tiedostoa %s ei voitu avata"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Tiedostoa %s ei voitu avata"

diff --git a/po/fr.po b/po/fr.po
index 076157ae4acdb72ba84068d228849d0a5dba4f87..1ce3a3d116acb2bf219b474d1dd21b0ab0260e75 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2009-02-24 08:32+0100\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "PO-Revision-Date: 2009-02-24 08:32+0100\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"


@@ -160,7 +160,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s pour %s compilé sur %s %s\n"
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s pour %s compilé sur %s %s\n"


@@ -666,7 +666,7 @@ msgstr "Impossible de changer le nom %s en %s"
 msgid "Y"
 msgstr "O"
 
 msgid "Y"
 msgstr "O"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Erreur de compilation de l'expression rationnelle - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Erreur de compilation de l'expression rationnelle - %s"


@@ -829,11 +829,11 @@ msgstr ""
 msgid "Internal error, Ordering didn't finish"
 msgstr "Erreur interne. Le tri a été interrompu."
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "Erreur interne. Le tri a été interrompu."
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "Impossible de verrouiller le répertoire de téléchargement"
 
 msgid "Unable to lock the download directory"
 msgstr "Impossible de verrouiller le répertoire de téléchargement"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "La liste des sources ne peut être lue."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "La liste des sources ne peut être lue."


@@ -865,7 +865,7 @@ msgstr ""
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Après cette opération, %so d'espace disque seront libérés.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Après cette opération, %so d'espace disque seront libérés.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Impossible de déterminer l'espace disponible sur %s"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Impossible de déterminer l'espace disponible sur %s"


@@ -906,7 +906,7 @@ msgstr "Annulation."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Souhaitez-vous continuer [O/n] ? "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "Souhaitez-vous continuer [O/n] ? "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Impossible de récupérer %s  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Impossible de récupérer %s  %s\n"


@@ -915,7 +915,7 @@ msgstr "Impossible de récupérer %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Certains fichiers n'ont pu être téléchargés."
 
 msgid "Some files failed to download"
 msgstr "Certains fichiers n'ont pu être téléchargés."
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "Téléchargement achevé et dans le mode téléchargement uniquement"
 
 msgid "Download complete and in download only mode"
 msgstr "Téléchargement achevé et dans le mode téléchargement uniquement"
 


@@ -1015,21 +1015,26 @@ msgstr "La version « %s » de « %s » n'a pu être trouvée"
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Version choisie %s (%s) pour %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Version choisie %s (%s) pour %s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "La commande de mise à jour ne prend pas d'argument"
 
 msgid "The update command takes no arguments"
 msgstr "La commande de mise à jour ne prend pas d'argument"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "Impossible de verrouiller le répertoire de liste"
 
 msgid "Unable to lock the list directory"
 msgstr "Impossible de verrouiller le répertoire de liste"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Aucune suppression n'est sensée se produire : impossible de lancer "
 "« Autoremover »"
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Aucune suppression n'est sensée se produire : impossible de lancer "
 "« Autoremover »"
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"


@@ -1037,11 +1042,11 @@ msgstr ""
 "Les paquets suivants ont été installés automatiquement et ne sont plus "
 "nécessaires :"
 
 "Les paquets suivants ont été installés automatiquement et ne sont plus "
 "nécessaires :"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Veuillez utiliser « apt-get autoremove » pour les supprimer."
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Veuillez utiliser « apt-get autoremove » pour les supprimer."
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1060,44 +1065,44 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "L'information suivante devrait vous aider à résoudre la situation : "
 
 msgid "The following information may help to resolve the situation:"
 msgstr "L'information suivante devrait vous aider à résoudre la situation : "
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 "Erreur interne, l'outil de suppression automatique a cassé quelque chose."
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 "Erreur interne, l'outil de suppression automatique a cassé quelque chose."
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Erreur interne, AllUpgrade a cassé le boulot !"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Erreur interne, AllUpgrade a cassé le boulot !"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Impossible de trouver la tâche %s"
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Impossible de trouver la tâche %s"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossible de trouver le paquet %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossible de trouver le paquet %s"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Note, sélectionne %s pour l'expression rationnelle « %s »\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Note, sélectionne %s pour l'expression rationnelle « %s »\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s passé en « installé manuellement ».\n"
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s passé en « installé manuellement ».\n"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1105,7 +1110,7 @@ msgstr ""
 "Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n"
 "(ou indiquez une solution)."
 
 "Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n"
 "(ou indiquez une solution)."
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1117,119 +1122,119 @@ msgstr ""
 "la distribution unstable, que certains paquets n'ont pas encore\n"
 "été créés ou ne sont pas sortis d'Incoming."
 
 "la distribution unstable, que certains paquets n'ont pas encore\n"
 "été créés ou ne sont pas sortis d'Incoming."
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "Paquets défectueux"
 
 msgid "Broken packages"
 msgstr "Paquets défectueux"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "Les paquets supplémentaires suivants seront installés : "
 
 msgid "The following extra packages will be installed:"
 msgstr "Les paquets supplémentaires suivants seront installés : "
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "Paquets suggérés :"
 
 msgid "Suggested packages:"
 msgstr "Paquets suggérés :"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "Paquets recommandés :"
 
 msgid "Recommended packages:"
 msgstr "Paquets recommandés :"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "Calcul de la mise à jour... "
 
 msgid "Calculating upgrade... "
 msgstr "Calcul de la mise à jour... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "Échec"
 
 msgid "Failed"
 msgstr "Échec"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "Fait"
 
 msgid "Done"
 msgstr "Fait"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "Erreur interne, la tentative de résolution du problème a cassé certaines "
 "parties"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "Erreur interne, la tentative de résolution du problème a cassé certaines "
 "parties"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr "Vous devez spécifier au moins un paquet source"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "Vous devez spécifier au moins un paquet source"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Impossible de trouver une source de paquet pour %s"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Impossible de trouver une source de paquet pour %s"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Saut du téléchargement du fichier « %s », déjà téléchargé\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Saut du téléchargement du fichier « %s », déjà téléchargé\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Pas assez d'espace disponible sur %s"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Pas assez d'espace disponible sur %s"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Nécessité de prendre %so/%so dans les sources.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Nécessité de prendre %so/%so dans les sources.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Nécessité de prendre %so dans les sources.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Nécessité de prendre %so dans les sources.\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Récupération des sources %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Récupération des sources %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "Échec lors de la récupération de quelques archives."
 
 msgid "Failed to fetch some archives."
 msgstr "Échec lors de la récupération de quelques archives."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Saut du décompactage des paquets sources déjà décompactés dans %s\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Saut du décompactage des paquets sources déjà décompactés dans %s\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "La commande de décompactage « %s » a échoué.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "La commande de décompactage « %s » a échoué.\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "La commande de construction « %s » a échoué.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "La commande de construction « %s » a échoué.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "Échec du processus fils"
 
 msgid "Child process failed"
 msgstr "Échec du processus fils"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Il faut spécifier au moins un paquet pour vérifier les dépendances de "
 "construction"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Il faut spécifier au moins un paquet pour vérifier les dépendances de "
 "construction"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Impossible d'obtenir les dépendances de construction pour %s"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Impossible d'obtenir les dépendances de construction pour %s"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s n'a pas de dépendance de construction.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s n'a pas de dépendance de construction.\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "


@@ -1238,7 +1243,7 @@ msgstr ""
 "La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s ne "
 "peut être trouvé"
 
 "La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s ne "
 "peut être trouvé"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1247,33 +1252,34 @@ msgstr ""
 "La dépendance %s vis-à-vis de %s ne peut être satisfaite car aucune version "
 "du paquet %s ne peut satisfaire à la version requise"
 
 "La dépendance %s vis-à-vis de %s ne peut être satisfaite car aucune version "
 "du paquet %s ne peut satisfaire à la version requise"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Impossible de satisfaire la dépendance %s pour %s : le paquet installé %s "
 "est trop récent"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Impossible de satisfaire la dépendance %s pour %s : le paquet installé %s "
 "est trop récent"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Impossible de satisfaire les dépendances %s pour %s : %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Impossible de satisfaire les dépendances %s pour %s : %s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 "Les dépendances de compilation pour %s ne peuvent pas être satisfaites."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 "Les dépendances de compilation pour %s ne peuvent pas être satisfaites."
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "Impossible d'activer les dépendances de construction"
 
 msgid "Failed to process build dependencies"
 msgstr "Impossible d'activer les dépendances de construction"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "Modules reconnus :"
 
 msgid "Supported modules:"
 msgstr "Modules reconnus :"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1289,7 +1295,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1901,7 +1907,7 @@ msgstr "Délai de connexion au port de données dépassé"
 msgid "Unable to accept connection"
 msgstr "Impossible d'accepter une connexion"
 
 msgid "Unable to accept connection"
 msgstr "Impossible d'accepter une connexion"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "Problème de hachage du fichier"
 
 msgid "Problem hashing file"
 msgstr "Problème de hachage du fichier"
 


@@ -1987,43 +1993,43 @@ msgstr ""
 msgid "Unable to connect to %s %s:"
 msgstr "Impossible de se connecter à %s %s :"
 
 msgid "Unable to connect to %s %s:"
 msgstr "Impossible de se connecter à %s %s :"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Impossible d'accéder au porte-clés : « %s »"
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Impossible d'accéder au porte-clés : « %s »"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: liste de paramètres trop longue pour Acquire::gpgv::Options. Abandon."
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: liste de paramètres trop longue pour Acquire::gpgv::Options. Abandon."
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Erreur interne : signature correcte, mais il est impossible de déterminer "
 "l'empreinte de la clé."
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Erreur interne : signature correcte, mais il est impossible de déterminer "
 "l'empreinte de la clé."
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "Au moins une signature non valable a été rencontrée."
 
 msgid "At least one invalid signature was encountered."
 msgstr "Au moins une signature non valable a été rencontrée."
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Impossible d'exécuter « %s » pour contrôler la signature\n"
 "(veuillez vérifier si gpgv est installé)."
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Impossible d'exécuter « %s » pour contrôler la signature\n"
 "(veuillez vérifier si gpgv est installé)."
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "Erreur inconnue à l'exécution de gpgv"
 
 msgid "Unknown error executing gpgv"
 msgstr "Erreur inconnue à l'exécution de gpgv"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "Les signatures suivantes ne sont pas valables :\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "Les signatures suivantes ne sont pas valables :\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -2041,80 +2047,80 @@ msgstr "Ne parvient pas à ouvrir le tube pour %s"
 msgid "Read error from %s process"
 msgstr "Erreur de lecture du processus %s"
 
 msgid "Read error from %s process"
 msgstr "Erreur de lecture du processus %s"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "Attente des fichiers d'en-tête"
 
 msgid "Waiting for headers"
 msgstr "Attente des fichiers d'en-tête"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "J'ai une simple ligne d'en-tête au-dessus du caractère %u"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "J'ai une simple ligne d'en-tête au-dessus du caractère %u"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "Mauvaise ligne d'en-tête"
 
 msgid "Bad header line"
 msgstr "Mauvaise ligne d'en-tête"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "Le serveur http a envoyé une réponse dont l'en-tête est invalide"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Le serveur http a envoyé une réponse dont l'en-tête est invalide"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Le serveur http a envoyé un en-tête « Content-Length » invalide"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Le serveur http a envoyé un en-tête « Content-Length » invalide"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Le serveur http a envoyé un en-tête « Content-Range » invalide"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Le serveur http a envoyé un en-tête « Content-Range » invalide"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "Ce serveur http possède un support des limites non-valide"
 
 msgid "This HTTP server has broken range support"
 msgstr "Ce serveur http possède un support des limites non-valide"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "Format de date inconnu"
 
 msgid "Unknown date format"
 msgstr "Format de date inconnu"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "Sélection défaillante"
 
 msgid "Select failed"
 msgstr "Sélection défaillante"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "Délai de connexion dépassé"
 
 msgid "Connection timed out"
 msgstr "Délai de connexion dépassé"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "Erreur d'écriture du fichier de sortie"
 
 msgid "Error writing to output file"
 msgstr "Erreur d'écriture du fichier de sortie"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "Erreur d'écriture sur un fichier"
 
 msgid "Error writing to file"
 msgstr "Erreur d'écriture sur un fichier"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "Erreur d'écriture sur le fichier"
 
 msgid "Error writing to the file"
 msgstr "Erreur d'écriture sur le fichier"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "Erreur de lecture depuis le serveur distant et clôture de la connexion"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Erreur de lecture depuis le serveur distant et clôture de la connexion"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "Erreur de lecture du serveur"
 
 msgid "Error reading from server"
 msgstr "Erreur de lecture du serveur"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 msgid "Failed to truncate file"
 msgstr "Échec de la troncature du fichier"
 
 msgid "Failed to truncate file"
 msgstr "Échec de la troncature du fichier"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "Mauvais en-tête de donnée"
 
 msgid "Bad header data"
 msgstr "Mauvais en-tête de donnée"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "Échec de la connexion"
 
 msgid "Connection failed"
 msgstr "Échec de la connexion"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "Erreur interne"
 
 msgid "Internal error"
 msgstr "Erreur interne"
 


@@ -2137,7 +2143,31 @@ msgstr ""
 "Vous devriez augmenter la taille de APT::Cache-Limit, dont la valeur "
 "actuelle est de %lu (voir « man 5 apt.conf »)."
 
 "Vous devriez augmenter la taille de APT::Cache-Limit, dont la valeur "
 "actuelle est de %lu (voir « man 5 apt.conf »)."
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "La sélection %s n'a pu être trouvée"
 #, c-format
 msgid "Selection %s not found"
 msgstr "La sélection %s n'a pu être trouvée"


@@ -2573,7 +2603,7 @@ msgstr "Le pilote pour la méthode %s n'a pu être trouvé."
 msgid "Method %s did not start correctly"
 msgstr "La méthode %s n'a pas démarré correctement"
 
 msgid "Method %s did not start correctly"
 msgstr "La méthode %s n'a pas démarré correctement"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""


@@ -2957,12 +2987,16 @@ msgstr "Préparation de la suppression complète de %s"
 msgid "Completely removed %s"
 msgstr "%s complètement supprimé"
 
 msgid "Completely removed %s"
 msgstr "%s complètement supprimé"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Impossible d'écrire le journal, échec d'openpty()\n"
 "(/dev/pts est-il monté ?)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Impossible d'écrire le journal, échec d'openpty()\n"
 "(/dev/pts est-il monté ?)\n"
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Impossible de corriger le fichier"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Impossible de corriger le fichier"

diff --git a/po/gl.po b/po/gl.po
index 4d42e3cb4a88ef5b54c91d4217decbe373e748fe..eaffc52533279aa6d8e4167f230fff14c9ac5a23 100644 (file)
--- a/po/gl.po
+++ b/po/gl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_gl\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt_po_gl\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2008-12-17 22:44+0100\n"
 "Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n"
 "Language-Team: galician <proxecto@trasno.net>\n"
 "PO-Revision-Date: 2008-12-17 22:44+0100\n"
 "Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n"
 "Language-Team: galician <proxecto@trasno.net>\n"


@@ -161,7 +161,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para %s compilado o %s %s\n"
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para %s compilado o %s %s\n"


@@ -666,7 +666,7 @@ msgstr "Non se puido cambiar o nome de %s a %s"
 msgid "Y"
 msgstr "S"
 
 msgid "Y"
 msgstr "S"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Erro na compilación da expresión regular - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Erro na compilación da expresión regular - %s"


@@ -827,11 +827,11 @@ msgstr "Hai que eliminar paquetes pero a eliminación está desactivada."
 msgid "Internal error, Ordering didn't finish"
 msgstr "Erro interno, a ordeación non rematou"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "Erro interno, a ordeación non rematou"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "Non se puido bloquear o directorio de descargas"
 
 msgid "Unable to lock the download directory"
 msgstr "Non se puido bloquear o directorio de descargas"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Non se puido ler a lista de orixes."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Non se puido ler a lista de orixes."


@@ -861,7 +861,7 @@ msgstr "Despois desta operación hanse ocupar %sB de disco adicionais.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Despois desta operación hanse liberar %sB de disco.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Despois desta operación hanse liberar %sB de disco.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Non se puido determinar o espazo libre en %s"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Non se puido determinar o espazo libre en %s"


@@ -898,7 +898,7 @@ msgstr "Abortar."
 msgid "Do you want to continue [Y/n]? "
 msgstr "¿Quere continuar [S/n]? "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "¿Quere continuar [S/n]? "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Non se puido obter %s  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Non se puido obter %s  %s\n"


@@ -907,7 +907,7 @@ msgstr "Non se puido obter %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Non se puido descargar algúns ficheiros"
 
 msgid "Some files failed to download"
 msgstr "Non se puido descargar algúns ficheiros"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "Completouse a descarga no modo de só descargas"
 
 msgid "Download complete and in download only mode"
 msgstr "Completouse a descarga no modo de só descargas"
 


@@ -1006,32 +1006,37 @@ msgstr "Non se atopou a versión \"%s\" de \"%s\""
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Escolleuse a versión %s (%s) de %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Escolleuse a versión %s (%s) de %s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "A orde \"update\" non toma argumentos"
 
 msgid "The update command takes no arguments"
 msgstr "A orde \"update\" non toma argumentos"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "Non se puido bloquear o directorio de listas"
 
 msgid "Unable to lock the list directory"
 msgstr "Non se puido bloquear o directorio de listas"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Non se supón que se deban eliminar cousas; non se pode iniciar o "
 "autoeliminador"
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Non se supón que se deban eliminar cousas; non se pode iniciar o "
 "autoeliminador"
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 "Os seguintes paquetes instaláronse automaticamente e xa non son necesarios:"
 
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 "Os seguintes paquetes instaláronse automaticamente e xa non son necesarios:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Empregue \"apt-get autoremove\" para eliminalos."
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Empregue \"apt-get autoremove\" para eliminalos."
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1049,43 +1054,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "A seguinte información pode axudar a resolver a situación:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "A seguinte información pode axudar a resolver a situación:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Erro interno, o autoeliminador rompeu cousas"
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Erro interno, o autoeliminador rompeu cousas"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Erro interno, AllUpgrade rompeu cousas"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Erro interno, AllUpgrade rompeu cousas"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Non se puido atopar a tarefa %s"
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Non se puido atopar a tarefa %s"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Non se puido atopar o paquete %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Non se puido atopar o paquete %s"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Nota, escóllese %s para a expresión regular \"%s\"\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Nota, escóllese %s para a expresión regular \"%s\"\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s cambiouse a instalado manualmente.\n"
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s cambiouse a instalado manualmente.\n"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Pode querer executar \"apt-get -f install\" corrixir isto:"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Pode querer executar \"apt-get -f install\" corrixir isto:"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1093,7 +1098,7 @@ msgstr ""
 "Dependencias incumpridas. Probe \"apt-get -f install\" sen paquetes (ou "
 "especifique unha solución)."
 
 "Dependencias incumpridas. Probe \"apt-get -f install\" sen paquetes (ou "
 "especifique unha solución)."
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1104,118 +1109,118 @@ msgstr ""
 "unha situación imposible ou, se emprega a distribución inestable, que\n"
 "algúns paquetes solicitados aínda non se crearon ou moveron de Incoming."
 
 "unha situación imposible ou, se emprega a distribución inestable, que\n"
 "algúns paquetes solicitados aínda non se crearon ou moveron de Incoming."
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "Paquetes rotos"
 
 msgid "Broken packages"
 msgstr "Paquetes rotos"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "Hanse instalar os seguintes paquetes extra:"
 
 msgid "The following extra packages will be installed:"
 msgstr "Hanse instalar os seguintes paquetes extra:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "Paquetes suxiridos:"
 
 msgid "Suggested packages:"
 msgstr "Paquetes suxiridos:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "Paquetes recomendados:"
 
 msgid "Recommended packages:"
 msgstr "Paquetes recomendados:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "A calcular a actualización... "
 
 msgid "Calculating upgrade... "
 msgstr "A calcular a actualización... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "Fallou"
 
 msgid "Failed"
 msgstr "Fallou"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "Rematado"
 
 msgid "Done"
 msgstr "Rematado"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr "Erro interno, o resolvedor interno rompeu cousas"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Erro interno, o resolvedor interno rompeu cousas"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Ten que especificar alomenos un paquete para lle descargar o código fonte"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Ten que especificar alomenos un paquete para lle descargar o código fonte"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Non se puido atopar un paquete fonte para %s"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Non se puido atopar un paquete fonte para %s"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Omítese o ficheiro xa descargado \"%s\"\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Omítese o ficheiro xa descargado \"%s\"\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Non hai espazo libre de abondo en %s"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Non hai espazo libre de abondo en %s"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Hai que recibir %sB/%sB de arquivos de fonte.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Hai que recibir %sB/%sB de arquivos de fonte.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Hai que recibir %sB de arquivos de fonte.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Hai que recibir %sB de arquivos de fonte.\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obter fonte %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obter fonte %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "Non se puido recibir algúns arquivos."
 
 msgid "Failed to fetch some archives."
 msgstr "Non se puido recibir algúns arquivos."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Omítese o desempaquetamento do código fonte xa desempaquetado en %s\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Omítese o desempaquetamento do código fonte xa desempaquetado en %s\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Fallou a orde de desempaquetamento \"%s\".\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Fallou a orde de desempaquetamento \"%s\".\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Comprobe que o paquete \"dpkg-dev\" estea instalado.\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Comprobe que o paquete \"dpkg-dev\" estea instalado.\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Fallou a codificación de %s.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Fallou a codificación de %s.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "O proceso fillo fallou"
 
 msgid "Child process failed"
 msgstr "O proceso fillo fallou"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Ten que especificar alomenos un paquete para lle comprobar as dependencias "
 "de compilación"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Ten que especificar alomenos un paquete para lle comprobar as dependencias "
 "de compilación"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Non se puido obter a información de dependencias de compilación de %s"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Non se puido obter a información de dependencias de compilación de %s"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s non ten dependencias de compilación.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s non ten dependencias de compilación.\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "


@@ -1224,7 +1229,7 @@ msgstr ""
 "A dependencia \"%s\" de %s non se pode satisfacer porque non se pode atopar "
 "o paquete %s"
 
 "A dependencia \"%s\" de %s non se pode satisfacer porque non se pode atopar "
 "o paquete %s"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1233,32 +1238,33 @@ msgstr ""
 "A dependencia \"%s\" de %s non se pode satisfacer porque ningunha versión "
 "dispoñible do paquete %s satisfai os requirimentos de versión"
 
 "A dependencia \"%s\" de %s non se pode satisfacer porque ningunha versión "
 "dispoñible do paquete %s satisfai os requirimentos de versión"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Non se puido satisfacer a dependencia \"%s\" de %s: O paquete instalado %s é "
 "novo de máis"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Non se puido satisfacer a dependencia \"%s\" de %s: O paquete instalado %s é "
 "novo de máis"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Non se puido satisfacer a dependencia \"%s\" de %s: %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Non se puido satisfacer a dependencia \"%s\" de %s: %s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Non se puideron satisfacer as dependencias de compilación de %s."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Non se puideron satisfacer as dependencias de compilación de %s."
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "Non se puido procesar as dependencias de compilación"
 
 msgid "Failed to process build dependencies"
 msgstr "Non se puido procesar as dependencias de compilación"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "Módulos soportados:"
 
 msgid "Supported modules:"
 msgstr "Módulos soportados:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1274,7 +1280,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1877,7 +1883,7 @@ msgstr "A conexión do socket de datos esgotou o tempo"
 msgid "Unable to accept connection"
 msgstr "Non se pode aceptar a conexión"
 
 msgid "Unable to accept connection"
 msgstr "Non se pode aceptar a conexión"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "Problema ao calcular o hash do ficheiro"
 
 msgid "Problem hashing file"
 msgstr "Problema ao calcular o hash do ficheiro"
 


@@ -1961,43 +1967,43 @@ msgstr "Algo estraño ocorreu ao resolver \"%s:%s\" (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Non se pode conectar a %s %s:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "Non se pode conectar a %s %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Non se puido acceder ao chaveiro: \"%s\""
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Non se puido acceder ao chaveiro: \"%s\""
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: A lista de argumentos de Acquire:gpgv::Options é longa de máis. Sáese."
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: A lista de argumentos de Acquire:gpgv::Options é longa de máis. Sáese."
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Erro interno: Sinatura correcta, pero non se puido determinar a pegada "
 "dixital da chave"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Erro interno: Sinatura correcta, pero non se puido determinar a pegada "
 "dixital da chave"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "Atopouse alomenos unha sinatura non válida."
 
 msgid "At least one invalid signature was encountered."
 msgstr "Atopouse alomenos unha sinatura non válida."
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Non se puido executar \"%s\" para verificar a sinatura (¿está gpgv "
 "instalado?)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Non se puido executar \"%s\" para verificar a sinatura (¿está gpgv "
 "instalado?)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "Erro descoñecido ao executar gpgv"
 
 msgid "Unknown error executing gpgv"
 msgstr "Erro descoñecido ao executar gpgv"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "As seguintes sinaturas non eran válidas:\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "As seguintes sinaturas non eran válidas:\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -2015,80 +2021,80 @@ msgstr "Non se puido abrir unha canle para %s"
 msgid "Read error from %s process"
 msgstr "Erro de lectura do proceso %s"
 
 msgid "Read error from %s process"
 msgstr "Erro de lectura do proceso %s"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "A agardar polas cabeceiras"
 
 msgid "Waiting for headers"
 msgstr "A agardar polas cabeceiras"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Recibiuse unha soa liña de cabeceira en %u caracteres"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Recibiuse unha soa liña de cabeceira en %u caracteres"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "Liña de cabeceira incorrecta"
 
 msgid "Bad header line"
 msgstr "Liña de cabeceira incorrecta"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "O servidor HTTP enviou unha cabeceira de resposta non válida"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "O servidor HTTP enviou unha cabeceira de resposta non válida"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "O servidor HTTP enviou unha cabeceira Content-Length non válida"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "O servidor HTTP enviou unha cabeceira Content-Length non válida"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "O servidor HTTP enviou unha cabeceira Content-Range non válida"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "O servidor HTTP enviou unha cabeceira Content-Range non válida"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "Este servidor HTTP ten un soporte de rangos roto"
 
 msgid "This HTTP server has broken range support"
 msgstr "Este servidor HTTP ten un soporte de rangos roto"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "Formato de data descoñecido"
 
 msgid "Unknown date format"
 msgstr "Formato de data descoñecido"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "Fallou a chamada a select"
 
 msgid "Select failed"
 msgstr "Fallou a chamada a select"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "A conexión esgotou o tempo"
 
 msgid "Connection timed out"
 msgstr "A conexión esgotou o tempo"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "Erro ao escribir no ficheiro de saída"
 
 msgid "Error writing to output file"
 msgstr "Erro ao escribir no ficheiro de saída"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "Erro ao escribir nun ficheiro"
 
 msgid "Error writing to file"
 msgstr "Erro ao escribir nun ficheiro"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "Erro ao escribir no ficheiro"
 
 msgid "Error writing to the file"
 msgstr "Erro ao escribir no ficheiro"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "Erro ao ler do servidor. O extremo remoto pechou a conexión"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Erro ao ler do servidor. O extremo remoto pechou a conexión"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "Erro ao ler do servidor"
 
 msgid "Error reading from server"
 msgstr "Erro ao ler do servidor"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 msgid "Failed to truncate file"
 msgstr "Non se puido truncar o ficheiro"
 
 msgid "Failed to truncate file"
 msgstr "Non se puido truncar o ficheiro"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "Datos da cabeceira incorrectos"
 
 msgid "Bad header data"
 msgstr "Datos da cabeceira incorrectos"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "A conexión fallou"
 
 msgid "Connection failed"
 msgstr "A conexión fallou"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "Erro interno"
 
 msgid "Internal error"
 msgstr "Erro interno"
 


@@ -2108,7 +2114,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "Non se atopou a selección %s"
 #, c-format
 msgid "Selection %s not found"
 msgstr "Non se atopou a selección %s"


@@ -2536,7 +2566,7 @@ msgstr "Non se puido atopar o controlador de métodos %s."
 msgid "Method %s did not start correctly"
 msgstr "O método %s non se iniciou correctamente"
 
 msgid "Method %s did not start correctly"
 msgstr "O método %s non se iniciou correctamente"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Introduza o disco etiquetado: \"%s\" na unidade \"%s\" e prema Intro."
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Introduza o disco etiquetado: \"%s\" na unidade \"%s\" e prema Intro."


@@ -2906,12 +2936,16 @@ msgstr "A se preparar para eliminar %s completamente"
 msgid "Completely removed %s"
 msgstr "Eliminouse %s completamente"
 
 msgid "Completely removed %s"
 msgstr "Eliminouse %s completamente"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Non se puido escribir no rexistro, a chamada a openpty() fallou (¿/dev/pts "
 "non estaba montado?)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Non se puido escribir no rexistro, a chamada a openpty() fallou (¿/dev/pts "
 "non estaba montado?)\n"
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Non se puido parchear o ficheiro"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Non se puido parchear o ficheiro"

diff --git a/po/he.po b/po/he.po
index 36972073dfc6b0f60a981084cc9b6e1468d400c1..0e5f64136b3e34a4a1d094e2c08d186f507e5e9e 100644 (file)
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.25\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt 0.5.25\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2004-06-10 19:58+0300\n"
 "Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n"
 "Language-Team: Hebrew\n"
 "PO-Revision-Date: 2004-06-10 19:58+0300\n"
 "Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n"
 "Language-Team: Hebrew\n"


@@ -156,7 +156,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s בשביל %s %s קומפל על %s %s\n"
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s בשביל %s %s קומפל על %s %s\n"


@@ -554,7 +554,7 @@ msgstr "כשלון בשינוי השם %s ל-%s"
 msgid "Y"
 msgstr "Y"
 
 msgid "Y"
 msgstr "Y"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""


@@ -717,11 +717,11 @@ msgstr ""
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "לא מצליח לנעול את ספרית ההורדה."
 
 msgid "Unable to lock the download directory"
 msgstr "לא מצליח לנעול את ספרית ההורדה."
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "רשימת המקורות לא ניתנת לקריאה."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "רשימת המקורות לא ניתנת לקריאה."


@@ -750,7 +750,7 @@ msgstr "אחרי פריסה %sB נוספים יהיו בשימוש.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "אחרי פריסה %sB נוספים ישוחררו.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "אחרי פריסה %sB נוספים ישוחררו.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "אין לך מספיק מקום פנוי ב-%s."
 #, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "אין לך מספיק מקום פנוי ב-%s."


@@ -785,7 +785,7 @@ msgstr "בטל."
 msgid "Do you want to continue [Y/n]? "
 msgstr "האם אתה רוצה להמשיך? [Y/n]"
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "האם אתה רוצה להמשיך? [Y/n]"
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "כשלון בהבאת %s  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "כשלון בהבאת %s  %s\n"


@@ -794,7 +794,7 @@ msgstr "כשלון בהבאת %s  %s\n"
 msgid "Some files failed to download"
 msgstr "כשלון בהורדת חלק מהקבצים"
 
 msgid "Some files failed to download"
 msgstr "כשלון בהורדת חלק מהקבצים"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "ההורדה הסתיימה במסגרת מצב הורדה בלבד."
 
 msgid "Download complete and in download only mode"
 msgstr "ההורדה הסתיימה במסגרת מצב הורדה בלבד."
 


@@ -886,30 +886,35 @@ msgstr ""
 msgid "Selected version %s (%s) for %s\n"
 msgstr ""
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr ""
 
 msgid "The update command takes no arguments"
 msgstr ""
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr ""
 
 msgid "Unable to lock the list directory"
 msgstr ""
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "החבילות החדשות הבאות הולכות להיות מותקנות:"
 
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "החבילות החדשות הבאות הולכות להיות מותקנות:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -925,50 +930,50 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "שגיאה פנימית, כלשון ביצירת %s"
 
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "שגיאה פנימית, כלשון ביצירת %s"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr ""
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "אבל %s הולכת להיות מותקנת"
 
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "אבל %s הולכת להיות מותקנת"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -976,153 +981,153 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
 "or been moved out of Incoming."
 msgstr ""
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr ""
 
 msgid "Broken packages"
 msgstr ""
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr ""
 
 msgid "The following extra packages will be installed:"
 msgstr ""
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr ""
 
 msgid "Suggested packages:"
 msgstr ""
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr ""
 
 msgid "Recommended packages:"
 msgstr ""
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr ""
 
 msgid "Calculating upgrade... "
 msgstr ""
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr ""
 
 msgid "Failed"
 msgstr ""
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr ""
 
 msgid "Done"
 msgstr ""
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "שגיאה פנימית, כלשון ביצירת %s"
 
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "שגיאה פנימית, כלשון ביצירת %s"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr ""
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr ""
 
 msgid "Failed to fetch some archives."
 msgstr ""
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr ""
 
 msgid "Child process failed"
 msgstr ""
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
 
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr ""
 
 msgid "Failed to process build dependencies"
 msgstr ""
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr ""
 
 msgid "Supported modules:"
 msgstr ""
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1138,7 +1143,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1675,7 +1680,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
 msgid "Unable to accept connection"
 msgstr ""
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr ""
 
 msgid "Problem hashing file"
 msgstr ""
 


@@ -1759,39 +1764,39 @@ msgstr ""
 msgid "Unable to connect to %s %s:"
 msgstr ""
 
 msgid "Unable to connect to %s %s:"
 msgstr ""
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr ""
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr ""
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr ""
 
 msgid "At least one invalid signature was encountered."
 msgstr ""
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr ""
 
 msgid "Unknown error executing gpgv"
 msgstr ""
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "החבילות החדשות הבאות הולכות להיות מותקנות:"
 
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "החבילות החדשות הבאות הולכות להיות מותקנות:"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -1807,81 +1812,81 @@ msgstr ""
 msgid "Read error from %s process"
 msgstr ""
 
 msgid "Read error from %s process"
 msgstr ""
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr ""
 
 msgid "Waiting for headers"
 msgstr ""
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr ""
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr ""
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr ""
 
 msgid "Bad header line"
 msgstr ""
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr ""
 
 msgid "This HTTP server has broken range support"
 msgstr ""
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr ""
 
 msgid "Unknown date format"
 msgstr ""
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr ""
 
 msgid "Select failed"
 msgstr ""
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr ""
 
 msgid "Connection timed out"
 msgstr ""
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr ""
 
 msgid "Error writing to output file"
 msgstr ""
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr ""
 
 msgid "Error writing to file"
 msgstr ""
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr ""
 
 msgid "Error writing to the file"
 msgstr ""
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr ""
 
 msgid "Error reading from server"
 msgstr ""
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "כשלון בפענוח %s"
 
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "כשלון בפענוח %s"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr ""
 
 msgid "Bad header data"
 msgstr ""
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr ""
 
 msgid "Connection failed"
 msgstr ""
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr ""
 
 msgid "Internal error"
 msgstr ""
 


@@ -1901,7 +1906,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr ""
 #, c-format
 msgid "Selection %s not found"
 msgstr ""


@@ -2320,7 +2349,7 @@ msgstr ""
 msgid "Method %s did not start correctly"
 msgstr ""
 
 msgid "Method %s did not start correctly"
 msgstr ""
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""


@@ -2671,10 +2700,14 @@ msgstr ""
 msgid "Completely removed %s"
 msgstr ""
 
 msgid "Completely removed %s"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr ""
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr ""

diff --git a/po/hu.po b/po/hu.po
index 245ab09f03eda9ebfe7eb5cd4afb852a8311b9e1..fe9d9bd14cd50d4707c7bc0c652ced145412308f 100644 (file)
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2008-05-11 14:49+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian>\n"
 "PO-Revision-Date: 2008-05-11 14:49+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian>\n"


@@ -161,7 +161,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s erre: %s ekkor fordult: %s %s\n"
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s erre: %s ekkor fordult: %s %s\n"


@@ -659,7 +659,7 @@ msgstr "Nem sikerült átnevezni %s-t erre: %s"
 msgid "Y"
 msgstr "I"
 
 msgid "Y"
 msgstr "I"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex fordítási hiba - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex fordítási hiba - %s"


@@ -820,11 +820,11 @@ msgstr "Csomagokat kellene eltávolítani, de az Eltávolítás nem engedélyeze
 msgid "Internal error, Ordering didn't finish"
 msgstr "Belső hiba, a rendezés nem zárult"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "Belső hiba, a rendezés nem zárult"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "Nem tudom zárolni a letöltési könyvtárat"
 
 msgid "Unable to lock the download directory"
 msgstr "Nem tudom zárolni a letöltési könyvtárat"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "A források listája olvashatatlan."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "A források listája olvashatatlan."


@@ -853,7 +853,7 @@ msgstr "E művelet után további %sB lemez-területetet használok fel.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "E művelet után %sB lemez-terület szabadul fel.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "E művelet után %sB lemez-terület szabadul fel.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nem határozható meg a szabad hely itt: %s"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nem határozható meg a szabad hely itt: %s"


@@ -890,7 +890,7 @@ msgstr "Megszakítva."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Folytatni akarod [Y/n]? "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "Folytatni akarod [Y/n]? "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Sikertelen letöltés: %s  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Sikertelen letöltés: %s  %s\n"


@@ -899,7 +899,7 @@ msgstr "Sikertelen letöltés: %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Néhány fájlt nem sikerült letölteni"
 
 msgid "Some files failed to download"
 msgstr "Néhány fájlt nem sikerült letölteni"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "A letöltés befejeződött a 'csak letöltés' módban"
 
 msgid "Download complete and in download only mode"
 msgstr "A letöltés befejeződött a 'csak letöltés' módban"
 


@@ -995,29 +995,34 @@ msgstr "'%s' verzió ehhez: '%s' nem található"
 msgid "Selected version %s (%s) for %s\n"
 msgstr "%s (%s) a kiválasztott verzió ehhez: %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "%s (%s) a kiválasztott verzió ehhez: %s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "Az update parancsnak nincsenek argumentumai"
 
 msgid "The update command takes no arguments"
 msgstr "Az update parancsnak nincsenek argumentumai"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "Nem tudom a listakönyvtárat zárolni"
 
 msgid "Unable to lock the list directory"
 msgstr "Nem tudom a listakönyvtárat zárolni"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Nincs törölnivaló, az AutoRemover nem indítható"
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Nincs törölnivaló, az AutoRemover nem indítható"
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Az alábbi csomagok automatikusan települtek, de már nem kellenek:"
 
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Az alábbi csomagok automatikusan települtek, de már nem kellenek:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Töröld az 'apt-get autoremove' paranccsal!"
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Töröld az 'apt-get autoremove' paranccsal!"
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1035,43 +1040,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "Az alábbi információ segíthet megoldani a helyzetet:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "Az alábbi információ segíthet megoldani a helyzetet:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Belső hiba, az AutoRemover sérült"
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Belső hiba, az AutoRemover sérült"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Belső hiba, AllUpgrade megsértett valamit"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Belső hiba, AllUpgrade megsértett valamit"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Hiányzó %s feladat"
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Hiányzó %s feladat"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Az alábbi csomag nem található: %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Az alábbi csomag nem található: %s"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Megjegyzés: %s kiválasztása %s reguláris kifejezéshez\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Megjegyzés: %s kiválasztása %s reguláris kifejezéshez\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s kézi telepítésre állított.\n"
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s kézi telepítésre állított.\n"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Próbáld futtatni az 'apt-get -f install'-t az alábbiak javításához:"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Próbáld futtatni az 'apt-get -f install'-t az alábbiak javításához:"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1079,7 +1084,7 @@ msgstr ""
 "Teljesítetlen függőségek. Próbáld az 'apt-get -f install'-t csomagok nélkül "
 "(vagy telepítsd a függőségeket is!)."
 
 "Teljesítetlen függőségek. Próbáld az 'apt-get -f install'-t csomagok nélkül "
 "(vagy telepítsd a függőségeket is!)."
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1091,118 +1096,118 @@ msgstr ""
 "használod, akkor néhány igényelt csomag még nem készült el vagy ki\n"
 "lett mozdítva az Incoming-ból."
 
 "használod, akkor néhány igényelt csomag még nem készült el vagy ki\n"
 "lett mozdítva az Incoming-ból."
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "Törött csomagok"
 
 msgid "Broken packages"
 msgstr "Törött csomagok"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "Az alábbi extra csomagok kerülnek telepítésre:"
 
 msgid "The following extra packages will be installed:"
 msgstr "Az alábbi extra csomagok kerülnek telepítésre:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "Javasolt csomagok:"
 
 msgid "Suggested packages:"
 msgstr "Javasolt csomagok:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "Ajánlott csomagok:"
 
 msgid "Recommended packages:"
 msgstr "Ajánlott csomagok:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "Frissítés kiszámítása... "
 
 msgid "Calculating upgrade... "
 msgstr "Frissítés kiszámítása... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "Sikertelen"
 
 msgid "Failed"
 msgstr "Sikertelen"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "Kész"
 
 msgid "Done"
 msgstr "Kész"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr "Belső hiba, hibafeloldó gond"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Belső hiba, hibafeloldó gond"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Legalább egy csomagot meg kell adnod, aminek a forrását le kell tölteni"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Legalább egy csomagot meg kell adnod, aminek a forrását le kell tölteni"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nem található forráscsomag ehhez: %s"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nem található forráscsomag ehhez: %s"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "A már letöltött '%s' fájl kihagyása\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "A már letöltött '%s' fájl kihagyása\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Nincs elég szabad hely itt: %s"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Nincs elég szabad hely itt: %s"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "%sB/%sB forrás-archívumot kell letölteni.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "%sB/%sB forrás-archívumot kell letölteni.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "%sB forrás-archívumot kell letölteni.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "%sB forrás-archívumot kell letölteni.\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Forrás letöltése: %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Forrás letöltése: %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "Nem sikerült néhány archívumot letölteni."
 
 msgid "Failed to fetch some archives."
 msgstr "Nem sikerült néhány archívumot letölteni."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "'%s' kibontási parancs nem sikerült.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "'%s' kibontási parancs nem sikerült.\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Ellenőrizd, hogy a 'dpkg-dev' csomag telepítve van-e.\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Ellenőrizd, hogy a 'dpkg-dev' csomag telepítve van-e.\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "'%s' elkészítési parancs nem sikerült.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "'%s' elkészítési parancs nem sikerült.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "Hiba a gyermekfolyamatnál"
 
 msgid "Child process failed"
 msgstr "Hiba a gyermekfolyamatnál"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Legalább egy csomagot adj meg, aminek a fordítási függőségeit ellenőrizni "
 "kell"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Legalább egy csomagot adj meg, aminek a fordítási függőségeit ellenőrizni "
 "kell"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nem lehet %s fordítási-függőség információját beszerezni"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nem lehet %s fordítási-függőség információját beszerezni"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Nincs fordítási függősége a következőnek: %s.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Nincs fordítási függősége a következőnek: %s.\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "


@@ -1211,7 +1216,7 @@ msgstr ""
 "%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomag nem "
 "található"
 
 "%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomag nem "
 "található"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1220,32 +1225,33 @@ msgstr ""
 "%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomagnak nincs a "
 "verzió-követelményt kielégítő elérhető verziója."
 
 "%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomagnak nincs a "
 "verzió-követelményt kielégítő elérhető verziója."
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "%s függőséget %s csomaghoz nem lehet kielégíteni: %s telepített csomag túl "
 "friss."
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "%s függőséget %s csomaghoz nem lehet kielégíteni: %s telepített csomag túl "
 "friss."
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s függőséget %s csomaghoz nem lehet kielégíteni: %s "
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s függőséget %s csomaghoz nem lehet kielégíteni: %s "
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s építési függőségei nem elégíthetőek ki."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s építési függőségei nem elégíthetőek ki."
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "Nem sikerült az építési függőségeket feldolgozni"
 
 msgid "Failed to process build dependencies"
 msgstr "Nem sikerült az építési függőségeket feldolgozni"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "Támogatott modulok:"
 
 msgid "Supported modules:"
 msgstr "Támogatott modulok:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1261,7 +1267,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1857,7 +1863,7 @@ msgstr "Az adat sockethez kapcsolódás túllépte az időt"
 msgid "Unable to accept connection"
 msgstr "Nem lehet elfogadni a kapcsolatot"
 
 msgid "Unable to accept connection"
 msgstr "Nem lehet elfogadni a kapcsolatot"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "Probléma a fájl hash értékének meghatározásakor"
 
 msgid "Problem hashing file"
 msgstr "Probléma a fájl hash értékének meghatározásakor"
 


@@ -1941,38 +1947,38 @@ msgstr "Valami rossz történt '%s: %s' feloldásakor (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Sikertelen kapcsolódás ide: %s %s:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "Sikertelen kapcsolódás ide: %s %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "%s kulcstartó nem érhető el"
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "%s kulcstartó nem érhető el"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "H: Az Acquire::gpgv::Options argumentum lista túl hosszú. Kilépek."
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "H: Az Acquire::gpgv::Options argumentum lista túl hosszú. Kilépek."
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "Belső hiba: Jó aláírás, de meghatározhatatlan kulcs ujjlenyomat?!"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "Belső hiba: Jó aláírás, de meghatározhatatlan kulcs ujjlenyomat?!"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "1 vagy több érvénytelen aláírást találtam."
 
 msgid "At least one invalid signature was encountered."
 msgstr "1 vagy több érvénytelen aláírást találtam."
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "'%s' nem futtatható az aláírás ellenőrzéséhez (a gpgv telepítve van?)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "'%s' nem futtatható az aláírás ellenőrzéséhez (a gpgv telepítve van?)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "Ismeretlen gpgv futtatási hiba"
 
 msgid "Unknown error executing gpgv"
 msgstr "Ismeretlen gpgv futtatási hiba"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "Az alábbi aláírások érvénytelenek voltak:\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "Az alábbi aláírások érvénytelenek voltak:\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -1989,81 +1995,81 @@ msgstr "Nem lehet csövet nyitni ehhez: %s"
 msgid "Read error from %s process"
 msgstr "Olvasási hiba %s folyamattól"
 
 msgid "Read error from %s process"
 msgstr "Olvasási hiba %s folyamattól"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "Várakozás a fejlécekre"
 
 msgid "Waiting for headers"
 msgstr "Várakozás a fejlécekre"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Egyetlen fejléc sort kaptam, ami több mint %u karakteres"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Egyetlen fejléc sort kaptam, ami több mint %u karakteres"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "Rossz fejléc sor"
 
 msgid "Bad header line"
 msgstr "Rossz fejléc sor"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "A http kiszolgáló egy érvénytelen válaszfejlécet küldött"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "A http kiszolgáló egy érvénytelen válaszfejlécet küldött"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "A http kiszolgáló egy érvénytelen Content-Length fejlécet küldött"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "A http kiszolgáló egy érvénytelen Content-Length fejlécet küldött"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "A http kiszolgáló egy érvénytelen Content-Range fejlécet küldött"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "A http kiszolgáló egy érvénytelen Content-Range fejlécet küldött"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "Ez a http szerver támogatja a sérült tartományokat "
 
 msgid "This HTTP server has broken range support"
 msgstr "Ez a http szerver támogatja a sérült tartományokat "
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "Ismeretlen dátum formátum"
 
 msgid "Unknown date format"
 msgstr "Ismeretlen dátum formátum"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "Sikertelen kiválasztás"
 
 msgid "Select failed"
 msgstr "Sikertelen kiválasztás"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "Időtúllépés a kapcsolatban"
 
 msgid "Connection timed out"
 msgstr "Időtúllépés a kapcsolatban"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "Hiba a kimeneti fájl írásakor"
 
 msgid "Error writing to output file"
 msgstr "Hiba a kimeneti fájl írásakor"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "Hiba fájl írásakor"
 
 msgid "Error writing to file"
 msgstr "Hiba fájl írásakor"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "Hiba a fájl írásakor"
 
 msgid "Error writing to the file"
 msgstr "Hiba a fájl írásakor"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "Hiba a kiszolgálóról olvasáskor, a túloldal lezárta a kapcsolatot"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Hiba a kiszolgálóról olvasáskor, a túloldal lezárta a kapcsolatot"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "Hiba a kiszolgálóról olvasáskor"
 
 msgid "Error reading from server"
 msgstr "Hiba a kiszolgálóról olvasáskor"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "%s fájl írása sikertelen"
 
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "%s fájl írása sikertelen"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "Rossz fejlécadat"
 
 msgid "Bad header data"
 msgstr "Rossz fejlécadat"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "Sikertelen kapcsolódás"
 
 msgid "Connection failed"
 msgstr "Sikertelen kapcsolódás"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "Belső hiba"
 
 msgid "Internal error"
 msgstr "Belső hiba"
 


@@ -2084,7 +2090,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "%s kiválasztás nem található"
 #, c-format
 msgid "Selection %s not found"
 msgstr "%s kiválasztás nem található"


@@ -2513,7 +2543,7 @@ msgstr "A(z) %s metódus vezérlő nem található."
 msgid "Method %s did not start correctly"
 msgstr "A(z) %s metódus nem indult el helyesen"
 
 msgid "Method %s did not start correctly"
 msgstr "A(z) %s metódus nem indult el helyesen"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Tedd be a(z) %s címkéjű lemezt a(z) %s meghajtóba és üss entert"
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Tedd be a(z) %s címkéjű lemezt a(z) %s meghajtóba és üss entert"


@@ -2882,10 +2912,14 @@ msgstr "%s teljes eltávolítása előkészítése"
 msgid "Completely removed %s"
 msgstr "%s teljesen eltávolítva"
 
 msgid "Completely removed %s"
 msgstr "%s teljesen eltávolítva"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Naplózási hiba, sikertelen openpty() (a /dev/pts nincs csatolva?)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Naplózási hiba, sikertelen openpty() (a /dev/pts nincs csatolva?)\n"
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "%s fájl foltozása sikertelen"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "%s fájl foltozása sikertelen"

diff --git a/po/it.po b/po/it.po
index 541c04fd92ff84c9b2b577afbcdb6d95a636e57c..633f67a07b8c14539c72051c65602afb2678e48d 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.20\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt 0.7.20\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2009-04-01 19:54+0200\n"
 "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "PO-Revision-Date: 2009-04-01 19:54+0200\n"
 "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"


@@ -158,7 +158,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s per %s compilato il %s %s\n"
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s per %s compilato il %s %s\n"


@@ -660,7 +660,7 @@ msgstr "Rinomina di %s in %s non riuscita"
 msgid "Y"
 msgstr "S"
 
 msgid "Y"
 msgstr "S"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Errore di compilazione dell'espressione regolare - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Errore di compilazione dell'espressione regolare - %s"


@@ -826,11 +826,11 @@ msgstr ""
 msgid "Internal error, Ordering didn't finish"
 msgstr "Errore interno, l'ordinamento non è stato terminato"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "Errore interno, l'ordinamento non è stato terminato"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "Impossibile bloccare la directory di scaricamento"
 
 msgid "Unable to lock the download directory"
 msgstr "Impossibile bloccare la directory di scaricamento"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Impossibile leggere l'elenco dei sorgenti."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Impossibile leggere l'elenco dei sorgenti."


@@ -860,7 +860,7 @@ msgstr "Dopo quest'operazione, verranno occupati %sB di spazio su disco.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Dopo quest'operazione, verranno liberati %sB di spazio su disco.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Dopo quest'operazione, verranno liberati %sB di spazio su disco.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Impossibile determinare lo spazio libero su %s"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Impossibile determinare lo spazio libero su %s"


@@ -899,7 +899,7 @@ msgstr "Interrotto."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Continuare [S/n]? "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "Continuare [S/n]? "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Impossibile recuperare %s  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Impossibile recuperare %s  %s\n"


@@ -908,7 +908,7 @@ msgstr "Impossibile recuperare %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Scaricamento di alcuni file non riuscito"
 
 msgid "Some files failed to download"
 msgstr "Scaricamento di alcuni file non riuscito"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "Scaricamento completato e in modalità solo scaricamento"
 
 msgid "Download complete and in download only mode"
 msgstr "Scaricamento completato e in modalità solo scaricamento"
 


@@ -1008,20 +1008,25 @@ msgstr "Version \"%s\" per \"%s\" non trovato"
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Versione %s (%s) selezionata per %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Versione %s (%s) selezionata per %s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "Il comando update non accetta argomenti"
 
 msgid "The update command takes no arguments"
 msgstr "Il comando update non accetta argomenti"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "Impossibile bloccare la directory"
 
 msgid "Unable to lock the list directory"
 msgstr "Impossibile bloccare la directory"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Non si è autorizzati a rimuovere nulla, impossibile avviare AutoRemover"
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Non si è autorizzati a rimuovere nulla, impossibile avviare AutoRemover"
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"


@@ -1029,11 +1034,11 @@ msgstr ""
 "I seguenti pacchetti sono stati installati automaticamente e non sono più "
 "richiesti:"
 
 "I seguenti pacchetti sono stati installati automaticamente e non sono più "
 "richiesti:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Usare \"apt-get autoremove\" per rimuoverli."
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Usare \"apt-get autoremove\" per rimuoverli."
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1051,44 +1056,44 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: "
 
 msgid "The following information may help to resolve the situation:"
 msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: "
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Errore interno, AutoRemover ha rovinato qualche cosa"
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Errore interno, AutoRemover ha rovinato qualche cosa"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Errore interno, AllUpgrade ha rovinato qualche cosa"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Errore interno, AllUpgrade ha rovinato qualche cosa"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Impossibile trovare il task %s"
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Impossibile trovare il task %s"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossibile trovare il pacchetto %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossibile trovare il pacchetto %s"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Nota, si sta selezionando %s per l'espressione regolare \"%s\"\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Nota, si sta selezionando %s per l'espressione regolare \"%s\"\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "È stato impostato %s per l'installazione manuale.\n"
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "È stato impostato %s per l'installazione manuale.\n"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 "È utile eseguire \"apt-get -f install\" per correggere questi problemi:"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 "È utile eseguire \"apt-get -f install\" per correggere questi problemi:"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1096,7 +1101,7 @@ msgstr ""
 "Dipendenze non soddisfatte. Provare \"apt-get -f install\" senza pacchetti "
 "(o specificare una soluzione)."
 
 "Dipendenze non soddisfatte. Provare \"apt-get -f install\" senza pacchetti "
 "(o specificare una soluzione)."
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1108,118 +1113,118 @@ msgstr ""
 "usando una distribuzione in sviluppo, che alcuni pacchetti richiesti\n"
 "non sono ancora stati creati o sono stati rimossi da Incoming."
 
 "usando una distribuzione in sviluppo, che alcuni pacchetti richiesti\n"
 "non sono ancora stati creati o sono stati rimossi da Incoming."
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "Pacchetto danneggiato"
 
 msgid "Broken packages"
 msgstr "Pacchetto danneggiato"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "I seguenti pacchetti saranno inoltre installati:"
 
 msgid "The following extra packages will be installed:"
 msgstr "I seguenti pacchetti saranno inoltre installati:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "Pacchetti suggeriti:"
 
 msgid "Suggested packages:"
 msgstr "Pacchetti suggeriti:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "Pacchetti raccomandati:"
 
 msgid "Recommended packages:"
 msgstr "Pacchetti raccomandati:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "Calcolo dell'aggiornamento... "
 
 msgid "Calculating upgrade... "
 msgstr "Calcolo dell'aggiornamento... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "Non riuscito"
 
 msgid "Failed"
 msgstr "Non riuscito"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "Eseguito"
 
 msgid "Done"
 msgstr "Eseguito"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr "Errore interno, \"problem resolver\" ha rovinato qualcosa"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Errore interno, \"problem resolver\" ha rovinato qualcosa"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "È necessario specificare almeno un pacchetto di cui recuperare il sorgente"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "È necessario specificare almeno un pacchetto di cui recuperare il sorgente"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Impossibile trovare un pacchetto sorgente per %s"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Impossibile trovare un pacchetto sorgente per %s"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Il pacchetto \"%s\" già scaricato viene saltato\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Il pacchetto \"%s\" già scaricato viene saltato\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Lo spazio libero in %s è insufficiente"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Lo spazio libero in %s è insufficiente"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "È necessario recuperare %sB/%sB di sorgenti.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "È necessario recuperare %sB/%sB di sorgenti.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "È necessario recuperare %sB di sorgenti\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "È necessario recuperare %sB di sorgenti\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Recupero sorgente %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Recupero sorgente %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "Recupero di alcuni archivi non riuscito."
 
 msgid "Failed to fetch some archives."
 msgstr "Recupero di alcuni archivi non riuscito."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Estrazione del pacchetto sorgente già estratto in %s saltata\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Estrazione del pacchetto sorgente già estratto in %s saltata\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Comando di estrazione \"%s\" non riuscito.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Comando di estrazione \"%s\" non riuscito.\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Verificare che il pacchetto \"dpkg-dev\" sia installato.\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Verificare che il pacchetto \"dpkg-dev\" sia installato.\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Comando \"%s\" di generazione non riuscito.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Comando \"%s\" di generazione non riuscito.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "Creazione processo figlio non riuscita"
 
 msgid "Child process failed"
 msgstr "Creazione processo figlio non riuscita"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "È necessario specificare almeno un pacchetto di cui controllare le "
 "dipendenze di generazione"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "È necessario specificare almeno un pacchetto di cui controllare le "
 "dipendenze di generazione"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Impossibile ottenere informazioni di dipendenza di generazione per %s"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Impossibile ottenere informazioni di dipendenza di generazione per %s"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s non ha dipendenze di generazione.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s non ha dipendenze di generazione.\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "


@@ -1228,7 +1233,7 @@ msgstr ""
 "%s dipendenze per %s non possono essere soddisfatte perchè il pacchetto %s "
 "non può essere trovato"
 
 "%s dipendenze per %s non possono essere soddisfatte perchè il pacchetto %s "
 "non può essere trovato"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1237,32 +1242,33 @@ msgstr ""
 "%s dipendenze per %s non possono essere soddisfatte perchè nessuna versione "
 "del pacchetto %s può soddisfare le richieste di versione"
 
 "%s dipendenze per %s non possono essere soddisfatte perchè nessuna versione "
 "del pacchetto %s può soddisfare le richieste di versione"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "La dipendenza %s per %s non è stata soddisfatta: il pacchetto installato %s "
 "è troppo nuovo"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "La dipendenza %s per %s non è stata soddisfatta: il pacchetto installato %s "
 "è troppo nuovo"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "La dipendenza %s per %s non è stata soddisfatta: %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "La dipendenza %s per %s non è stata soddisfatta: %s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Le dipendenze di generazione per %s non sono state soddisfatte."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Le dipendenze di generazione per %s non sono state soddisfatte."
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "Elaborazione delle dipendenze di generazione non riuscita"
 
 msgid "Failed to process build dependencies"
 msgstr "Elaborazione delle dipendenze di generazione non riuscita"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "Moduli supportati:"
 
 msgid "Supported modules:"
 msgstr "Moduli supportati:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1278,7 +1284,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1890,7 +1896,7 @@ msgstr "Connessione al socket dati terminata"
 msgid "Unable to accept connection"
 msgstr "Impossibile accettare connessioni"
 
 msgid "Unable to accept connection"
 msgstr "Impossibile accettare connessioni"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "Si è verificato un problema nel creare l'hash del file"
 
 msgid "Problem hashing file"
 msgstr "Si è verificato un problema nel creare l'hash del file"
 


@@ -1975,42 +1981,42 @@ msgstr ""
 msgid "Unable to connect to %s %s:"
 msgstr "Impossibile connettersi a %s %s:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "Impossibile connettersi a %s %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Impossibile accedere al portachiavi: \"%s\""
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Impossibile accedere al portachiavi: \"%s\""
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: Elenco argomenti da Acquire::gpgv::Options troppo lungo. Uscita."
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: Elenco argomenti da Acquire::gpgv::Options troppo lungo. Uscita."
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Errore interno: firma corretta, ma non è possibile determinare l'impronta "
 "della chiave."
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Errore interno: firma corretta, ma non è possibile determinare l'impronta "
 "della chiave."
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "È stata trovata almeno una fima non valida."
 
 msgid "At least one invalid signature was encountered."
 msgstr "È stata trovata almeno una fima non valida."
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Impossibile esseguire \"%s\" per verificare la firma (forse gpgv non è "
 "installato)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Impossibile esseguire \"%s\" per verificare la firma (forse gpgv non è "
 "installato)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "Errore sconosciuto durante l'esecuzione di gpgv"
 
 msgid "Unknown error executing gpgv"
 msgstr "Errore sconosciuto durante l'esecuzione di gpgv"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "Le seguenti firme non erano valide:\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "Le seguenti firme non erano valide:\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -2028,80 +2034,80 @@ msgstr "Impossibile aprire una pipe per %s"
 msgid "Read error from %s process"
 msgstr "Errore di lettura dal processo %s"
 
 msgid "Read error from %s process"
 msgstr "Errore di lettura dal processo %s"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "In attesa degli header"
 
 msgid "Waiting for headers"
 msgstr "In attesa degli header"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Ricevuta una singola riga header su %u caratteri"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Ricevuta una singola riga header su %u caratteri"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "Riga header non corretta"
 
 msgid "Bad header line"
 msgstr "Riga header non corretta"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "Il server HTTP ha inviato un header di risposta non valido"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Il server HTTP ha inviato un header di risposta non valido"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Il server HTTP ha inviato un header Content-Length non valido"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Il server HTTP ha inviato un header Content-Length non valido"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Il server HTTP ha inviato un header Content-Range non valido"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Il server HTTP ha inviato un header Content-Range non valido"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "Questo server HTTP ha un supporto del range non corretto"
 
 msgid "This HTTP server has broken range support"
 msgstr "Questo server HTTP ha un supporto del range non corretto"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "Formato della data sconosciuto"
 
 msgid "Unknown date format"
 msgstr "Formato della data sconosciuto"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "Select non riuscita"
 
 msgid "Select failed"
 msgstr "Select non riuscita"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "Connessione terminata"
 
 msgid "Connection timed out"
 msgstr "Connessione terminata"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "Errore nello scrivere sul file di output"
 
 msgid "Error writing to output file"
 msgstr "Errore nello scrivere sul file di output"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "Errore nello scrivere su file"
 
 msgid "Error writing to file"
 msgstr "Errore nello scrivere su file"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "Errore nello scrivere sul file"
 
 msgid "Error writing to the file"
 msgstr "Errore nello scrivere sul file"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "Errore nel leggere dal server. Il lato remoto ha chiuso la connessione"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Errore nel leggere dal server. Il lato remoto ha chiuso la connessione"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "Errore nel leggere dal server"
 
 msgid "Error reading from server"
 msgstr "Errore nel leggere dal server"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 msgid "Failed to truncate file"
 msgstr "Troncamento del file non riuscito"
 
 msgid "Failed to truncate file"
 msgstr "Troncamento del file non riuscito"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "Header dati non corretto"
 
 msgid "Bad header data"
 msgstr "Header dati non corretto"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "Connessione non riuscita"
 
 msgid "Connection failed"
 msgstr "Connessione non riuscita"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "Errore interno"
 
 msgid "Internal error"
 msgstr "Errore interno"
 


@@ -2123,7 +2129,31 @@ msgstr ""
 "Mmap dinamica esaurita. Aumentare la dimensione di APT::Cache-Limit. Il "
 "valore attuale è: %lu (man 5 apt.conf)."
 
 "Mmap dinamica esaurita. Aumentare la dimensione di APT::Cache-Limit. Il "
 "valore attuale è: %lu (man 5 apt.conf)."
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "Selezione %s non trovata"
 #, c-format
 msgid "Selection %s not found"
 msgstr "Selezione %s non trovata"


@@ -2558,7 +2588,7 @@ msgstr "Impossibile trovare un driver per il metodo %s."
 msgid "Method %s did not start correctly"
 msgstr "Il metodo %s non si è avviato correttamente"
 
 msgid "Method %s did not start correctly"
 msgstr "Il metodo %s non si è avviato correttamente"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Inserire il disco chiamato \"%s\" nell'unità \"%s\" e premere Invio."
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Inserire il disco chiamato \"%s\" nell'unità \"%s\" e premere Invio."


@@ -2931,12 +2961,16 @@ msgstr "Preparazione alla rimozione completa di %s"
 msgid "Completely removed %s"
 msgstr "Pacchetto %s rimosso completamente"
 
 msgid "Completely removed %s"
 msgstr "Pacchetto %s rimosso completamente"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Impossibile scrivere il registro, openpty() non riuscita (forse /dev/pts non "
 "è montato)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Impossibile scrivere il registro, openpty() non riuscita (forse /dev/pts non "
 "è montato)\n"
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Impossibile applicare la patch al file"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Impossibile applicare la patch al file"

diff --git a/po/ja.po b/po/ja.po
index d6b826297c385b909277348380c05562c843abcb..c101e7cdcc9fce622dc0f5ecf81bcc3b75ac7aac 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt 0.7\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2008-11-13 09:26+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
 "PO-Revision-Date: 2008-11-13 09:26+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"


@@ -157,7 +157,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s コンパイル日時: %s %s\n"
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s コンパイル日時: %s %s\n"


@@ -655,7 +655,7 @@ msgstr "%s を %s に名前変更できませんでした"
 msgid "Y"
 msgstr "Y"
 
 msgid "Y"
 msgstr "Y"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "正規表現の展開エラー - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "正規表現の展開エラー - %s"


@@ -818,11 +818,11 @@ msgstr "パッケージを削除しなければなりませんが、削除が無
 msgid "Internal error, Ordering didn't finish"
 msgstr "内部エラー、調整が終わっていません"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "内部エラー、調整が終わっていません"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "ダウンロードディレクトリをロックできません"
 
 msgid "Unable to lock the download directory"
 msgstr "ダウンロードディレクトリをロックできません"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "ソースのリストを読むことができません。"
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "ソースのリストを読むことができません。"


@@ -852,7 +852,7 @@ msgstr "この操作後に追加で %sB のディスク容量が消費されま
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "この操作後に %sB のディスク容量が解放されます。\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "この操作後に %sB のディスク容量が解放されます。\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s の空き領域を測定できません"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s の空き領域を測定できません"


@@ -889,7 +889,7 @@ msgstr "中断しました。"
 msgid "Do you want to continue [Y/n]? "
 msgstr "続行しますか [Y/n]? "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "続行しますか [Y/n]? "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s の取得に失敗しました  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s の取得に失敗しました  %s\n"


@@ -898,7 +898,7 @@ msgstr "%s の取得に失敗しました  %s\n"
 msgid "Some files failed to download"
 msgstr "いくつかのファイルの取得に失敗しました"
 
 msgid "Some files failed to download"
 msgstr "いくつかのファイルの取得に失敗しました"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました"
 
 msgid "Download complete and in download only mode"
 msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました"
 


@@ -997,31 +997,36 @@ msgstr "'%2$s' のバージョン '%1$s' が見つかりませんでした"
 msgid "Selected version %s (%s) for %s\n"
 msgstr "%3$s にはバージョン %1$s (%2$s) を選択しました\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "%3$s にはバージョン %1$s (%2$s) を選択しました\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "update コマンドは引数をとりません"
 
 msgid "The update command takes no arguments"
 msgstr "update コマンドは引数をとりません"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "list ディレクトリをロックできません"
 
 msgid "Unable to lock the list directory"
 msgstr "list ディレクトリをロックできません"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "一連のものを削除するようになっていないので、AutoRemover を開始できません"
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "一連のものを削除するようになっていないので、AutoRemover を開始できません"
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 "以下のパッケージが自動でインストールされましたが、もう必要とされていません:"
 
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 "以下のパッケージが自動でインストールされましたが、もう必要とされていません:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "これらを削除するには 'apt-get autoremove' を利用してください。"
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "これらを削除するには 'apt-get autoremove' を利用してください。"
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1039,45 +1044,45 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "以下の情報がこの問題を解決するために役立つかもしれません:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "以下の情報がこの問題を解決するために役立つかもしれません:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "内部エラー、AutoRemover が何かを破壊しました"
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "内部エラー、AutoRemover が何かを破壊しました"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "内部エラー、AllUpgrade が何かを破壊しました"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "内部エラー、AllUpgrade が何かを破壊しました"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr "タスク %s が見つかりません"
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "タスク %s が見つかりません"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "パッケージ %s が見つかりません"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "パッケージ %s が見つかりません"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "注意: 正規表現 '%2$s' に対して %1$s を選択しました\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "注意: 正規表現 '%2$s' に対して %1$s を選択しました\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s は手動でインストールしたと設定されました。\n"
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s は手動でインストールしたと設定されました。\n"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 "以下の問題を解決するために 'apt-get -f install' を実行する必要があるかもしれ"
 "ません:"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 "以下の問題を解決するために 'apt-get -f install' を実行する必要があるかもしれ"
 "ません:"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1085,7 +1090,7 @@ msgstr ""
 "未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法"
 "を明示してください)。"
 
 "未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法"
 "を明示してください)。"
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1097,118 +1102,118 @@ msgstr ""
 "であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n"
 "動されていないことが考えられます。"
 
 "であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n"
 "動されていないことが考えられます。"
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "壊れたパッケージ"
 
 msgid "Broken packages"
 msgstr "壊れたパッケージ"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "以下の特別パッケージがインストールされます:"
 
 msgid "The following extra packages will be installed:"
 msgstr "以下の特別パッケージがインストールされます:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "提案パッケージ:"
 
 msgid "Suggested packages:"
 msgstr "提案パッケージ:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "推奨パッケージ:"
 
 msgid "Recommended packages:"
 msgstr "推奨パッケージ:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "アップグレードパッケージを検出しています ... "
 
 msgid "Calculating upgrade... "
 msgstr "アップグレードパッケージを検出しています ... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "失敗"
 
 msgid "Failed"
 msgstr "失敗"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "完了"
 
 msgid "Done"
 msgstr "完了"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr "内部エラー、問題リゾルバが何かを破壊しました"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "内部エラー、問題リゾルバが何かを破壊しました"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "ソースを取得するには少なくともひとつのパッケージ名を指定する必要があります"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "ソースを取得するには少なくともひとつのパッケージ名を指定する必要があります"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s のソースパッケージが見つかりません"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s のソースパッケージが見つかりません"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "すでにダウンロードされたファイル '%s' をスキップします\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "すでにダウンロードされたファイル '%s' をスキップします\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "%s に充分な空きスペースがありません"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "%s に充分な空きスペースがありません"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "%sB のソースアーカイブを取得する必要があります。\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "%sB のソースアーカイブを取得する必要があります。\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ソース %s を取得\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ソース %s を取得\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "いくつかのアーカイブの取得に失敗しました。"
 
 msgid "Failed to fetch some archives."
 msgstr "いくつかのアーカイブの取得に失敗しました。"
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "展開コマンド '%s' が失敗しました。\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "展開コマンド '%s' が失敗しました。\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 "'dpkg-dev' パッケージがインストールされていることを確認してください。\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 "'dpkg-dev' パッケージがインストールされていることを確認してください。\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "ビルドコマンド '%s' が失敗しました。\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "ビルドコマンド '%s' が失敗しました。\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "子プロセスが失敗しました"
 
 msgid "Child process failed"
 msgstr "子プロセスが失敗しました"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s のビルド依存情報を取得できません"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s のビルド依存情報を取得できません"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s にはビルド依存情報が指定されていません。\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s にはビルド依存情報が指定されていません。\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "


@@ -1217,7 +1222,7 @@ msgstr ""
 "パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと"
 "ができません"
 
 "パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと"
 "ができません"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1226,32 +1231,33 @@ msgstr ""
 "入手可能な %3$s はいずれもバージョンについての要求を満たせないため、%2$s に対"
 "する %1$s の依存関係を満たすことができません"
 
 "入手可能な %3$s はいずれもバージョンについての要求を満たせないため、%2$s に対"
 "する %1$s の依存関係を満たすことができません"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "%2$s の依存関係 %1$s を満たすことができません: インストールされた %3$s パッ"
 "ケージは新しすぎます"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "%2$s の依存関係 %1$s を満たすことができません: インストールされた %3$s パッ"
 "ケージは新しすぎます"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s のビルド依存関係を満たすことができませんでした。"
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s のビルド依存関係を満たすことができませんでした。"
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "ビルド依存関係の処理に失敗しました"
 
 msgid "Failed to process build dependencies"
 msgstr "ビルド依存関係の処理に失敗しました"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "サポートされているモジュール:"
 
 msgid "Supported modules:"
 msgstr "サポートされているモジュール:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1267,7 +1273,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1870,7 +1876,7 @@ msgstr "データソケット接続タイムアウト"
 msgid "Unable to accept connection"
 msgstr "接続を accept できません"
 
 msgid "Unable to accept connection"
 msgstr "接続を accept できません"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "ファイルのハッシュでの問題"
 
 msgid "Problem hashing file"
 msgstr "ファイルのハッシュでの問題"
 


@@ -1954,41 +1960,41 @@ msgstr "'%s:%s' (%i) の解決中に問題が起こりました"
 msgid "Unable to connect to %s %s:"
 msgstr "%s %s へ接続できません:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "%s %s へ接続できません:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "キーリングにアクセスできませんでした: '%s'"
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "キーリングにアクセスできませんでした: '%s'"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "エラー: Acquire::gpgv::Options の引数リストが長すぎます。終了しています。"
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "エラー: Acquire::gpgv::Options の引数リストが長すぎます。終了しています。"
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "内部エラー: 正しい署名ですが、鍵指紋を確定できません?!"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "内部エラー: 正しい署名ですが、鍵指紋を確定できません?!"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "少なくとも 1 つの不正な署名が発見されました。"
 
 msgid "At least one invalid signature was encountered."
 msgstr "少なくとも 1 つの不正な署名が発見されました。"
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "署名を検証するための '%s' の実行ができませんでした (gpgv はインストールされて"
 "いますか?)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "署名を検証するための '%s' の実行ができませんでした (gpgv はインストールされて"
 "いますか?)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "gpgv の実行中に未知のエラーが発生"
 
 msgid "Unknown error executing gpgv"
 msgstr "gpgv の実行中に未知のエラーが発生"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "以下の署名が無効です:\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "以下の署名が無効です:\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -2004,80 +2010,80 @@ msgstr "%s に対してパイプを開けませんでした"
 msgid "Read error from %s process"
 msgstr "%s プロセスからの読み込みエラー"
 
 msgid "Read error from %s process"
 msgstr "%s プロセスからの読み込みエラー"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "ヘッダの待機中です"
 
 msgid "Waiting for headers"
 msgstr "ヘッダの待機中です"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "%u 文字を超える 1 行のヘッダを取得しました"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "%u 文字を超える 1 行のヘッダを取得しました"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "不正なヘッダ行です"
 
 msgid "Bad header line"
 msgstr "不正なヘッダ行です"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "http サーバが不正なリプライヘッダを送信してきました"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "http サーバが不正なリプライヘッダを送信してきました"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "http サーバが不正な Content-Length ヘッダを送信してきました"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "http サーバが不正な Content-Length ヘッダを送信してきました"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "http サーバが不正な Content-Range ヘッダを送信してきました"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "http サーバが不正な Content-Range ヘッダを送信してきました"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "http サーバのレンジサポートが壊れています"
 
 msgid "This HTTP server has broken range support"
 msgstr "http サーバのレンジサポートが壊れています"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "不明な日付フォーマットです"
 
 msgid "Unknown date format"
 msgstr "不明な日付フォーマットです"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "select に失敗しました"
 
 msgid "Select failed"
 msgstr "select に失敗しました"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "接続タイムアウト"
 
 msgid "Connection timed out"
 msgstr "接続タイムアウト"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "出力ファイルへの書き込みでエラーが発生しました"
 
 msgid "Error writing to output file"
 msgstr "出力ファイルへの書き込みでエラーが発生しました"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "ファイルへの書き込みでエラーが発生しました"
 
 msgid "Error writing to file"
 msgstr "ファイルへの書き込みでエラーが発生しました"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "ファイルへの書き込みでエラーが発生しました"
 
 msgid "Error writing to the file"
 msgstr "ファイルへの書き込みでエラーが発生しました"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "サーバからの読み込みに失敗しました"
 
 msgid "Error reading from server"
 msgstr "サーバからの読み込みに失敗しました"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 msgid "Failed to truncate file"
 msgstr "ファイルの切り詰めに失敗しました"
 
 msgid "Failed to truncate file"
 msgstr "ファイルの切り詰めに失敗しました"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "不正なヘッダです"
 
 msgid "Bad header data"
 msgstr "不正なヘッダです"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "接続失敗"
 
 msgid "Connection failed"
 msgstr "接続失敗"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "内部エラー"
 
 msgid "Internal error"
 msgstr "内部エラー"
 


@@ -2097,7 +2103,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "選択された %s が見つかりません"
 #, c-format
 msgid "Selection %s not found"
 msgstr "選択された %s が見つかりません"


@@ -2525,7 +2555,7 @@ msgstr "メソッドドライバ %s が見つかりません。"
 msgid "Method %s did not start correctly"
 msgstr "メソッド %s が正常に開始しませんでした"
 
 msgid "Method %s did not start correctly"
 msgstr "メソッド %s が正常に開始しませんでした"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""


@@ -2898,12 +2928,16 @@ msgstr "%s を完全に削除する準備をしています"
 msgid "Completely removed %s"
 msgstr "%s を完全に削除しました"
 
 msgid "Completely removed %s"
 msgstr "%s を完全に削除しました"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "ログに書き込めません。openpty() に失敗しました (/dev/pts がマウントされていな"
 "い?)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "ログに書き込めません。openpty() に失敗しました (/dev/pts がマウントされていな"
 "い?)\n"
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "ファイルにパッチできませんでした"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "ファイルにパッチできませんでした"

diff --git a/po/km.po b/po/km.po
index efd79dfe29e9f2a5382ea038c8a0865a1b8a6fe2..3d3e2dfbe01f0a4d7cf5c373d360c6f0bf7e0cc0 100644 (file)
--- a/po/km.po
+++ b/po/km.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_km\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt_po_km\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2006-10-10 09:48+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros.info>\n"
 "PO-Revision-Date: 2006-10-10 09:48+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros.info>\n"


@@ -162,7 +162,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s សម្រាប់ %s %s បាន​ចងក្រងនៅលើ​%s %s\n"
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s សម្រាប់ %s %s បាន​ចងក្រងនៅលើ​%s %s\n"


@@ -659,7 +659,7 @@ msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ
 msgid "Y"
 msgstr "Y"
 
 msgid "Y"
 msgstr "Y"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex កំហុស​ការចងក្រង​ - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex កំហុស​ការចងក្រង​ - %s"


@@ -820,11 +820,11 @@ msgstr "កញ្ចប់ ​ត្រូវការឲ្យ​យក​ច
 msgid "Internal error, Ordering didn't finish"
 msgstr "កំហុស​ខាងក្នុង​ ការ​រៀប​តាម​លំដាប់​មិន​បាន​បញ្ចប់ឡើយ"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "កំហុស​ខាងក្នុង​ ការ​រៀប​តាម​លំដាប់​មិន​បាន​បញ្ចប់ឡើយ"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "មិន​អាច​ចាក់​សោ​ថត​ទាញ​យក​បាន​ឡើយ"
 
 msgid "Unable to lock the download directory"
 msgstr "មិន​អាច​ចាក់​សោ​ថត​ទាញ​យក​បាន​ឡើយ"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "មិន​អាច​អាន​បញ្ជី​ប្រភព​បាន​ឡើយ​ ។"
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "មិន​អាច​អាន​បញ្ជី​ប្រភព​បាន​ឡើយ​ ។"


@@ -853,7 +853,7 @@ msgstr "បន្ទាប់​ពី​ពន្លា​ %sB នៃ​កា
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "បន្ទាប់​ពី​ពន្លា​ %sB ទំហំ​ថាសនឹង​​ទំនេរ ។ \n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "បន្ទាប់​ពី​ពន្លា​ %sB ទំហំ​ថាសនឹង​​ទំនេរ ។ \n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "មិន​អាច​កំណត់​ទំហំ​ទំនេរ​ក្នុង​ %s បានឡើយ"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "មិន​អាច​កំណត់​ទំហំ​ទំនេរ​ក្នុង​ %s បានឡើយ"


@@ -890,7 +890,7 @@ msgstr "បោះបង់ ។"
 msgid "Do you want to continue [Y/n]? "
 msgstr "តើ​អ្នក​ចង់​បន្តឬ​ [បាទ ចាស/ទេ​] ? "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "តើ​អ្នក​ចង់​បន្តឬ​ [បាទ ចាស/ទេ​] ? "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s  %s\n"


@@ -899,7 +899,7 @@ msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រម
 msgid "Some files failed to download"
 msgstr "ឯកសារ​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​ទាញ​យក​"
 
 msgid "Some files failed to download"
 msgstr "ឯកសារ​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​ទាញ​យក​"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "បានបញ្ចប់ការទាញ​យក​ ហើយ​តែ​ក្នុង​របៀប​​ទាញ​យក​ប៉ុណ្ណោះ"
 
 msgid "Download complete and in download only mode"
 msgstr "បានបញ្ចប់ការទាញ​យក​ ហើយ​តែ​ក្នុង​របៀប​​ទាញ​យក​ប៉ុណ្ណោះ"
 


@@ -996,30 +996,35 @@ msgstr "រក​មិន​ឃើញ​កំណែ​ '%s' សម្រាប
 msgid "Selected version %s (%s) for %s\n"
 msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ទាន់​សម័យ​គ្មាន​អាគុយម៉ង់​ទេ"
 
 msgid "The update command takes no arguments"
 msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ទាន់​សម័យ​គ្មាន​អាគុយម៉ង់​ទេ"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "មិន​អាច​ចាក់​សោ​ថត​បញ្ជីបានឡើយ"
 
 msgid "Unable to lock the list directory"
 msgstr "មិន​អាច​ចាក់​សោ​ថត​បញ្ជីបានឡើយ"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
 
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1035,51 +1040,51 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "ព័ត៌មាន​ដូចតទៅនេះ អាចជួយ​ដោះស្រាយ​ស្ថានភាព​បាន ៖"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "ព័ត៌មាន​ដូចតទៅនេះ អាចជួយ​ដោះស្រាយ​ស្ថានភាព​បាន ៖"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍"
 
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "កំហុស​ខាងក្នុង ការធ្វើឲ្យប្រសើរ​ទាំងអស់បានធ្វើឲ្យ​ឧបករណ៍​ខូច"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "កំហុស​ខាងក្នុង ការធ្វើឲ្យប្រសើរ​ទាំងអស់បានធ្វើឲ្យ​ឧបករណ៍​ខូច"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
 
 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "ចំណាំ កំពុង​ជ្រើស​ %s សម្រាប់ regex '%s'\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "ចំណាំ កំពុង​ជ្រើស​ %s សម្រាប់ regex '%s'\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
 
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "អ្នក​ប្រហែល​ជា​ចង់​រត់ `apt-get -f install' ដើម្បី​កែ​ពួក​វា​ទាំង​នេះ ៖"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "អ្នក​ប្រហែល​ជា​ចង់​រត់ `apt-get -f install' ដើម្បី​កែ​ពួក​វា​ទាំង​នេះ ៖"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 "ភាពអស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ 'apt-get -f install' ដោយ​គ្មាន​កញ្ចប់ (ឬ បញ្ជាក់​ដំណោះស្រាយ) ។"
 
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 "ភាពអស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ 'apt-get -f install' ដោយ​គ្មាន​កញ្ចប់ (ឬ បញ្ជាក់​ដំណោះស្រាយ) ។"
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1091,122 +1096,122 @@ msgstr ""
 "ដែលបាន​ទាមទារនឹងមិនទាន់បានបង្កើត​ឡើយ​\n"
 " ឬ ​បានយក​ចេញ​ពីការមកដល់ ។"
 
 "ដែលបាន​ទាមទារនឹងមិនទាន់បានបង្កើត​ឡើយ​\n"
 " ឬ ​បានយក​ចេញ​ពីការមកដល់ ។"
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "កញ្ចប់​ដែល​បាន​ខូច​"
 
 msgid "Broken packages"
 msgstr "កញ្ចប់​ដែល​បាន​ខូច​"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "កញ្ចប់​បន្ថែម​ដូចតទៅនេះ នឹងត្រូវបាន​ដំឡើង ៖"
 
 msgid "The following extra packages will be installed:"
 msgstr "កញ្ចប់​បន្ថែម​ដូចតទៅនេះ នឹងត្រូវបាន​ដំឡើង ៖"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​យោបល់ ៖"
 
 msgid "Suggested packages:"
 msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​យោបល់ ៖"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​អនុសាសន៍ ៖"
 
 msgid "Recommended packages:"
 msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​អនុសាសន៍ ៖"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... "
 
 msgid "Calculating upgrade... "
 msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "បាន​បរាជ័យ"
 
 msgid "Failed"
 msgstr "បាន​បរាជ័យ"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "ធ្វើរួច​"
 
 msgid "Done"
 msgstr "ធ្វើរួច​"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "មិន​អាច​រក​កញ្ចប់ប្រភព​​សម្រាប់ %s បានឡើយ"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "មិន​អាច​រក​កញ្ចប់ប្រភព​​សម្រាប់ %s បានឡើយ"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "កំពុង​រំលង​ឯកសារ​ដែល​បាន​ទាញយក​រួច​ '%s'\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "កំពុង​រំលង​ឯកសារ​ដែល​បាន​ទាញយក​រួច​ '%s'\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "អ្នក​ពុំ​មាន​ទំហំ​ទំនេរ​គ្រប់គ្រាន់​ទេ​នៅក្នុង​ %s ឡើយ"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "អ្នក​ពុំ​មាន​ទំហំ​ទំនេរ​គ្រប់គ្រាន់​ទេ​នៅក្នុង​ %s ឡើយ"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "ត្រូវការ​យក​ %sB/%sB នៃ​ប័ណ្ណសារ​ប្រភព ។\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "ត្រូវការ​យក​ %sB/%sB នៃ​ប័ណ្ណសារ​ប្រភព ។\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "ត្រូវការ​យក​ %sB នៃ​ប័ណ្ណសារ​ប្រភព​ ។\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "ត្រូវការ​យក​ %sB នៃ​ប័ណ្ណសារ​ប្រភព​ ។\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ទៅប្រមូល​ប្រភព​ %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ទៅប្រមូល​ប្រភព​ %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "បរាជ័យ​ក្នុងការទៅប្រមូលយក​ប័ណ្ណសារ​មួយចំនួន ។"
 
 msgid "Failed to fetch some archives."
 msgstr "បរាជ័យ​ក្នុងការទៅប្រមូលយក​ប័ណ្ណសារ​មួយចំនួន ។"
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "កំពុង​រំលង​ការស្រាយ​នៃប្រភព​ដែលបានស្រាយរួច​នៅក្នុង %s\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "កំពុង​រំលង​ការស្រាយ​នៃប្រភព​ដែលបានស្រាយរួច​នៅក្នុង %s\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "ពាក្យ​បញ្ជា​ស្រាយ '%s' បាន​បរាជ័យ​ ។\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "ពាក្យ​បញ្ជា​ស្រាយ '%s' បាន​បរាជ័យ​ ។\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "សាងសង​ពាក្យ​បញ្ជា​ '%s' បានបរាជ័យ​ ។\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "សាងសង​ពាក្យ​បញ្ជា​ '%s' បានបរាជ័យ​ ។\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "ដំណើរ​ការ​កូន​បាន​បរាជ័យ​"
 
 msgid "Child process failed"
 msgstr "ដំណើរ​ការ​កូន​បាន​បរាជ័យ​"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr "ត្រូវតែ​បញ្ជាក់​យ៉ាងហោចណាស់​មួយកញ្ចប់ដើម្បីពិនិត្យ builddeps សម្រាប់"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr "ត្រូវតែ​បញ្ជាក់​យ៉ាងហោចណាស់​មួយកញ្ចប់ដើម្បីពិនិត្យ builddeps សម្រាប់"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "មិន​អាច​សាងសង់​​ព័ត៌មាន​ភាពអស្រ័យ​សម្រាប់ %s"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "មិន​អាច​សាងសង់​​ព័ត៌មាន​ភាពអស្រ័យ​សម្រាប់ %s"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s មិនមានភាពអាស្រ័យ​ស្ថាបនាឡើយ​ ។\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s មិនមានភាពអាស្រ័យ​ស្ថាបនាឡើយ​ ។\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ "
 
 #, 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:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1215,30 +1220,30 @@ msgstr ""
 "ភាពអាស្រ័យ %s សម្រាប់ %s មិនអាច​តម្រូវចិត្តបានទេ ព្រោះ មិនមាន​កំណែ​នៃកញ្ចប់ %s ដែលអាច​តម្រូវចិត្ត​"
 "តម្រូវការ​កំណែបានឡើយ"
 
 "ភាពអាស្រ័យ %s សម្រាប់ %s មិនអាច​តម្រូវចិត្តបានទេ ព្រោះ មិនមាន​កំណែ​នៃកញ្ចប់ %s ដែលអាច​តម្រូវចិត្ត​"
 "តម្រូវការ​កំណែបានឡើយ"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺថ្មីពេក"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺថ្មីពេក"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s: %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s: %s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "ភាពអាស្រ័យ​ដែល​បង្កើត​ %s មិន​អាច​បំពេញ​សេចក្ដី​ត្រូវការ​បាន​ទេ ។"
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "ភាពអាស្រ័យ​ដែល​បង្កើត​ %s មិន​អាច​បំពេញ​សេចក្ដី​ត្រូវការ​បាន​ទេ ។"
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើត​ភាព​អាស្រ័យ"
 
 msgid "Failed to process build dependencies"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើត​ភាព​អាស្រ័យ"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ "
 
 msgid "Supported modules:"
 msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ "
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628

 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"


@@ -1255,7 +1260,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1847,7 +1852,7 @@ msgstr "ការតភ្ជាប់​រន្ធ​​ទិន្នន័
 msgid "Unable to accept connection"
 msgstr "មិនអាច​ទទួលយក​ការតភ្ជាប់​បានឡើយ"
 
 msgid "Unable to accept connection"
 msgstr "មិនអាច​ទទួលយក​ការតភ្ជាប់​បានឡើយ"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "បញ្ហា​ធ្វើឲ្យខូច​ឯកសារ"
 
 msgid "Problem hashing file"
 msgstr "បញ្ហា​ធ្វើឲ្យខូច​ឯកសារ"
 


@@ -1931,38 +1936,38 @@ msgstr "ការ​ដោះស្រាយ​អ្វី​អាក្រក
 msgid "Unable to connect to %s %s:"
 msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​​ %s %s ៖"
 
 msgid "Unable to connect to %s %s:"
 msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​​ %s %s ៖"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "មិន​អាច​ចូល​ដំណើរការ keyring ៖ '%s'"
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "មិន​អាច​ចូល​ដំណើរការ keyring ៖ '%s'"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E ៖ បញ្ជី​អាគុយ​ម៉ង់​ពី​ Acquire::gpgv::Options too long ។ ចេញ​ ។"
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E ៖ បញ្ជី​អាគុយ​ម៉ង់​ពី​ Acquire::gpgv::Options too long ។ ចេញ​ ។"
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "កំហុស​ខាងក្នុង​ ៖ ហត្ថលេខា​​ល្អ ប៉ុន្តែ ​មិន​អាច​កំណត់​កូនសោ​ស្នាម​ម្រាមដៃ ?!"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "កំហុស​ខាងក្នុង​ ៖ ហត្ថលេខា​​ល្អ ប៉ុន្តែ ​មិន​អាច​កំណត់​កូនសោ​ស្នាម​ម្រាមដៃ ?!"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "​បានជួប​ប្រទះ​​​​ហត្ថលេខា​យ៉ាងហោចណាស់មួយ ដែ​លត្រឹមត្រូវ​ ។"
 
 msgid "At least one invalid signature was encountered."
 msgstr "​បានជួប​ប្រទះ​​​​ហត្ថលេខា​យ៉ាងហោចណាស់មួយ ដែ​លត្រឹមត្រូវ​ ។"
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "មិន​អាច​ប្រតិបត្តិ '%s' ដើម្បី​ផ្ទៀងផ្ទាត់​ហត្ថលេខា (តើ gpgv ត្រូវ​បាន​ដំឡើង​ឬនៅ ?)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "មិន​អាច​ប្រតិបត្តិ '%s' ដើម្បី​ផ្ទៀងផ្ទាត់​ហត្ថលេខា (តើ gpgv ត្រូវ​បាន​ដំឡើង​ឬនៅ ?)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "មិនស្គាល់កំហុស ក្នុងការប្រតិបត្តិ gpgv"
 
 msgid "Unknown error executing gpgv"
 msgstr "មិនស្គាល់កំហុស ក្នុងការប្រតិបត្តិ gpgv"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "ហត្ថលេខា​ខាង​ក្រោម​មិន​ត្រឹមត្រូវ ៖\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "ហត្ថលេខា​ខាង​ក្រោម​មិន​ត្រឹមត្រូវ ៖\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -1978,81 +1983,81 @@ msgstr "មិន​អាច​បើក​បំពុង​សម្រាប
 msgid "Read error from %s process"
 msgstr "អាចន​កំហុស​ពី​ដំណើរការ %s"
 
 msgid "Read error from %s process"
 msgstr "អាចន​កំហុស​ពី​ដំណើរការ %s"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "កំពុង​រង់ចាំ​បឋមកថា"
 
 msgid "Waiting for headers"
 msgstr "កំពុង​រង់ចាំ​បឋមកថា"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "យកបន្ទាត់​បឋមកថា​តែមួយ​​ ដែលលើស %u តួអក្សរ"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "យកបន្ទាត់​បឋមកថា​តែមួយ​​ ដែលលើស %u តួអក្សរ"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "ជួរ​បឋមកថា​ខូច​"
 
 msgid "Bad header line"
 msgstr "ជួរ​បឋមកថា​ខូច​"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើបឋមកថាចម្លើយតបមិនត្រឹមត្រូវ"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើបឋមកថាចម្លើយតបមិនត្រឹមត្រូវ"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើ​​បឋមកថាប្រវែង​​​មាតិកា​មិនត្រឹមត្រូវ​"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើ​​បឋមកថាប្រវែង​​​មាតិកា​មិនត្រឹមត្រូវ​"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើ​បឋមកថា​ជួរ​មាតិកា​មិន​ត្រឹមត្រូវ​"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើ​បឋមកថា​ជួរ​មាតិកា​មិន​ត្រឹមត្រូវ​"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "ម៉ាស៊ីន​បម្រើ HTTP នេះបាន​ខូច​​​ជួរ​គាំទ្រ​"
 
 msgid "This HTTP server has broken range support"
 msgstr "ម៉ាស៊ីន​បម្រើ HTTP នេះបាន​ខូច​​​ជួរ​គាំទ្រ​"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "មិនស្គាល់​ទ្រង់ទ្រាយ​កាលបរិច្ឆេទ"
 
 msgid "Unknown date format"
 msgstr "មិនស្គាល់​ទ្រង់ទ្រាយ​កាលបរិច្ឆេទ"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "ជ្រើស​បាន​បរាជ័យ​"
 
 msgid "Select failed"
 msgstr "ជ្រើស​បាន​បរាជ័យ​"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "ការតភ្ជាប់​បាន​អស់ពេល​"
 
 msgid "Connection timed out"
 msgstr "ការតភ្ជាប់​បាន​អស់ពេល​"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារលទ្ធផល"
 
 msgid "Error writing to output file"
 msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារលទ្ធផល"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារ"
 
 msgid "Error writing to file"
 msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារ"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "កំហុសក្នុងការ​សរសេរ​ទៅកាន់​ឯកសារ"
 
 msgid "Error writing to the file"
 msgstr "កំហុសក្នុងការ​សរសេរ​ទៅកាន់​ឯកសារ"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "កំហុស​ក្នុងការ​អាន​ពី​ម៉ាស៊ីនបម្រើ ។ ការបញ្ចប់​ពីចម្ងាយ​បានបិទការតភ្ជាប់"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "កំហុស​ក្នុងការ​អាន​ពី​ម៉ាស៊ីនបម្រើ ។ ការបញ្ចប់​ពីចម្ងាយ​បានបិទការតភ្ជាប់"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "កំហុស​ក្នុងការអាន​ពី​ម៉ាស៊ីន​បម្រើ"
 
 msgid "Error reading from server"
 msgstr "កំហុស​ក្នុងការអាន​ពី​ម៉ាស៊ីន​បម្រើ"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
 
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "ទិន្នន័យ​បឋមកថា​ខូច"
 
 msgid "Bad header data"
 msgstr "ទិន្នន័យ​បឋមកថា​ខូច"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​"
 
 msgid "Connection failed"
 msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "កំហុស​ខាង​ក្នុង​"
 
 msgid "Internal error"
 msgstr "កំហុស​ខាង​ក្នុង​"
 


@@ -2072,7 +2077,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "ជម្រើស​ %s រក​មិន​ឃើញ​ឡើយ"
 #, c-format
 msgid "Selection %s not found"
 msgstr "ជម្រើស​ %s រក​មិន​ឃើញ​ឡើយ"


@@ -2498,7 +2527,7 @@ msgstr "មិនអាច​រកឃើញ​កម្មវិធី​បញ
 msgid "Method %s did not start correctly"
 msgstr "វិធីសាស្ត្រ​ %s មិន​អាច​ចាប់​ផ្តើម​ត្រឹមត្រូវ​ទេ​"
 
 msgid "Method %s did not start correctly"
 msgstr "វិធីសាស្ត្រ​ %s មិន​អាច​ចាប់​ផ្តើម​ត្រឹមត្រូវ​ទេ​"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "សូម​បញ្ចូល​ស្លាក​ឌីស​ ៖ '%s' ក្នុង​ដ្រាយ​ '%s' ហើយ​សង្កត់​ចូល ។"
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "សូម​បញ្ចូល​ស្លាក​ឌីស​ ៖ '%s' ក្នុង​ដ្រាយ​ '%s' ហើយ​សង្កត់​ចូល ។"


@@ -2859,10 +2888,14 @@ msgstr "កំពុង​រៀបចំ​យក %s ចេញ​ទាំង
 msgid "Completely removed %s"
 msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង"
 
 msgid "Completely removed %s"
 msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 #, fuzzy
 msgid "Could not patch file"
 #: methods/rred.cc:219
 #, fuzzy
 msgid "Could not patch file"

diff --git a/po/ko.po b/po/ko.po
index 01fa29eab822718648f7f765573da348b7d2e5f8..c88a5e7ddf3ded37ded46730800e315d9e1ae3c3 100644 (file)
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2008-11-13 07:14+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
 "PO-Revision-Date: 2008-11-13 07:14+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"


@@ -154,7 +154,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s(%s), 컴파일 시각 %s %s\n"
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s(%s), 컴파일 시각 %s %s\n"


@@ -652,7 +652,7 @@ msgstr "%s 파일의 이름을 %s(으)로 바꾸는 데 실패했습니다"
 msgid "Y"
 msgstr "Y"
 
 msgid "Y"
 msgstr "Y"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "정규식 컴파일 오류 - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "정규식 컴파일 오류 - %s"


@@ -814,11 +814,11 @@ msgstr "패키지를 지워야 하지만 지우기가 금지되어 있습니다.
 msgid "Internal error, Ordering didn't finish"
 msgstr "내부 오류. 순서변경작업이 끝나지 않았습니다"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "내부 오류. 순서변경작업이 끝나지 않았습니다"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "다운로드 디렉토리를 잠글 수 없습니다"
 
 msgid "Unable to lock the download directory"
 msgstr "다운로드 디렉토리를 잠글 수 없습니다"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "소스 목록을 읽을 수 없습니다."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "소스 목록을 읽을 수 없습니다."


@@ -849,7 +849,7 @@ msgstr "이 작업 후 %s바이트의 디스크 공간을 더 사용하게 됩
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "이 작업 후 %s바이트의 디스크 공간이 비워집니다.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "이 작업 후 %s바이트의 디스크 공간이 비워집니다.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다"


@@ -889,7 +889,7 @@ msgstr "중단."
 msgid "Do you want to continue [Y/n]? "
 msgstr "계속 하시겠습니까 [Y/n]? "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "계속 하시겠습니까 [Y/n]? "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s 파일을 받는 데 실패했습니다  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s 파일을 받는 데 실패했습니다  %s\n"


@@ -898,7 +898,7 @@ msgstr "%s 파일을 받는 데 실패했습니다  %s\n"
 msgid "Some files failed to download"
 msgstr "일부 파일을 받는 데 실패했습니다"
 
 msgid "Some files failed to download"
 msgstr "일부 파일을 받는 데 실패했습니다"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "다운로드를 마쳤고 다운로드 전용 모드입니다"
 
 msgid "Download complete and in download only mode"
 msgstr "다운로드를 마쳤고 다운로드 전용 모드입니다"
 


@@ -996,29 +996,34 @@ msgstr "%2$s 패키지의 '%1$s' 버전을 찾을 수 없습니다"
 msgid "Selected version %s (%s) for %s\n"
 msgstr "%3$s 패키지의 %1$s (%2$s) 버전을 선택합니다\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "%3$s 패키지의 %1$s (%2$s) 버전을 선택합니다\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "update 명령은 인수를 받지 않습니다"
 
 msgid "The update command takes no arguments"
 msgstr "update 명령은 인수를 받지 않습니다"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "목록 디렉토리를 잠글 수 없습니다"
 
 msgid "Unable to lock the list directory"
 msgstr "목록 디렉토리를 잠글 수 없습니다"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "삭제를 할 수 없으므로 AutoRemover를 실행하지 못합니다"
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "삭제를 할 수 없으므로 AutoRemover를 실행하지 못합니다"
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "다음 새 패키지가 전에 자동으로 설치되었지만 더 이상 필요하지 않습니다:"
 
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "다음 새 패키지가 전에 자동으로 설치되었지만 더 이상 필요하지 않습니다:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "이들을 지우기 위해서는 'apt-get autoremove'를 사용하십시오."
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "이들을 지우기 위해서는 'apt-get autoremove'를 사용하십시오."
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1036,44 +1041,44 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다"
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "내부 오류, AllUpgrade 프로그램이 무언가를 망가뜨렸습니다"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "내부 오류, AllUpgrade 프로그램이 무언가를 망가뜨렸습니다"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr "%s 작업를 찾을 수 없습니다"
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "%s 작업를 찾을 수 없습니다"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "%s 패키지를 찾을 수 없습니다"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "%s 패키지를 찾을 수 없습니다"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "주의, 정규식 '%2$s'에 대하여 %1$s을(를) 선택합니다\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "주의, 정규식 '%2$s'에 대하여 %1$s을(를) 선택합니다\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s 패키지 수동설치로 지정합니다.\n"
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s 패키지 수동설치로 지정합니다.\n"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "다음을 바로잡으려면 `apt-get -f install'을 실행해 보십시오:"
 
 # FIXME: specify a solution?  무슨 솔루션?
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "다음을 바로잡으려면 `apt-get -f install'을 실행해 보십시오:"
 
 # FIXME: specify a solution?  무슨 솔루션?

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1081,7 +1086,7 @@ msgstr ""
 "의존성이 맞지 않습니다. 패키지 없이 'apt-get -f install'을 시도해 보십시오 "
 "(아니면 해결 방법을 지정하십시오)."
 
 "의존성이 맞지 않습니다. 패키지 없이 'apt-get -f install'을 시도해 보십시오 "
 "(아니면 해결 방법을 지정하십시오)."
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1092,115 +1097,115 @@ msgstr ""
 "불안정 배포판을 사용해서 일부 필요한 패키지를 아직 만들지 않았거나,\n"
 "아직 Incoming에서 나오지 않은 경우일 수도 있습니다."
 
 "불안정 배포판을 사용해서 일부 필요한 패키지를 아직 만들지 않았거나,\n"
 "아직 Incoming에서 나오지 않은 경우일 수도 있습니다."
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "망가진 패키지"
 
 msgid "Broken packages"
 msgstr "망가진 패키지"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "다음 패키지를 더 설치할 것입니다:"
 
 msgid "The following extra packages will be installed:"
 msgstr "다음 패키지를 더 설치할 것입니다:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "제안하는 패키지:"
 
 msgid "Suggested packages:"
 msgstr "제안하는 패키지:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "추천하는 패키지:"
 
 msgid "Recommended packages:"
 msgstr "추천하는 패키지:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "업그레이드를 계산하는 중입니다... "
 
 msgid "Calculating upgrade... "
 msgstr "업그레이드를 계산하는 중입니다... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "실패"
 
 msgid "Failed"
 msgstr "실패"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "완료"
 
 msgid "Done"
 msgstr "완료"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s의 소스 패키지를 찾을 수 없습니다"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s의 소스 패키지를 찾을 수 없습니다"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "%s에 충분한 공간이 없습니다"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "%s에 충분한 공간이 없습니다"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "%s 소스를 가져옵니다\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "%s 소스를 가져옵니다\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "일부 아카이브를 가져오는 데 실패했습니다."
 
 msgid "Failed to fetch some archives."
 msgstr "일부 아카이브를 가져오는 데 실패했습니다."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "압축 풀기 명령 '%s' 실패.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "압축 풀기 명령 '%s' 실패.\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "빌드 명령 '%s' 실패.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "빌드 명령 '%s' 실패.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "하위 프로세스가 실패했습니다"
 
 msgid "Child process failed"
 msgstr "하위 프로세스가 실패했습니다"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr "해당되는 빌드 의존성을 검사할 패키지를 최소한 하나 지정해야 합니다"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr "해당되는 빌드 의존성을 검사할 패키지를 최소한 하나 지정해야 합니다"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s 패키지에 빌드 의존성이 없습니다.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s 패키지에 빌드 의존성이 없습니다.\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "


@@ -1209,7 +1214,7 @@ msgstr ""
 "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니"
 "다"
 
 "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니"
 "다"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1218,32 +1223,33 @@ msgstr ""
 "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지의 사용 가능한 버"
 "전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다"
 
 "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지의 사용 가능한 버"
 "전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: 설치한 %3$s 패키지가 너"
 "무 최근 버전입니다"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: 설치한 %3$s 패키지가 너"
 "무 최근 버전입니다"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: %3$s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: %3$s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s의 빌드 의존성을 만족시키지 못했습니다."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s의 빌드 의존성을 만족시키지 못했습니다."
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "빌드 의존성을 처리하는 데 실패했습니다"
 
 msgid "Failed to process build dependencies"
 msgstr "빌드 의존성을 처리하는 데 실패했습니다"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "지원하는 모듈:"
 
 msgid "Supported modules:"
 msgstr "지원하는 모듈:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1259,7 +1265,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1855,7 +1861,7 @@ msgstr "데이터 소켓 연결 시간 초과"
 msgid "Unable to accept connection"
 msgstr "연결을 받을 수 없습니다"
 
 msgid "Unable to accept connection"
 msgstr "연결을 받을 수 없습니다"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "파일 해싱에 문제가 있습니다"
 
 msgid "Problem hashing file"
 msgstr "파일 해싱에 문제가 있습니다"
 


@@ -1939,40 +1945,40 @@ msgstr "'%s:%s'의 주소를 알아내는 데 무언가 이상한 일이 발생
 msgid "Unable to connect to %s %s:"
 msgstr "%s %s에 연결할 수 없습니다:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "%s %s에 연결할 수 없습니다:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "키링에 접근할 수 없습니다: '%s'"
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "키링에 접근할 수 없습니다: '%s'"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: Acquire::gpgv::Options의 인자 목록이 너무 깁니다. 끝냅니다."
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: Acquire::gpgv::Options의 인자 목록이 너무 깁니다. 끝냅니다."
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "내부 오류: 서명은 올바르지만 키 지문을 확인할 수 없습니다!"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "내부 오류: 서명은 올바르지만 키 지문을 확인할 수 없습니다!"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "최소한 하나 이상의 서명이 잘못되었습니다."
 
 msgid "At least one invalid signature was encountered."
 msgstr "최소한 하나 이상의 서명이 잘못되었습니다."
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "서명을 확인하는 '%s' 프로그램을 실행할 수 없습니다. (gnuv 프로그램을 설치했습"
 "니까?)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "서명을 확인하는 '%s' 프로그램을 실행할 수 없습니다. (gnuv 프로그램을 설치했습"
 "니까?)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "gpgv 실행 도중 알 수 없는 오류 발생"
 
 msgid "Unknown error executing gpgv"
 msgstr "gpgv 실행 도중 알 수 없는 오류 발생"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "다음 서명이 올바르지 않습니다:\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "다음 서명이 올바르지 않습니다:\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -1988,80 +1994,80 @@ msgstr "%s에 대한 파이프를 열 수 없습니다"
 msgid "Read error from %s process"
 msgstr "%s 프로세스에서 읽는 데 오류가 발생했습니다"
 
 msgid "Read error from %s process"
 msgstr "%s 프로세스에서 읽는 데 오류가 발생했습니다"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "헤더를 기다리는 중입니다"
 
 msgid "Waiting for headers"
 msgstr "헤더를 기다리는 중입니다"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "헤더 한 줄에 %u개가 넘는 문자가 들어 있습니다"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "헤더 한 줄에 %u개가 넘는 문자가 들어 있습니다"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "헤더 줄이 잘못되었습니다"
 
 msgid "Bad header line"
 msgstr "헤더 줄이 잘못되었습니다"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP 서버에서 잘못된 응답 헤더를 보냈습니다"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP 서버에서 잘못된 응답 헤더를 보냈습니다"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP 서버에서 잘못된 Content-Length 헤더를 보냈습니다"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP 서버에서 잘못된 Content-Length 헤더를 보냈습니다"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP 서버에서 잘못된 Content-Range 헤더를 보냈습니다"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP 서버에서 잘못된 Content-Range 헤더를 보냈습니다"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다"
 
 msgid "This HTTP server has broken range support"
 msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "데이터 형식을 알 수 없습니다"
 
 msgid "Unknown date format"
 msgstr "데이터 형식을 알 수 없습니다"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "select가 실패했습니다"
 
 msgid "Select failed"
 msgstr "select가 실패했습니다"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "연결 시간이 초과했습니다"
 
 msgid "Connection timed out"
 msgstr "연결 시간이 초과했습니다"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "출력 파일에 쓰는 데 오류가 발생했습니다"
 
 msgid "Error writing to output file"
 msgstr "출력 파일에 쓰는 데 오류가 발생했습니다"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "파일에 쓰는 데 오류가 발생했습니다"
 
 msgid "Error writing to file"
 msgstr "파일에 쓰는 데 오류가 발생했습니다"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "해당 파일에 쓰는 데 오류가 발생했습니다"
 
 msgid "Error writing to the file"
 msgstr "해당 파일에 쓰는 데 오류가 발생했습니다"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "서버에서 읽고 연결을 닫는 데 오류가 발생했습니다"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "서버에서 읽고 연결을 닫는 데 오류가 발생했습니다"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "서버에서 읽는 데 오류가 발생했습니다"
 
 msgid "Error reading from server"
 msgstr "서버에서 읽는 데 오류가 발생했습니다"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 msgid "Failed to truncate file"
 msgstr "파일을 자르는 데 실패했습니다"
 
 msgid "Failed to truncate file"
 msgstr "파일을 자르는 데 실패했습니다"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "헤더 데이터가 잘못되었습니다"
 
 msgid "Bad header data"
 msgstr "헤더 데이터가 잘못되었습니다"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "연결이 실패했습니다"
 
 msgid "Connection failed"
 msgstr "연결이 실패했습니다"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "내부 오류"
 
 msgid "Internal error"
 msgstr "내부 오류"
 


@@ -2081,7 +2087,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "선택한 %s이(가) 없습니다"
 #, c-format
 msgid "Selection %s not found"
 msgstr "선택한 %s이(가) 없습니다"


@@ -2508,7 +2538,7 @@ msgstr "설치 방법 드라이버 %s을(를) 찾을 수 없습니다."
 msgid "Method %s did not start correctly"
 msgstr "설치 방법 %s이(가) 올바르게 시작하지 않았습니다"
 
 msgid "Method %s did not start correctly"
 msgstr "설치 방법 %s이(가) 올바르게 시작하지 않았습니다"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""


@@ -2869,11 +2899,15 @@ msgstr "%s 패키지를 완전히 지울 준비를 하는 중입니다"
 msgid "Completely removed %s"
 msgstr "%s 패키지를 완전히 지웠습니다"
 
 msgid "Completely removed %s"
 msgstr "%s 패키지를 완전히 지웠습니다"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "로그에 쓰는데 실패. openpty() 실패(/dev/pts가 마운트되어있지 않습니까?)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "로그에 쓰는데 실패. openpty() 실패(/dev/pts가 마운트되어있지 않습니까?)\n"
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "%s 파일을 열 수 없습니다"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "%s 파일을 열 수 없습니다"

diff --git a/po/ku.po b/po/ku.po
index f3f2079ab60372f503bdc22cefac025f4f79c297..5568898fba95d9c3bf1530af1a4b3dc4345fd625 100644 (file)
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-ku\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt-ku\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2008-05-08 12:48+0200\n"
 "Last-Translator: Erdal Ronahi <erdal dot ronahi at gmail dot com>\n"
 "Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n"
 "PO-Revision-Date: 2008-05-08 12:48+0200\n"
 "Last-Translator: Erdal Ronahi <erdal dot ronahi at gmail dot com>\n"
 "Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n"


@@ -161,7 +161,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s ji bo %s %s komkirî di %s %s de\n"
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s ji bo %s %s komkirî di %s %s de\n"


@@ -571,7 +571,7 @@ msgstr ""
 msgid "Y"
 msgstr "E"
 
 msgid "Y"
 msgstr "E"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""


@@ -730,11 +730,11 @@ msgstr ""
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "Pelrêça daxistinê nayê quflekirin"
 
 msgid "Unable to lock the download directory"
 msgstr "Pelrêça daxistinê nayê quflekirin"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr ""
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr ""


@@ -763,7 +763,7 @@ msgstr ""
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nikarî cihê vala li %s tesbît bike"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nikarî cihê vala li %s tesbît bike"


@@ -797,7 +797,7 @@ msgstr "Betal."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Dixwazî bidomînî [E/n]?"
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "Dixwazî bidomînî [E/n]?"
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Anîna %s %s biserneket\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Anîna %s %s biserneket\n"


@@ -806,7 +806,7 @@ msgstr "Anîna %s %s biserneket\n"
 msgid "Some files failed to download"
 msgstr "Daxistina çend pelan biserneket"
 
 msgid "Some files failed to download"
 msgstr "Daxistina çend pelan biserneket"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr ""
 
 msgid "Download complete and in download only mode"
 msgstr ""
 


@@ -898,30 +898,35 @@ msgstr ""
 msgid "Selected version %s (%s) for %s\n"
 msgstr ""
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr ""
 
 msgid "The update command takes no arguments"
 msgstr ""
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr ""
 
 msgid "Unable to lock the list directory"
 msgstr ""
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Ev pakêtên NÛ dê werine sazkirin:"
 
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Ev pakêtên NÛ dê werine sazkirin:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -937,49 +942,49 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Peywira %s nehate dîtin"
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Peywira %s nehate dîtin"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nikarî pakêta %s bibîne"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nikarî pakêta %s bibîne"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "lê %s dê were sazkirin"
 
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "lê %s dê were sazkirin"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -987,152 +992,152 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
 "or been moved out of Incoming."
 msgstr ""
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "Paketên şikestî"
 
 msgid "Broken packages"
 msgstr "Paketên şikestî"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr ""
 
 msgid "The following extra packages will be installed:"
 msgstr ""
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "Paketên tên pêşniyaz kirin:"
 
 msgid "Suggested packages:"
 msgstr "Paketên tên pêşniyaz kirin:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "Paketên tên tawsiyê kirin:"
 
 msgid "Recommended packages:"
 msgstr "Paketên tên tawsiyê kirin:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "Bilindkirin tê hesibandin..."
 
 msgid "Calculating upgrade... "
 msgstr "Bilindkirin tê hesibandin..."
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "Serneket"
 
 msgid "Failed"
 msgstr "Serneket"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "Temam"
 
 msgid "Done"
 msgstr "Temam"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Cihê vala li %s têre nake"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Cihê vala li %s têre nake"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Çavkanîna %s bîne\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Çavkanîna %s bîne\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "Anîna çend arşîvan biserneket."
 
 msgid "Failed to fetch some archives."
 msgstr "Anîna çend arşîvan biserneket."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr ""
 
 msgid "Child process failed"
 msgstr ""
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
 
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr ""
 
 msgid "Failed to process build dependencies"
 msgstr ""
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr ""
 
 msgid "Supported modules:"
 msgstr ""
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1148,7 +1153,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1688,7 +1693,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
 msgid "Unable to accept connection"
 msgstr ""
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr ""
 
 msgid "Problem hashing file"
 msgstr ""
 


@@ -1773,39 +1778,39 @@ msgstr ""
 msgid "Unable to connect to %s %s:"
 msgstr "Nikare bi %s re girêdan pêk bîne %s:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "Nikare bi %s re girêdan pêk bîne %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr ""
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr ""
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr ""
 
 msgid "At least one invalid signature was encountered."
 msgstr ""
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "Di xebitandina gpgv de çewtiya nenas"
 
 msgid "Unknown error executing gpgv"
 msgstr "Di xebitandina gpgv de çewtiya nenas"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Ev pakêtên NÛ dê werine sazkirin:"
 
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Ev pakêtên NÛ dê werine sazkirin:"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -1821,82 +1826,82 @@ msgstr ""
 msgid "Read error from %s process"
 msgstr ""
 
 msgid "Read error from %s process"
 msgstr ""
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr ""
 
 msgid "Waiting for headers"
 msgstr ""
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr ""
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr ""
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr ""
 
 msgid "Bad header line"
 msgstr ""
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr ""
 
 msgid "This HTTP server has broken range support"
 msgstr ""
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr ""
 
 msgid "Unknown date format"
 msgstr ""
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "Hilbijartin neserketî"
 
 msgid "Select failed"
 msgstr "Hilbijartin neserketî"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr ""
 
 msgid "Connection timed out"
 msgstr ""
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 #, fuzzy
 msgid "Error writing to output file"
 msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî"
 
 #, fuzzy
 msgid "Error writing to output file"
 msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "Dema li pelî dihate nivîsîn çewtî"
 
 msgid "Error writing to file"
 msgstr "Dema li pelî dihate nivîsîn çewtî"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "Dema li pelî dihate nivîsîn çewtî"
 
 msgid "Error writing to the file"
 msgstr "Dema li pelî dihate nivîsîn çewtî"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr ""
 
 msgid "Error reading from server"
 msgstr ""
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Nivîsîna pelê %s biserneket"
 
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Nivîsîna pelê %s biserneket"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr ""
 
 msgid "Bad header data"
 msgstr ""
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "Girêdan pêk nehatiye"
 
 msgid "Connection failed"
 msgstr "Girêdan pêk nehatiye"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "Çewtiya hundirîn"
 
 msgid "Internal error"
 msgstr "Çewtiya hundirîn"
 


@@ -1916,7 +1921,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "Hilbijartina %s nehatiye dîtin"
 #, c-format
 msgid "Selection %s not found"
 msgstr "Hilbijartina %s nehatiye dîtin"


@@ -2335,7 +2364,7 @@ msgstr ""
 msgid "Method %s did not start correctly"
 msgstr ""
 
 msgid "Method %s did not start correctly"
 msgstr ""
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, fuzzy, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Dîsketê siwar bike û piştre bişkoja derbaskirinê bitikîne"
 #, fuzzy, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Dîsketê siwar bike û piştre bişkoja derbaskirinê bitikîne"


@@ -2688,10 +2717,14 @@ msgstr "Bi tevahî rakirina %s tê amadekirin"
 msgid "Completely removed %s"
 msgstr "%s bi tevahî hatine rakirin"
 
 msgid "Completely removed %s"
 msgstr "%s bi tevahî hatine rakirin"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 #, fuzzy
 msgid "Could not patch file"
 #: methods/rred.cc:219
 #, fuzzy
 msgid "Could not patch file"

diff --git a/po/mr.po b/po/mr.po
index 39d6971fc242a0e48f11dbb3e6f090ad80d02979..7b490dca941b1a899335c9949573f82cc50bb475 100644 (file)
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2008-11-20 23:27+0530\n"
 "Last-Translator: Sampada <sampadanakhare@gmail.com>\n"
 "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India "
 "PO-Revision-Date: 2008-11-20 23:27+0530\n"
 "Last-Translator: Sampada <sampadanakhare@gmail.com>\n"
 "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India "


@@ -156,7 +156,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s हे %s करिता %s %s वर संग्रहित\n"
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s हे %s करिता %s %s वर संग्रहित\n"


@@ -652,7 +652,7 @@ msgstr "%s ला पुनर्नामांकन %s करण्यास
 msgid "Y"
 msgstr "होय"
 
 msgid "Y"
 msgstr "होय"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "रिजेक्स कंपायलेशन त्रुटी -%s "
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "रिजेक्स कंपायलेशन त्रुटी -%s "


@@ -813,11 +813,11 @@ msgstr "पॅकेजेस कायमची काढायची आहे
 msgid "Internal error, Ordering didn't finish"
 msgstr "अंतर्गत त्रुटी,क्रम अजून संपला नाही"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "अंतर्गत त्रुटी,क्रम अजून संपला नाही"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "डाऊनलोड डिरेक्टरी कुलूपबंद करण्यास असमर्थ"
 
 msgid "Unable to lock the download directory"
 msgstr "डाऊनलोड डिरेक्टरी कुलूपबंद करण्यास असमर्थ"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "उगमांच्या याद्या वाचता येणार नाहीत."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "उगमांच्या याद्या वाचता येणार नाहीत."


@@ -846,7 +846,7 @@ msgstr "या क्रियेनंतर, %sB एवढी अधिक ड
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "या क्रियेनंतर, %sB डिस्क जागा मोकळी होईल.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "या क्रियेनंतर, %sB डिस्क जागा मोकळी होईल.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s मध्ये रिकामी जागा सांगू शकत नाही"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s मध्ये रिकामी जागा सांगू शकत नाही"


@@ -883,7 +883,7 @@ msgstr "व्यत्यय/बंद करा."
 msgid "Do you want to continue [Y/n]? "
 msgstr "तुम्हाला पुढे जायचे आहे [Y/n]? "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "तुम्हाला पुढे जायचे आहे [Y/n]? "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s  %s आणणे असफल\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s  %s आणणे असफल\n"


@@ -892,7 +892,7 @@ msgstr "%s  %s आणणे असफल\n"
 msgid "Some files failed to download"
 msgstr "काही संचिका डाऊनलोड करण्यास असमर्थ"
 
 msgid "Some files failed to download"
 msgstr "काही संचिका डाऊनलोड करण्यास असमर्थ"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "डाऊनलोड संपूर्ण आणि डाऊनलोड मध्ये फक्त पद्धती"
 
 msgid "Download complete and in download only mode"
 msgstr "डाऊनलोड संपूर्ण आणि डाऊनलोड मध्ये फक्त पद्धती"
 


@@ -990,29 +990,34 @@ msgstr "'%s' साठी '%s' आवृत्ती सापडली ना
 msgid "Selected version %s (%s) for %s\n"
 msgstr "%s साठी %s (%s) निवडलेली आवृत्ती.\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "%s साठी %s (%s) निवडलेली आवृत्ती.\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "सुधारित आवृत्तीचा विधान आर्ग्युमेंटस घेऊ    शकत नाही."
 
 msgid "The update command takes no arguments"
 msgstr "सुधारित आवृत्तीचा विधान आर्ग्युमेंटस घेऊ    शकत नाही."
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "संचयिका यादीला कुलुप लावण्यात असमर्थ"
 
 msgid "Unable to lock the list directory"
 msgstr "संचयिका यादीला कुलुप लावण्यात असमर्थ"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "आपण या गोष्टी काढून टाकता नये, ऑटोरिमूव्हर सुरू करता येत नाही"
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "आपण या गोष्टी काढून टाकता नये, ऑटोरिमूव्हर सुरू करता येत नाही"
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
 
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "ती काढून टाकण्यासाठी 'apt-get autoremove' वापरा."
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "ती काढून टाकण्यासाठी 'apt-get autoremove' वापरा."
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1030,45 +1035,45 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "खालील माहिती परिस्थिती निवळण्यासाठी मदत ठरू शकेल:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "खालील माहिती परिस्थिती निवळण्यासाठी मदत ठरू शकेल:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "अंतर्गत त्रुटी, AutoRemoverने स्टफला तोडले"
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "अंतर्गत त्रुटी, AutoRemoverने स्टफला तोडले"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "अंतर्गत त्रुटी,ऑलअपग्रेडने स्टफला तोडले"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "अंतर्गत त्रुटी,ऑलअपग्रेडने स्टफला तोडले"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr "%s कार्य सापडू शकले नाही"
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "%s कार्य सापडू शकले नाही"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "%s पॅकेज सापडू शकले नाही"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "%s पॅकेज सापडू शकले नाही"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "सूचना, '%s' रिजेक्स साठी %s ची निवड करत आहे\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "सूचना, '%s' रिजेक्स साठी %s ची निवड करत आहे\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s  स्वहस्ते संस्थापित करायचे आहे.\n"
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s  स्वहस्ते संस्थापित करायचे आहे.\n"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 "तुम्हाला कदाचित `apt-get -f install'(एपीटी-गेट -एफ संस्थापन') प्रोग्राम चालू करावा "
 "लागेल'यात बदल करण्यासाठी:"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 "तुम्हाला कदाचित `apt-get -f install'(एपीटी-गेट -एफ संस्थापन') प्रोग्राम चालू करावा "
 "लागेल'यात बदल करण्यासाठी:"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1076,7 +1081,7 @@ msgstr ""
 "अनमेट डिपेंडन्सीज.एपीटी-गेट -एफ संस्थापन (`apt-get -f install') पॅकेजशिवाय प्रयत्न करा "
 "(किंवा पर्याय सांगा)."
 
 "अनमेट डिपेंडन्सीज.एपीटी-गेट -एफ संस्थापन (`apt-get -f install') पॅकेजशिवाय प्रयत्न करा "
 "(किंवा पर्याय सांगा)."
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1088,122 +1093,122 @@ msgstr ""
 "विभागणी असणारी पण हवी असणारी, तयार केली नसलेली पॅकेजेस वापरत असाल \n"
 "किंवा ती येणाऱ्यांपैकी बाहेर हलविली असतील."
 
 "विभागणी असणारी पण हवी असणारी, तयार केली नसलेली पॅकेजेस वापरत असाल \n"
 "किंवा ती येणाऱ्यांपैकी बाहेर हलविली असतील."
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "तुटलेली पॅकेजेस"
 
 msgid "Broken packages"
 msgstr "तुटलेली पॅकेजेस"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "खालील अतिरिक्त पॅकेजेस संस्थापित होतील:"
 
 msgid "The following extra packages will be installed:"
 msgstr "खालील अतिरिक्त पॅकेजेस संस्थापित होतील:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "सुचवलेली पॅकेजेस:"
 
 msgid "Suggested packages:"
 msgstr "सुचवलेली पॅकेजेस:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "शिफारस केलेली पॅकेजेस:"
 
 msgid "Recommended packages:"
 msgstr "शिफारस केलेली पॅकेजेस:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "पुढिल आवृत्तीची गणती करीत आहे..."
 
 msgid "Calculating upgrade... "
 msgstr "पुढिल आवृत्तीची गणती करीत आहे..."
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "असमर्थ"
 
 msgid "Failed"
 msgstr "असमर्थ"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "झाले"
 
 msgid "Done"
 msgstr "झाले"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr "अंतर्गत त्रुटी, अडचण निवारकाने स्टफला तोडले"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "अंतर्गत त्रुटी, अडचण निवारकाने स्टफला तोडले"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s उगम पॅकेज शोधणे शक्य नाही/शोधण्यास असमर्थ आहे"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s उगम पॅकेज शोधणे शक्य नाही/शोधण्यास असमर्थ आहे"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "आधीच डाऊनलोड केलेली '%s' फाईल सोडून द्या\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "आधीच डाऊनलोड केलेली '%s' फाईल सोडून द्या\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "%s मध्ये पुरेशी जागा नाही"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "%s मध्ये पुरेशी जागा नाही"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "उगम अर्काईव्हज चा %sB/%sB घेण्याची गरज आहे.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "उगम अर्काईव्हज चा %sB/%sB घेण्याची गरज आहे.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "उगम अर्काईव्हजचा %sB घेण्याची गरज आहे.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "उगम अर्काईव्हजचा %sB घेण्याची गरज आहे.\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "%s उगम घ्या\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "%s उगम घ्या\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "काही अर्काईव्हज आणण्यास असमर्थ."
 
 msgid "Failed to fetch some archives."
 msgstr "काही अर्काईव्हज आणण्यास असमर्थ."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "%s मध्ये आधीच उघडलेल्या उगमातील उघडलेल्याला सोडून द्या किंवा वगळा\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "%s मध्ये आधीच उघडलेल्या उगमातील उघडलेल्याला सोडून द्या किंवा वगळा\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "'%s' आज्ञा सुट्या करण्यास असमर्थ.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "'%s' आज्ञा सुट्या करण्यास असमर्थ.\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "बांधणी करणाऱ्या आज्ञा '%s' अयशस्वी.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "बांधणी करणाऱ्या आज्ञा '%s' अयशस्वी.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "चाईल्ड प्रक्रिया अयशस्वी"
 
 msgid "Child process failed"
 msgstr "चाईल्ड प्रक्रिया अयशस्वी"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr "बिल्डेपस् कशासाठी ते पडताळण्यासाठी किमान एक पॅकेज सांगणे गरजेचे आहे"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr "बिल्डेपस् कशासाठी ते पडताळण्यासाठी किमान एक पॅकेज सांगणे गरजेचे आहे"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s साठी बांधणी डिपेंडन्सी माहिती मिळवण्यास असमर्थ"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s साठी बांधणी डिपेंडन्सी माहिती मिळवण्यास असमर्थ"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ला बांधणी डिपेंडन्स नाहीत.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ला बांधणी डिपेंडन्स नाहीत.\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही"
 
 #, 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:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1212,30 +1217,31 @@ msgstr ""
 "आवृतीची मागणी पूर्ण करण्यासाठी %s पॅकेजची आवृत्ती उपलब्ध नाही,त्यामुळे %s साठी %s "
 "डिपेंडन्सी पूर्ण होऊ शकत नाही"
 
 "आवृतीची मागणी पूर्ण करण्यासाठी %s पॅकेजची आवृत्ती उपलब्ध नाही,त्यामुळे %s साठी %s "
 "डिपेंडन्सी पूर्ण होऊ शकत नाही"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "%s अवलंबित्व %s साठी पूर्ण होण्यास असमर्थ: संस्थापित पॅकेज %s खूपच नवीन आहे"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "%s अवलंबित्व %s साठी पूर्ण होण्यास असमर्थ: संस्थापित पॅकेज %s खूपच नवीन आहे"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s साठी %s डिपेंडन्सी पूर्ण होण्यास असमर्थ: %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s साठी %s डिपेंडन्सी पूर्ण होण्यास असमर्थ: %s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s साठी बांधणी-डिपेंडन्सीज पूर्ण होऊ शकत नाही."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s साठी बांधणी-डिपेंडन्सीज पूर्ण होऊ शकत नाही."
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ "
 
 msgid "Failed to process build dependencies"
 msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ "
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:"
 
 msgid "Supported modules:"
 msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1251,7 +1257,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1848,7 +1854,7 @@ msgstr "डेटा सॉकेट जोडणी वेळेअभावी
 msgid "Unable to accept connection"
 msgstr "जोडणी स्विकारण्यास असमर्थ"
 
 msgid "Unable to accept connection"
 msgstr "जोडणी स्विकारण्यास असमर्थ"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "फाईल हॅश करण्यात त्रुटी"
 
 msgid "Problem hashing file"
 msgstr "फाईल हॅश करण्यात त्रुटी"
 


@@ -1932,40 +1938,40 @@ msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना क
 msgid "Unable to connect to %s %s:"
 msgstr "%s %s ला जोडण्यास असमर्थ:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "%s %s ला जोडण्यास असमर्थ:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "'%s': कीरिंग पर्यंत पोहोचू शकत नाही"
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "'%s': कीरिंग पर्यंत पोहोचू शकत नाही"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "दोष: ::gpgv:: कडून प्राप्त झालेला ऑर्गुमेंट सूचीचा पर्याय खूप लांबीचा. बाहेर पडत आहे."
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "दोष: ::gpgv:: कडून प्राप्त झालेला ऑर्गुमेंट सूचीचा पर्याय खूप लांबीचा. बाहेर पडत आहे."
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "अंतर्गत त्रुटी: चांगली सही, पण की ठसे सांगू शकत नाही?!"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "अंतर्गत त्रुटी: चांगली सही, पण की ठसे सांगू शकत नाही?!"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "किमान एक अवैध सही सापडली."
 
 msgid "At least one invalid signature was encountered."
 msgstr "किमान एक अवैध सही सापडली."
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "सहीची खात्री करण्यासाठी '%s' कार्यान्वित करू शकत नाही (gpgv संस्थापित केले आहे का?)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "सहीची खात्री करण्यासाठी '%s' कार्यान्वित करू शकत नाही (gpgv संस्थापित केले आहे का?)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "gpgv कार्यान्वित होत असताना अपरिचित त्रुटी"
 
 msgid "Unknown error executing gpgv"
 msgstr "gpgv कार्यान्वित होत असताना अपरिचित त्रुटी"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "खालील सह्या अवैध आहेत:\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "खालील सह्या अवैध आहेत:\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -1981,80 +1987,80 @@ msgstr "%s साठी पाईप उघडता येत नाही"
 msgid "Read error from %s process"
 msgstr "%s क्रियेपासून चूक वाचा"
 
 msgid "Read error from %s process"
 msgstr "%s क्रियेपासून चूक वाचा"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "शीर्षकासाठी थांबले आहे...."
 
 msgid "Waiting for headers"
 msgstr "शीर्षकासाठी थांबले आहे...."
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "%u अक्षरांवर एक शीर्षक ओळ मिळाली"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "%u अक्षरांवर एक शीर्षक ओळ मिळाली"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "वाईट शीर्षक ओळ"
 
 msgid "Bad header line"
 msgstr "वाईट शीर्षक ओळ"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP सर्व्हरने अवैध प्रत्त्युत्तर शीर्षक पाठविले"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP सर्व्हरने अवैध प्रत्त्युत्तर शीर्षक पाठविले"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP सर्व्हरने अवैध मजकूर-लांबी शीर्षक पाठविले "
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP सर्व्हरने अवैध मजकूर-लांबी शीर्षक पाठविले "
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP सर्व्हरने अवैध मजकूर-विस्तार शीर्षक पाठविले"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP सर्व्हरने अवैध मजकूर-विस्तार शीर्षक पाठविले"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "HTTP सर्व्हरने विस्तार तांत्रिक मदत जोडली"
 
 msgid "This HTTP server has broken range support"
 msgstr "HTTP सर्व्हरने विस्तार तांत्रिक मदत जोडली"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "अपरिचित दिनांक प्रकार/स्वरूप "
 
 msgid "Unknown date format"
 msgstr "अपरिचित दिनांक प्रकार/स्वरूप "
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "चुकले/असमर्थ निवड करा"
 
 msgid "Select failed"
 msgstr "चुकले/असमर्थ निवड करा"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "जोडणी वेळेअभावी तुटली"
 
 msgid "Connection timed out"
 msgstr "जोडणी वेळेअभावी तुटली"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "निर्गत फाईल मध्ये लिहिताना त्रुटी/चूक"
 
 msgid "Error writing to output file"
 msgstr "निर्गत फाईल मध्ये लिहिताना त्रुटी/चूक"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी"
 
 msgid "Error writing to file"
 msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी"
 
 msgid "Error writing to the file"
 msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "सर्व्हर मधून वाचण्यात चूक. लांब शेवट आणि बंद झालेली जोडणी"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "सर्व्हर मधून वाचण्यात चूक. लांब शेवट आणि बंद झालेली जोडणी"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "सर्व्हर मधून वाचण्यात चूक"
 
 msgid "Error reading from server"
 msgstr "सर्व्हर मधून वाचण्यात चूक"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 msgid "Failed to truncate file"
 msgstr "फाईल छोटी करणे असफल"
 
 msgid "Failed to truncate file"
 msgstr "फाईल छोटी करणे असफल"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "चुकीचा शीर्षक डाटा"
 
 msgid "Bad header data"
 msgstr "चुकीचा शीर्षक डाटा"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "जोडणी अयशस्वी"
 
 msgid "Connection failed"
 msgstr "जोडणी अयशस्वी"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "अंतर्गत त्रुटी"
 
 msgid "Internal error"
 msgstr "अंतर्गत त्रुटी"
 


@@ -2074,7 +2080,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "%s निवडक भाग सापडत नाही"
 #, c-format
 msgid "Selection %s not found"
 msgstr "%s निवडक भाग सापडत नाही"


@@ -2501,7 +2531,7 @@ msgstr "%s कार्यपध्दतीचा ड्राइव्हर 
 msgid "Method %s did not start correctly"
 msgstr "%s कार्यपध्दती योग्य रीतीने सुरु झालेली नाही"
 
 msgid "Method %s did not start correctly"
 msgstr "%s कार्यपध्दती योग्य रीतीने सुरु झालेली नाही"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "कृपया '%s' लेबल असलेली डिस्क '%s' या ड्राइव्हमध्ये ठेवा आणि एन्टर कळ दाबा."
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "कृपया '%s' लेबल असलेली डिस्क '%s' या ड्राइव्हमध्ये ठेवा आणि एन्टर कळ दाबा."


@@ -2869,10 +2899,14 @@ msgstr "%s संपूर्ण काढून टाकण्याची त
 msgid "Completely removed %s"
 msgstr "%s संपूर्ण काढून टाकले"
 
 msgid "Completely removed %s"
 msgstr "%s संपूर्ण काढून टाकले"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "सत्रनोंद लिहिता येत नाही, openpty() असफल (/dev/pts आरोहित नाही?)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "सत्रनोंद लिहिता येत नाही, openpty() असफल (/dev/pts आरोहित नाही?)\n"
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "फाईल पॅच करता आली नाही"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "फाईल पॅच करता आली नाही"

diff --git a/po/nb.po b/po/nb.po
index da541c694e18d1f7a7557edd85241b1da81e679c..da7b86b382c1bea89668ad2db79798ca020315ba 100644 (file)
--- a/po/nb.po
+++ b/po/nb.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2009-02-01 18:26+0100\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.ui.no>\n"
 "PO-Revision-Date: 2009-02-01 18:26+0100\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.ui.no>\n"


@@ -164,7 +164,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s kompilert på %s %s\n"
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s kompilert på %s %s\n"


@@ -662,7 +662,7 @@ msgstr "Klarte ikke 
 msgid "Y"
 msgstr "J"
 
 msgid "Y"
 msgstr "J"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Kompileringsfeil i regulært uttrykk - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Kompileringsfeil i regulært uttrykk - %s"


@@ -823,11 +823,11 @@ msgstr "Pakker trenges 
 msgid "Internal error, Ordering didn't finish"
 msgstr "Intern feil, sortering fullførte ikke"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "Intern feil, sortering fullførte ikke"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "Klarer ikke å låse nedlastingsmappa"
 
 msgid "Unable to lock the download directory"
 msgstr "Klarer ikke å låse nedlastingsmappa"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Kan ikke lese kildlista."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Kan ikke lese kildlista."


@@ -858,7 +858,7 @@ msgstr "Etter denne operasjonen vil %sB ekstra diskplass bli brukt.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Etter denne operasjonen vil %sB diskplass bli ledig.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Etter denne operasjonen vil %sB diskplass bli ledig.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Klarte ikke bestemme ledig plass i %s"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Klarte ikke bestemme ledig plass i %s"


@@ -896,7 +896,7 @@ msgstr "Avbryter."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vil du fortsette [Y/n]? "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vil du fortsette [Y/n]? "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Klarte ikke å skaffe %s  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Klarte ikke å skaffe %s  %s\n"


@@ -905,7 +905,7 @@ msgstr "Klarte ikke 
 msgid "Some files failed to download"
 msgstr "Noen av filene kunne ikke lastes ned"
 
 msgid "Some files failed to download"
 msgstr "Noen av filene kunne ikke lastes ned"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "Nedlasting fullført med innstillinga «bare nedlasting»"
 
 msgid "Download complete and in download only mode"
 msgstr "Nedlasting fullført med innstillinga «bare nedlasting»"
 


@@ -1003,29 +1003,34 @@ msgstr "Versjon 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Utvalgt versjon %s (%s) for %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Utvalgt versjon %s (%s) for %s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "Oppdaterings-kommandoen tar ingen argumenter"
 
 msgid "The update command takes no arguments"
 msgstr "Oppdaterings-kommandoen tar ingen argumenter"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "Kan ikke låse listemappa"
 
 msgid "Unable to lock the list directory"
 msgstr "Kan ikke låse listemappa"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Vi skal ikke slette ting, kan ikke starte auto-fjerner (AutoRemover)"
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Vi skal ikke slette ting, kan ikke starte auto-fjerner (AutoRemover)"
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Følgende pakker ble automatisk installert og er ikke lenger påkrevet:"
 
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Følgende pakker ble automatisk installert og er ikke lenger påkrevet:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Bruk «apt-get autoremove» for å fjerne dem."
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Bruk «apt-get autoremove» for å fjerne dem."
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1043,43 +1048,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "Følgende informasjon kan være til hjelp med å løse problemet:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "Følgende informasjon kan være til hjelp med å løse problemet:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Intern feil, autofjerneren (AutoRemover) ødela noe"
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Intern feil, autofjerneren (AutoRemover) ødela noe"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Intern feil - «AllUpgrade» ødela noe"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Intern feil - «AllUpgrade» ødela noe"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Klarte ikke å finne oppgave %s"
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Klarte ikke å finne oppgave %s"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Klarte ikke å finne pakken %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Klarte ikke å finne pakken %s"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Merk, velger %s istedenfor det regulære uttrykket «%s»\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Merk, velger %s istedenfor det regulære uttrykket «%s»\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s satt til manuell installasjon.\n"
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s satt til manuell installasjon.\n"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Du vil kanskje utføre «apt-get -f install» for å rette på disse:"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Du vil kanskje utføre «apt-get -f install» for å rette på disse:"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1087,7 +1092,7 @@ msgstr ""
 "Uinnfridde avhengighetsforhold. Prøv «apt-get -f install» uten pakker (eller "
 "angi en løsning)."
 
 "Uinnfridde avhengighetsforhold. Prøv «apt-get -f install» uten pakker (eller "
 "angi en løsning)."
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1099,122 +1104,122 @@ msgstr ""
 "at visse kjernepakker ennå ikke er laget eller flyttet ut av «Incoming» for\n"
 "distribusjonen."
 
 "at visse kjernepakker ennå ikke er laget eller flyttet ut av «Incoming» for\n"
 "distribusjonen."
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "Ødelagte pakker"
 
 msgid "Broken packages"
 msgstr "Ødelagte pakker"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "Følgende ekstra pakker vil bli installert."
 
 msgid "The following extra packages will be installed:"
 msgstr "Følgende ekstra pakker vil bli installert."
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "Foreslåtte pakker:"
 
 msgid "Suggested packages:"
 msgstr "Foreslåtte pakker:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "Anbefalte pakker"
 
 msgid "Recommended packages:"
 msgstr "Anbefalte pakker"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "Beregner oppgradering... "
 
 msgid "Calculating upgrade... "
 msgstr "Beregner oppgradering... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "Mislyktes"
 
 msgid "Failed"
 msgstr "Mislyktes"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "Utført"
 
 msgid "Done"
 msgstr "Utført"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern feil, problemløser ødela noe"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern feil, problemløser ødela noe"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr "Du må angi minst en pakke du vil ha kildekoden til"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "Du må angi minst en pakke du vil ha kildekoden til"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Klarer ikke å finne en kildekodepakke for %s"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Klarer ikke å finne en kildekodepakke for %s"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Hopper over allerede nedlastet fil «%s»\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Hopper over allerede nedlastet fil «%s»\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Du har ikke nok ledig plass i %s"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Du har ikke nok ledig plass i %s"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Trenger å skaffe %sB av %sB fra kildekodearkivet.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Trenger å skaffe %sB av %sB fra kildekodearkivet.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Trenger å skaffe %sB fra kildekodearkivet.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Trenger å skaffe %sB fra kildekodearkivet.\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Skaffer kildekode %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Skaffer kildekode %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "Klarte ikke å skaffe alle arkivene."
 
 msgid "Failed to fetch some archives."
 msgstr "Klarte ikke å skaffe alle arkivene."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Omgår utpakking av allerede utpakket kilde i %s\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Omgår utpakking av allerede utpakket kilde i %s\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Utpakkingskommandoen «%s» mislyktes.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Utpakkingskommandoen «%s» mislyktes.\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Sjekk om pakken «dpkg-dev» er installert.\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Sjekk om pakken «dpkg-dev» er installert.\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggekommandoen «%s» mislyktes.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggekommandoen «%s» mislyktes.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "Barneprosessen mislyktes"
 
 msgid "Child process failed"
 msgstr "Barneprosessen mislyktes"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr "Du må angi minst en pakke du vil sjekke «builddeps» for"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr "Du må angi minst en pakke du vil sjekke «builddeps» for"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Klarer ikke å skaffe informasjon om bygge-avhengighetene for %s"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Klarer ikke å skaffe informasjon om bygge-avhengighetene for %s"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen avhengigheter.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen avhengigheter.\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
 
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1223,32 +1228,33 @@ msgstr ""
 "Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige "
 "versjoner av pakken %s som oppfyller versjonskravene"
 
 "Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige "
 "versjoner av pakken %s som oppfyller versjonskravene"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Klarte ikke å tilfredsstille %s avhengighet for %s: den installerte pakken %"
 "s er for ny"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Klarte ikke å tilfredsstille %s avhengighet for %s: den installerte pakken %"
 "s er for ny"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s."
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "Klarte ikke å behandle forutsetningene for bygging"
 
 msgid "Failed to process build dependencies"
 msgstr "Klarte ikke å behandle forutsetningene for bygging"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "Støttede moduler:"
 
 msgid "Supported modules:"
 msgstr "Støttede moduler:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1264,7 +1270,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1868,7 +1874,7 @@ msgstr "Tidsavbrudd p
 msgid "Unable to accept connection"
 msgstr "Klarte ikke å godta tilkoblingen"
 
 msgid "Unable to accept connection"
 msgstr "Klarte ikke å godta tilkoblingen"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "Problem ved oppretting av nøkkel for fil"
 
 msgid "Problem hashing file"
 msgstr "Problem ved oppretting av nøkkel for fil"
 


@@ -1952,39 +1958,39 @@ msgstr "Noe galt skjedde ved oppslag av 
 msgid "Unable to connect to %s %s:"
 msgstr "Klarte ikke å koble til %s %s:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "Klarte ikke å koble til %s %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Klarte ikke å slå opp i nøkkelring; «%s»"
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Klarte ikke å slå opp i nøkkelring; «%s»"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: Argumentliste fra Acquire::gpgv::Options for lang. Avbryter."
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: Argumentliste fra Acquire::gpgv::Options for lang. Avbryter."
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "Intern feil: God signatur, men kunne bestemme nøkkelfingeravtrykk?!"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "Intern feil: God signatur, men kunne bestemme nøkkelfingeravtrykk?!"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "Minst en ugyldig signatur ble funnet."
 
 msgid "At least one invalid signature was encountered."
 msgstr "Minst en ugyldig signatur ble funnet."
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Klarte ikke kjøre «%s» for å verifisere signaturen (er gpgv installert?)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Klarte ikke kjøre «%s» for å verifisere signaturen (er gpgv installert?)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "Ukjent feil ved kjøring av gpgv"
 
 msgid "Unknown error executing gpgv"
 msgstr "Ukjent feil ved kjøring av gpgv"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "De følgende signaturene var ugyldige:\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "De følgende signaturene var ugyldige:\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -2002,80 +2008,80 @@ msgstr "Klarte ikke 
 msgid "Read error from %s process"
 msgstr "Lesefeil fra %s-prosessen"
 
 msgid "Read error from %s process"
 msgstr "Lesefeil fra %s-prosessen"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "Venter på hoder"
 
 msgid "Waiting for headers"
 msgstr "Venter på hoder"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Fikk en enkel hodelinje over %u tegn"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Fikk en enkel hodelinje over %u tegn"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "Ødelagt hodelinje"
 
 msgid "Bad header line"
 msgstr "Ødelagt hodelinje"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP-tjeneren sendte et ugyldig svarhode"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP-tjeneren sendte et ugyldig svarhode"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP-tjeneren sendte et ugyldig «Content-Length»-hode"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP-tjeneren sendte et ugyldig «Content-Length»-hode"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP-tjeneren sendte et ugyldig «Content-Range»-hode"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP-tjeneren sendte et ugyldig «Content-Range»-hode"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "Denne HTTP-tjeneren har ødelagt støtte for område"
 
 msgid "This HTTP server has broken range support"
 msgstr "Denne HTTP-tjeneren har ødelagt støtte for område"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "Ukjent datoformat"
 
 msgid "Unknown date format"
 msgstr "Ukjent datoformat"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "Utvalget mislykkes"
 
 msgid "Select failed"
 msgstr "Utvalget mislykkes"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "Tidsavbrudd på forbindelsen"
 
 msgid "Connection timed out"
 msgstr "Tidsavbrudd på forbindelsen"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "Feil ved skriving til utfil"
 
 msgid "Error writing to output file"
 msgstr "Feil ved skriving til utfil"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "Feil ved skriving til fil"
 
 msgid "Error writing to file"
 msgstr "Feil ved skriving til fil"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "Feil ved skriving til fila"
 
 msgid "Error writing to the file"
 msgstr "Feil ved skriving til fila"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "Feil ved lesing fra tjeneren"
 
 msgid "Error reading from server"
 msgstr "Feil ved lesing fra tjeneren"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 msgid "Failed to truncate file"
 msgstr "Klarte ikke forkorte fila %s"
 
 msgid "Failed to truncate file"
 msgstr "Klarte ikke forkorte fila %s"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "Ødelagte hodedata"
 
 msgid "Bad header data"
 msgstr "Ødelagte hodedata"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "Forbindelsen mislykkes"
 
 msgid "Connection failed"
 msgstr "Forbindelsen mislykkes"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "Intern feil"
 
 msgid "Internal error"
 msgstr "Intern feil"
 


@@ -2097,7 +2103,31 @@ msgstr ""
 "Dynamisk MMap gikk tom for minne. Øk størrelsen på APT::Cache-Limit. "
 "Nåværende verdi: %lu. (man 5 apt.conf)"
 
 "Dynamisk MMap gikk tom for minne. Øk størrelsen på APT::Cache-Limit. "
 "Nåværende verdi: %lu. (man 5 apt.conf)"
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "Fant ikke utvalget %s"
 #, c-format
 msgid "Selection %s not found"
 msgstr "Fant ikke utvalget %s"


@@ -2524,7 +2554,7 @@ msgstr "Finner ikke metode-driveren %s."
 msgid "Method %s did not start correctly"
 msgstr "Metoden %s startet ikke korrekt"
 
 msgid "Method %s did not start correctly"
 msgstr "Metoden %s startet ikke korrekt"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Sett inn disken merket «%s» i lagringsenheten «%s» og trykk Enter."
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Sett inn disken merket «%s» i lagringsenheten «%s» og trykk Enter."


@@ -2888,10 +2918,14 @@ msgstr "Forbereder 
 msgid "Completely removed %s"
 msgstr "Fjernet %s fullstendig"
 
 msgid "Completely removed %s"
 msgstr "Fjernet %s fullstendig"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Klarte ikke skrive logg, openpty() feilet (/dev/pts ikke montert?)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Klarte ikke skrive logg, openpty() feilet (/dev/pts ikke montert?)\n"
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Kunne ikke åpne fila %s"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Kunne ikke åpne fila %s"

diff --git a/po/ne.po b/po/ne.po
index daa81381f582b19a08d271bab8109155910913e7..16afad6516a0fb938d9d194d0ecd74eedffc4c4c 100644 (file)
--- a/po/ne.po
+++ b/po/ne.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt_po\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12: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"
 "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"


@@ -159,7 +159,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s को लागि %s %s, %s %s मा कम्पाएल गरिएको छ\n"
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s को लागि %s %s, %s %s मा कम्पाएल गरिएको छ\n"


@@ -657,7 +657,7 @@ msgstr " %s मा  %s  पुन:नामकरण असफल भयो"
 msgid "Y"
 msgstr "Y"
 
 msgid "Y"
 msgstr "Y"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s"


@@ -818,11 +818,11 @@ msgstr "प्याकेजहरू हट्न चाहदैछन् त
 msgid "Internal error, Ordering didn't finish"
 msgstr "आन्तरिक त्रुटि, आदेश समाप्त भएको छैन"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "आन्तरिक त्रुटि, आदेश समाप्त भएको छैन"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "डाउनलोड डाइरेक्ट्री ताल्चा मार्न असक्षम"
 
 msgid "Unable to lock the download directory"
 msgstr "डाउनलोड डाइरेक्ट्री ताल्चा मार्न असक्षम"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "स्रोतहरुको सूचि पढ्न सकिएन ।"
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "स्रोतहरुको सूचि पढ्न सकिएन ।"


@@ -851,7 +851,7 @@ msgstr "अनप्याक गरिसके पछि थप डिस्
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "%sB अनप्याक गरिसके पछि डिस्क खाली ठाउँ खाली हुनेछ ।\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "%sB अनप्याक गरिसके पछि डिस्क खाली ठाउँ खाली हुनेछ ।\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन"


@@ -888,7 +888,7 @@ msgstr "परित्याग गर्नुहोस् ।"
 msgid "Do you want to continue [Y/n]? "
 msgstr "के तपाईँ निरन्तरता दिन चाहनुहुन्छ [Y/n]? "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "के तपाईँ निरन्तरता दिन चाहनुहुन्छ [Y/n]? "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s  %s तान्न असफल भयो\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s  %s तान्न असफल भयो\n"


@@ -897,7 +897,7 @@ msgstr "%s  %s तान्न असफल भयो\n"
 msgid "Some files failed to download"
 msgstr "केही फाइलहरू डाउनलोड गर्न असफल भयो"
 
 msgid "Some files failed to download"
 msgstr "केही फाइलहरू डाउनलोड गर्न असफल भयो"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "डाउनलोड समाप्त भयो र डाउनलोडमा मोड मात्रै छ"
 
 msgid "Download complete and in download only mode"
 msgstr "डाउनलोड समाप्त भयो र डाउनलोडमा मोड मात्रै छ"
 


@@ -994,30 +994,35 @@ msgstr " '%s' को लागि '%s' संस्करण फेला पा
 msgid "Selected version %s (%s) for %s\n"
 msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "अद्यावधिक आदेशले कुनै तर्कहरू लिदैन"
 
 msgid "The update command takes no arguments"
 msgstr "अद्यावधिक आदेशले कुनै तर्कहरू लिदैन"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल"
 
 msgid "Unable to lock the list directory"
 msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
 
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1033,44 +1038,44 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "निम्न सूचनाले अवस्थालाई हल गर्न मद्दत गर्नेछ: "
 
 msgid "The following information may help to resolve the situation:"
 msgstr "निम्न सूचनाले अवस्थालाई हल गर्न मद्दत गर्नेछ: "
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो "
 
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो "
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "आन्तरिक त्रुटि,सबै स्तरवृद्धिले उत्तम गुण नष्ट गर्दछ"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "आन्तरिक त्रुटि,सबै स्तरवृद्धिले उत्तम गुण नष्ट गर्दछ"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "द्रष्टब्य, रिजेक्स '%s' को लागि %s चयन गरिदैछ\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "द्रष्टब्य, रिजेक्स '%s' को लागि %s चयन गरिदैछ\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "तर %s स्थापना हुनुपर्यो"
 
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "तर %s स्थापना हुनुपर्यो"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "तपाईँ यसलाई सुधार गर्न `apt-get -f install' चलाउन चाहनुहुन्छ:"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "तपाईँ यसलाई सुधार गर्न `apt-get -f install' चलाउन चाहनुहुन्छ:"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1078,7 +1083,7 @@ msgstr ""
 "नभेटिएका निर्भरताहरू । प्याकेजहरू बिना 'apt-get -f install' प्रयास गर्नुहोस् ( वा "
 "समाधान निर्दिष्ट गर्नुहोस्) ।"
 
 "नभेटिएका निर्भरताहरू । प्याकेजहरू बिना 'apt-get -f install' प्रयास गर्नुहोस् ( वा "
 "समाधान निर्दिष्ट गर्नुहोस्) ।"
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1091,122 +1096,122 @@ msgstr ""
 " वितरण अहिले सम्म सिर्जना\n"
 " भएको छैन वा आवगमन विनानै सर्यो ।"
 
 " वितरण अहिले सम्म सिर्जना\n"
 " भएको छैन वा आवगमन विनानै सर्यो ।"
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "भाँचिएका प्याकेजहरू"
 
 msgid "Broken packages"
 msgstr "भाँचिएका प्याकेजहरू"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "निम्न अतिरिक्त प्याकेजहरू स्थापना हुनेछन्:"
 
 msgid "The following extra packages will be installed:"
 msgstr "निम्न अतिरिक्त प्याकेजहरू स्थापना हुनेछन्:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "सुझाव दिएका प्याकेजहरू:"
 
 msgid "Suggested packages:"
 msgstr "सुझाव दिएका प्याकेजहरू:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "सिफारिस गरिएका प्याकेजहरू:"
 
 msgid "Recommended packages:"
 msgstr "सिफारिस गरिएका प्याकेजहरू:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "स्तर वृद्धि गणना गरिदैछ..."
 
 msgid "Calculating upgrade... "
 msgstr "स्तर वृद्धि गणना गरिदैछ..."
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "असफल भयो"
 
 msgid "Failed"
 msgstr "असफल भयो"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "काम भयो"
 
 msgid "Done"
 msgstr "काम भयो"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो "
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो "
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s को लागि स्रोत प्याकेज फेला पार्न असफल भयो"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s को लागि स्रोत प्याकेज फेला पार्न असफल भयो"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "पहिल्यै डाउनलोड भएका फाइलहरु फड्काइदैछ '%s'\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "पहिल्यै डाउनलोड भएका फाइलहरु फड्काइदैछ '%s'\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "स्रोत संग्रहहरुको %sB/%sB प्राप्त गर्न आवश्यक छ ।\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "स्रोत संग्रहहरुको %sB/%sB प्राप्त गर्न आवश्यक छ ।\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "स्रोत संग्रहहरुको %sB प्राप्त गर्न आवश्यक छ ।\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "स्रोत संग्रहहरुको %sB प्राप्त गर्न आवश्यक छ ।\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "स्रोत फड्काउनुहोस् %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "स्रोत फड्काउनुहोस् %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "केही संग्रह फड्काउन असफल भयो ।"
 
 msgid "Failed to fetch some archives."
 msgstr "केही संग्रह फड्काउन असफल भयो ।"
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr " %s मा पहिल्यै अनप्याक गरिएका स्रोतको अनप्याक फड्काइदैछ\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr " %s मा पहिल्यै अनप्याक गरिएका स्रोतको अनप्याक फड्काइदैछ\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "अनप्याक आदेश '%s' असफल भयो ।\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "अनप्याक आदेश '%s' असफल भयो ।\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "निर्माण आदेश '%s' असफल भयो ।\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "निर्माण आदेश '%s' असफल भयो ।\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "शाखा प्रक्रिया असफल भयो"
 
 msgid "Child process failed"
 msgstr "शाखा प्रक्रिया असफल भयो"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr "को लागि builddeps जाँच्न कम्तिमा एउटा प्याकेज निर्दष्ट गर्नुपर्छ"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr "को लागि builddeps जाँच्न कम्तिमा एउटा प्याकेज निर्दष्ट गर्नुपर्छ"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s को लागि निर्माण-निर्भरता सूचना प्राप्त गर्न असक्षम भयो"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s को लागि निर्माण-निर्भरता सूचना प्राप्त गर्न असक्षम भयो"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s कुनै निर्माणमा आधारित हुदैन ।\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s कुनै निर्माणमा आधारित हुदैन ।\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन"
 
 #, 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:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1215,30 +1220,30 @@ msgstr ""
 "%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले संस्करण "
 "आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन "
 
 "%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले संस्करण "
 "आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन "
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "%s को लागि %s निर्भरता सन्तुष्ट पार्न असफल भयो: स्थापित प्याकेज %s अति नयाँ छ"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "%s को लागि %s निर्भरता सन्तुष्ट पार्न असफल भयो: स्थापित प्याकेज %s अति नयाँ छ"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s को लागि %s निर्भरता सन्तुष्ट गर्न असफल: %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s को लागि %s निर्भरता सन्तुष्ट गर्न असफल: %s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । "
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । "
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल"
 
 msgid "Failed to process build dependencies"
 msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "समर्थित मोड्युलहरू:"
 
 msgid "Supported modules:"
 msgstr "समर्थित मोड्युलहरू:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628

 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"


@@ -1255,7 +1260,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1850,7 +1855,7 @@ msgstr "डेटा सकेटको जडान समय सकियो"
 msgid "Unable to accept connection"
 msgstr "जडान स्वीकार गर्न असक्षम भयो"
 
 msgid "Unable to accept connection"
 msgstr "जडान स्वीकार गर्न असक्षम भयो"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "समस्या द्रुतान्वेषण फाइल"
 
 msgid "Problem hashing file"
 msgstr "समस्या द्रुतान्वेषण फाइल"
 


@@ -1934,38 +1939,38 @@ msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट
 msgid "Unable to connect to %s %s:"
 msgstr "%s %s मा जडान गर्न असफल भयो:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "%s %s मा जडान गर्न असफल भयो:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "कुञ्जी घण्टी पहुँच गर्न सकिएन: '%s'"
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "कुञ्जी घण्टी पहुँच गर्न सकिएन: '%s'"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: प्राप्त गर्नेबाट तर्क सूचि::gpgv::अति लामो विकल्पहरू अवस्थित छ ।"
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: प्राप्त गर्नेबाट तर्क सूचि::gpgv::अति लामो विकल्पहरू अवस्थित छ ।"
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "आन्तरिक त्रुटि: असल हस्ताक्षर, तर कुञ्जी औठाछाप निर्धारण गर्न सकिएन?!"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "आन्तरिक त्रुटि: असल हस्ताक्षर, तर कुञ्जी औठाछाप निर्धारण गर्न सकिएन?!"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "कम्तिमा एउटा अवैध हस्ताक्षर विरोध भयो ।"
 
 msgid "At least one invalid signature was encountered."
 msgstr "कम्तिमा एउटा अवैध हस्ताक्षर विरोध भयो ।"
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "हस्ताक्षर रूजू गर्न '%s' कार्यन्वयन गर्न सकिएन (के gpgv स्थापना भयो?)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "हस्ताक्षर रूजू गर्न '%s' कार्यन्वयन गर्न सकिएन (के gpgv स्थापना भयो?)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "gpgv कार्यन्वयन गर्दा अज्ञात त्रुटि"
 
 msgid "Unknown error executing gpgv"
 msgstr "gpgv कार्यन्वयन गर्दा अज्ञात त्रुटि"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "निम्न हस्ताक्षरहरू अवैध छन्:\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "निम्न हस्ताक्षरहरू अवैध छन्:\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -1981,81 +1986,81 @@ msgstr "%s को लागि पाइप खोल्न सकिएन"
 msgid "Read error from %s process"
 msgstr "%s प्रक्रियाबाट त्रुटि पढ्नुहोस् "
 
 msgid "Read error from %s process"
 msgstr "%s प्रक्रियाबाट त्रुटि पढ्नुहोस् "
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "हेडरहरुको लागि पर्खिदैछ"
 
 msgid "Waiting for headers"
 msgstr "हेडरहरुको लागि पर्खिदैछ"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr " %u chars माथि एकल हेडर लाइन प्राप्त गर्नुहोस्"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr " %u chars माथि एकल हेडर लाइन प्राप्त गर्नुहोस्"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "खराब हेडर लाइन"
 
 msgid "Bad header line"
 msgstr "खराब हेडर लाइन"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP सर्भरले अवैध जवाफ हेडर पठायो"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP सर्भरले अवैध जवाफ हेडर पठायो"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP सर्भरले अवैध सामग्री-लम्बाई हेडर पठायो"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP सर्भरले अवैध सामग्री-लम्बाई हेडर पठायो"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP सर्भरले अवैध सामग्री-दायरा हेडर पठायो"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP सर्भरले अवैध सामग्री-दायरा हेडर पठायो"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "HTTP सर्भर संग भाँचिएको दायरा समर्थन छ"
 
 msgid "This HTTP server has broken range support"
 msgstr "HTTP सर्भर संग भाँचिएको दायरा समर्थन छ"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "अज्ञात मिति ढाँचा"
 
 msgid "Unknown date format"
 msgstr "अज्ञात मिति ढाँचा"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "असफल चयन गर्नुहोस्"
 
 msgid "Select failed"
 msgstr "असफल चयन गर्नुहोस्"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "जडान समय सकियो"
 
 msgid "Connection timed out"
 msgstr "जडान समय सकियो"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "निर्गात फाइलमा त्रुटि लेखिदैछ"
 
 msgid "Error writing to output file"
 msgstr "निर्गात फाइलमा त्रुटि लेखिदैछ"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "फाइलमा त्रुटि लेखिदैछ"
 
 msgid "Error writing to file"
 msgstr "फाइलमा त्रुटि लेखिदैछ"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "फाइलमा त्रुटि लेखिदैछ"
 
 msgid "Error writing to the file"
 msgstr "फाइलमा त्रुटि लेखिदैछ"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "सर्भरबाट त्रुटि पढिदैछ । दूर गन्तब्य बन्द जडान"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "सर्भरबाट त्रुटि पढिदैछ । दूर गन्तब्य बन्द जडान"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "सर्भरबाट त्रुटि पढिदैछ"
 
 msgid "Error reading from server"
 msgstr "सर्भरबाट त्रुटि पढिदैछ"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "फाइल %s लेख्न असफल भयो"
 
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "फाइल %s लेख्न असफल भयो"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "खराब हेडर डेटा"
 
 msgid "Bad header data"
 msgstr "खराब हेडर डेटा"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "जडान असफल भयो"
 
 msgid "Connection failed"
 msgstr "जडान असफल भयो"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "आन्तरिक त्रुटि"
 
 msgid "Internal error"
 msgstr "आन्तरिक त्रुटि"
 


@@ -2075,7 +2080,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "चयन %s फेला पार्न सकिएन"
 #, c-format
 msgid "Selection %s not found"
 msgstr "चयन %s फेला पार्न सकिएन"


@@ -2502,7 +2531,7 @@ msgstr "विधि ड्राइभर %s फेला पार्न स
 msgid "Method %s did not start correctly"
 msgstr "विधि %s सही रुपले सुरू हुन सकेन"
 
 msgid "Method %s did not start correctly"
 msgstr "विधि %s सही रुपले सुरू हुन सकेन"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "कृपया डिस्क लेबुल: '%s' ड्राइभ '%s'मा घुसउनुहोस् र इन्टर थिच्नुहोस् । "
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "कृपया डिस्क लेबुल: '%s' ड्राइभ '%s'मा घुसउनुहोस् र इन्टर थिच्नुहोस् । "


@@ -2864,10 +2893,14 @@ msgstr " %s पूर्ण रुपले हटाउन तयार गर
 msgid "Completely removed %s"
 msgstr " %s पूर्ण रुपले हट्यो"
 
 msgid "Completely removed %s"
 msgstr " %s पूर्ण रुपले हट्यो"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 #, fuzzy
 msgid "Could not patch file"
 #: methods/rred.cc:219
 #, fuzzy
 msgid "Could not patch file"

diff --git a/po/nl.po b/po/nl.po
index bc6df5cea0b44ed387a9e0f0985039dd9eae001a..c4b4713562164dd749049c6c71d4dbc24b9f50d9 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2008-05-05 18:39+0200\n"
 "Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
 "PO-Revision-Date: 2008-05-05 18:39+0200\n"
 "Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"


@@ -157,7 +157,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s voor %s gecompileerd op %s %s\n"
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s voor %s gecompileerd op %s %s\n"


@@ -662,7 +662,7 @@ msgstr "Hernoemen van %s naar %s is mislukt"
 msgid "Y"
 msgstr "J"
 
 msgid "Y"
 msgstr "J"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex-compilatiefout - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex-compilatiefout - %s"


@@ -824,11 +824,11 @@ msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld."
 msgid "Internal error, Ordering didn't finish"
 msgstr "Interne fout, rangschikken is niet voltooid"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "Interne fout, rangschikken is niet voltooid"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "Kon de ophaalmap niet vergrendelen"
 
 msgid "Unable to lock the download directory"
 msgstr "Kon de ophaalmap niet vergrendelen"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "De lijst van bronnen kon niet gelezen worden."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "De lijst van bronnen kon niet gelezen worden."


@@ -859,7 +859,7 @@ msgstr "Door deze operatie zal er %sB extra schijfruimte gebruikt worden.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Door deze operatie zal er %sB schijfruimte vrijkomen.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Door deze operatie zal er %sB schijfruimte vrijkomen.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen"


@@ -896,7 +896,7 @@ msgstr "Afbreken."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Wilt u doorgaan [J/n]? "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "Wilt u doorgaan [J/n]? "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Ophalen van %s %s is mislukt\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Ophalen van %s %s is mislukt\n"


@@ -905,7 +905,7 @@ msgstr "Ophalen van %s %s is mislukt\n"
 msgid "Some files failed to download"
 msgstr "Ophalen van sommige bestanden is mislukt"
 
 msgid "Some files failed to download"
 msgstr "Ophalen van sommige bestanden is mislukt"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "Ophalen klaar en alleen-ophalen-modus staat aan"
 
 msgid "Download complete and in download only mode"
 msgstr "Ophalen klaar en alleen-ophalen-modus staat aan"
 


@@ -1005,19 +1005,24 @@ msgstr "Versie '%s' voor '%s' is niet gevonden"
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Versie %s (%s) geselecteerd voor %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Versie %s (%s) geselecteerd voor %s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "De 'update'-opdracht aanvaard geen argumenten"
 
 msgid "The update command takes no arguments"
 msgstr "De 'update'-opdracht aanvaard geen argumenten"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "Kon de lijst-map niet vergrendelen"
 
 msgid "Unable to lock the list directory"
 msgstr "Kon de lijst-map niet vergrendelen"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "We mogen geen dingen verwijderen, kan AutoRemover niet starten"
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "We mogen geen dingen verwijderen, kan AutoRemover niet starten"
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"


@@ -1025,11 +1030,11 @@ msgstr ""
 "De volgende pakketten zijn automatisch geïnstalleerd en zijn niet langer "
 "nodig:"
 
 "De volgende pakketten zijn automatisch geïnstalleerd en zijn niet langer "
 "nodig:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "U kunt deze verwijderen via 'apt-get autoremove'."
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "U kunt deze verwijderen via 'apt-get autoremove'."
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1047,45 +1052,45 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "De volgende informatie helpt u mogelijk verder:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "De volgende informatie helpt u mogelijk verder:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Interne fout, AutoRemover heeft dingen stukgemaakt"
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Interne fout, AutoRemover heeft dingen stukgemaakt"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Kon taak %s niet vinden"
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Kon taak %s niet vinden"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Kon pakket %s niet vinden"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Kon pakket %s niet vinden"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Let op, %s wordt geselecteerd omwille van de regex '%s'\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Let op, %s wordt geselecteerd omwille van de regex '%s'\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s is ingesteld voor handmatige installatie.\n"
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s is ingesteld voor handmatige installatie.\n"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 "U wilt waarschijnlijk 'apt-get -f install' uitvoeren om volgende op te "
 "lossen:"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 "U wilt waarschijnlijk 'apt-get -f install' uitvoeren om volgende op te "
 "lossen:"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1093,7 +1098,7 @@ msgstr ""
 "Er zijn niet-voldane vereisten. U kunt best 'apt-get -f install' uitvoeren "
 "zonder pakketten op te geven, (of u kunt zelf een oplossing specificeren)."
 
 "Er zijn niet-voldane vereisten. U kunt best 'apt-get -f install' uitvoeren "
 "zonder pakketten op te geven, (of u kunt zelf een oplossing specificeren)."
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1104,119 +1109,119 @@ msgstr ""
 "een onmogelijke situatie gevraagd hebt of dat u de 'unstable'-distributie \n"
 "gebruikt en sommige benodigde pakketten nog vastzitten in 'incoming'."
 
 "een onmogelijke situatie gevraagd hebt of dat u de 'unstable'-distributie \n"
 "gebruikt en sommige benodigde pakketten nog vastzitten in 'incoming'."
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "Niet-werkende pakketten:"
 
 msgid "Broken packages"
 msgstr "Niet-werkende pakketten:"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "De volgende extra pakketten zullen geïnstalleerd worden:"
 
 msgid "The following extra packages will be installed:"
 msgstr "De volgende extra pakketten zullen geïnstalleerd worden:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "Voorgestelde pakketten:"
 
 msgid "Suggested packages:"
 msgstr "Voorgestelde pakketten:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "Aanbevolen pakketten:"
 
 msgid "Recommended packages:"
 msgstr "Aanbevolen pakketten:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "Opwaardering wordt doorgerekend... "
 
 msgid "Calculating upgrade... "
 msgstr "Opwaardering wordt doorgerekend... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "Mislukt"
 
 msgid "Failed"
 msgstr "Mislukt"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "Klaar"
 
 msgid "Done"
 msgstr "Klaar"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet "
 "worden"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet "
 "worden"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Kan geen bronpakket vinden voor %s"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Kan geen bronpakket vinden voor %s"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "U heeft niet voldoende vrije schijfruimte op %s"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "U heeft niet voldoende vrije schijfruimte op %s"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Moet %sB aan bronarchieven ophalen.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Moet %sB aan bronarchieven ophalen.\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Ophalen bron %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Ophalen bron %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "Ophalen van sommige archieven is mislukt."
 
 msgid "Failed to fetch some archives."
 msgstr "Ophalen van sommige archieven is mislukt."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Uitpakopdracht '%s' is mislukt.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Uitpakopdracht '%s' is mislukt.\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket geïnstalleerd is.\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket geïnstalleerd is.\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Bouwopdracht '%s' is mislukt.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Bouwopdracht '%s' is mislukt.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "Dochterproces is mislukt"
 
 msgid "Child process failed"
 msgstr "Dochterproces is mislukt"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "U dient tenminste één pakket op te geven om de bouwvereisten van te "
 "controleren"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "U dient tenminste één pakket op te geven om de bouwvereisten van te "
 "controleren"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Kan de informatie over de bouwvereisten voor %s niet ophalen"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Kan de informatie over de bouwvereisten voor %s niet ophalen"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s heeft geen bouwvereisten.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s heeft geen bouwvereisten.\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "


@@ -1225,7 +1230,7 @@ msgstr ""
 "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
 "onvindbaar is"
 
 "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
 "onvindbaar is"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1234,32 +1239,33 @@ msgstr ""
 "De vereiste %s van pakket %s kan niet voldaan worden omdat er geen "
 "beschikbare versies zijn van pakket %s die aan de versievereisten voldoen"
 
 "De vereiste %s van pakket %s kan niet voldaan worden omdat er geen "
 "beschikbare versies zijn van pakket %s die aan de versievereisten voldoen"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Voldoen van Vereiste %s van pakket %s is mislukt: geïnstalleerde versie %s "
 "is te nieuw"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Voldoen van Vereiste %s van pakket %s is mislukt: geïnstalleerde versie %s "
 "is te nieuw"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Voldoen van de vereiste %s van pakket %s is mislukt: %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Voldoen van de vereiste %s van pakket %s is mislukt: %s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Bouwvereisten voor %s konden niet voldaan worden."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Bouwvereisten voor %s konden niet voldaan worden."
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "Verwerken van de bouwvereisten is mislukt"
 
 msgid "Failed to process build dependencies"
 msgstr "Verwerken van de bouwvereisten is mislukt"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "Ondersteunde modules:"
 
 msgid "Supported modules:"
 msgstr "Ondersteunde modules:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1275,7 +1281,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1886,7 +1892,7 @@ msgstr "Datasocket verbinding is verlopen"
 msgid "Unable to accept connection"
 msgstr "Kan de verbinding niet aanvaarden"
 
 msgid "Unable to accept connection"
 msgstr "Kan de verbinding niet aanvaarden"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "Probleem bij het hashen van het bestand"
 
 msgid "Problem hashing file"
 msgstr "Probleem bij het hashen van het bestand"
 


@@ -1970,44 +1976,44 @@ msgstr "Er gebeurde iets raars bij het zoeken naar '%s:%s' (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Kan niet verbinden met %s %s:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "Kan niet verbinden met %s %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Kon de sleutelring niet benaderen: '%s'"
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Kon de sleutelring niet benaderen: '%s'"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "F: argumentenlijst van Acquire::gpv::Options was te lang. Er wordt "
 "afgesloten."
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "F: argumentenlijst van Acquire::gpv::Options was te lang. Er wordt "
 "afgesloten."
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Interne fout: ondertekening is goed maar kon de vingerafdruk van de sleutel\n"
 "niet bepalen?!"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Interne fout: ondertekening is goed maar kon de vingerafdruk van de sleutel\n"
 "niet bepalen?!"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "Er is tenminste één ongeldige ondertekening gevonden."
 
 msgid "At least one invalid signature was encountered."
 msgstr "Er is tenminste één ongeldige ondertekening gevonden."
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Kon '%s' niet uitvoeren om ondertekening te verifiëren (is gpgv "
 "geïnstalleerd?)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Kon '%s' niet uitvoeren om ondertekening te verifiëren (is gpgv "
 "geïnstalleerd?)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "Onbekende fout bij het uitvoeren van gpgv"
 
 msgid "Unknown error executing gpgv"
 msgstr "Onbekende fout bij het uitvoeren van gpgv"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "De volgende ondertekeningen waren ongeldig:\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "De volgende ondertekeningen waren ongeldig:\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -2025,84 +2031,84 @@ msgstr "Kon geen pijp openen voor %s"
 msgid "Read error from %s process"
 msgstr "Leesfout door proces %s"
 
 msgid "Read error from %s process"
 msgstr "Leesfout door proces %s"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "Wachtend op de kopteksten"
 
 msgid "Waiting for headers"
 msgstr "Wachtend op de kopteksten"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Enkele koptekstregel ontvangen met meer dan %u karakters"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Enkele koptekstregel ontvangen met meer dan %u karakters"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "Foute koptekstregel"
 
 msgid "Bad header line"
 msgstr "Foute koptekstregel"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "Er is door de HTTP server een ongeldige 'reply'-koptekst verstuurd"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Er is door de HTTP server een ongeldige 'reply'-koptekst verstuurd"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 "Er is door de HTTP server een ongeldige 'Content-Length'-koptekst verstuurd"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 "Er is door de HTTP server een ongeldige 'Content-Length'-koptekst verstuurd"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 "Er is door de HTTP server een ongeldige 'Content-Range'-koptekst verstuurd"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 "Er is door de HTTP server een ongeldige 'Content-Range'-koptekst verstuurd"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet"
 
 msgid "This HTTP server has broken range support"
 msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "Onbekend datumformaat"
 
 msgid "Unknown date format"
 msgstr "Onbekend datumformaat"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "Selectie is mislukt"
 
 msgid "Select failed"
 msgstr "Selectie is mislukt"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "Verbinding verliep"
 
 msgid "Connection timed out"
 msgstr "Verbinding verliep"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "Fout bij het schrijven naar het uitvoerbestand"
 
 msgid "Error writing to output file"
 msgstr "Fout bij het schrijven naar het uitvoerbestand"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "Fout bij het schrijven naar bestand"
 
 msgid "Error writing to file"
 msgstr "Fout bij het schrijven naar bestand"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "Fout bij het schrijven naar het bestand"
 
 msgid "Error writing to the file"
 msgstr "Fout bij het schrijven naar het bestand"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Fout bij het lezen van de server, andere kant heeft de verbinding gesloten"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Fout bij het lezen van de server, andere kant heeft de verbinding gesloten"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "Fout bij het lezen van de server"
 
 msgid "Error reading from server"
 msgstr "Fout bij het lezen van de server"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Wegschrijven van bestand %s is mislukt"
 
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Wegschrijven van bestand %s is mislukt"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "Foute koptekstdata"
 
 msgid "Bad header data"
 msgstr "Foute koptekstdata"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "Verbinding mislukt"
 
 msgid "Connection failed"
 msgstr "Verbinding mislukt"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "Interne fout"
 
 msgid "Internal error"
 msgstr "Interne fout"
 


@@ -2122,7 +2128,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "Selectie %s niet gevonden"
 #, c-format
 msgid "Selection %s not found"
 msgstr "Selectie %s niet gevonden"


@@ -2558,7 +2588,7 @@ msgstr "Het methodestuurprogramma %s kon niet gevonden worden."
 msgid "Method %s did not start correctly"
 msgstr "Methode %s startte niet op de juiste manier"
 
 msgid "Method %s did not start correctly"
 msgstr "Methode %s startte niet op de juiste manier"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""


@@ -2934,12 +2964,16 @@ msgstr "Volledige verwijdering van %s wordt voorbereid"
 msgid "Completely removed %s"
 msgstr "%s is volledig verwijderd"
 
 msgid "Completely removed %s"
 msgstr "%s is volledig verwijderd"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Kon logbestand niet wegschrijven, openpty() is mislukt (/dev/pts niet "
 "aangekoppeld?)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Kon logbestand niet wegschrijven, openpty() is mislukt (/dev/pts niet "
 "aangekoppeld?)\n"
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Kon bestand niet patchen"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Kon bestand niet patchen"

diff --git a/po/nn.po b/po/nn.po
index ad95514657923e87be64b23c484ee1d03a230a9f..f68021eadccc712a582c87b53e9dd00e6a9831ab 100644 (file)
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_nn\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt_nn\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2005-02-14 23:30+0100\n"
 "Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
 "PO-Revision-Date: 2005-02-14 23:30+0100\n"
 "Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"


@@ -161,7 +161,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s %s kompilert på %s %s\n"
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s %s kompilert på %s %s\n"


@@ -659,7 +659,7 @@ msgstr "Klarte ikkje endra namnet p
 msgid "Y"
 msgstr "J"
 
 msgid "Y"
 msgstr "J"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex-kompileringsfeil - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex-kompileringsfeil - %s"


@@ -822,11 +822,11 @@ msgstr "Nokre pakkar m
 msgid "Internal error, Ordering didn't finish"
 msgstr "Intern feil ved tilleggjing av avleiing"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "Intern feil ved tilleggjing av avleiing"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "Klarte ikkje låsa nedlastingskatalogen"
 
 msgid "Unable to lock the download directory"
 msgstr "Klarte ikkje låsa nedlastingskatalogen"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Kjeldelista kan ikkje lesast."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Kjeldelista kan ikkje lesast."


@@ -855,7 +855,7 @@ msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Du har ikkje nok ledig plass i %s"
 #, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Du har ikkje nok ledig plass i %s"


@@ -893,7 +893,7 @@ msgstr "Avbryt."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vil du halda fram [J/n]? "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vil du halda fram [J/n]? "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Klarte ikkje henta %s  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Klarte ikkje henta %s  %s\n"


@@ -902,7 +902,7 @@ msgstr "Klarte ikkje henta %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Klarte ikkje henta nokre av filene"
 
 msgid "Some files failed to download"
 msgstr "Klarte ikkje henta nokre av filene"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "Nedlastinga er ferdig i nedlastingsmodus"
 
 msgid "Download complete and in download only mode"
 msgstr "Nedlastinga er ferdig i nedlastingsmodus"
 


@@ -1001,30 +1001,35 @@ msgstr "Fann ikkje versjonen 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Vald versjon %s (%s) for %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Vald versjon %s (%s) for %s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "Oppdateringskommandoen tek ingen argument"
 
 msgid "The update command takes no arguments"
 msgstr "Oppdateringskommandoen tek ingen argument"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "Klarte ikkje låsa listekatalogen"
 
 msgid "Unable to lock the list directory"
 msgstr "Klarte ikkje låsa listekatalogen"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Dei følgjande NYE pakkane vil verta installerte:"
 
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Dei følgjande NYE pakkane vil verta installerte:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1040,44 +1045,44 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "Følgjande informasjon kan hjelpa med å løysa situasjonen:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "Følgjande informasjon kan hjelpa med å løysa situasjonen:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Intern feil. AllUpgrade øydelagde noko"
 
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Intern feil. AllUpgrade øydelagde noko"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Intern feil. AllUpgrade øydelagde noko"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Intern feil. AllUpgrade øydelagde noko"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "Fann ikkje pakken %s"
 
 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "Fann ikkje pakken %s"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Fann ikkje pakken %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Fann ikkje pakken %s"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Merk, vel %s i staden for regex «%s»\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Merk, vel %s i staden for regex «%s»\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "men %s skal installerast"
 
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "men %s skal installerast"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Du vil kanskje prøva å retta på desse ved å køyra «apt-get -f install»."
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Du vil kanskje prøva å retta på desse ved å køyra «apt-get -f install»."
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1085,7 +1090,7 @@ msgstr ""
 "Nokre krav er ikkje oppfylte. Du kan prøva «apt-get -f install» (eller velja "
 "ei løysing)."
 
 "Nokre krav er ikkje oppfylte. Du kan prøva «apt-get -f install» (eller velja "
 "ei løysing)."
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1097,123 +1102,123 @@ msgstr ""
 "distribusjonen, kan det òg henda at nokre av pakkane som trengst ikkje\n"
 "er laga enno eller at dei framleis ligg i «Incoming»."
 
 "distribusjonen, kan det òg henda at nokre av pakkane som trengst ikkje\n"
 "er laga enno eller at dei framleis ligg i «Incoming»."
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "Øydelagde pakkar"
 
 msgid "Broken packages"
 msgstr "Øydelagde pakkar"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "Dei følgjande tilleggspakkane vil verta installerte:"
 
 msgid "The following extra packages will be installed:"
 msgstr "Dei følgjande tilleggspakkane vil verta installerte:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "Føreslåtte pakkar:"
 
 msgid "Suggested packages:"
 msgstr "Føreslåtte pakkar:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "Tilrådde pakkar"
 
 msgid "Recommended packages:"
 msgstr "Tilrådde pakkar"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "Reknar ut oppgradering ... "
 
 msgid "Calculating upgrade... "
 msgstr "Reknar ut oppgradering ... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "Mislukkast"
 
 msgid "Failed"
 msgstr "Mislukkast"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "Ferdig"
 
 msgid "Done"
 msgstr "Ferdig"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern feil. AllUpgrade øydelagde noko"
 
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern feil. AllUpgrade øydelagde noko"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr "Du må velja minst éin pakke som kjeldekoden skal hentast for"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "Du må velja minst éin pakke som kjeldekoden skal hentast for"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Finn ingen kjeldepakke for %s"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Finn ingen kjeldepakke for %s"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, fuzzy, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Hoppar over utpakking av kjeldekode som er utpakka frå før i %s\n"
 
 #, fuzzy, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Hoppar over utpakking av kjeldekode som er utpakka frå før i %s\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Du har ikkje nok ledig plass i %s"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Du har ikkje nok ledig plass i %s"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Må henta %sB/%sB med kjeldekodearkiv.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Må henta %sB/%sB med kjeldekodearkiv.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Må henta %sB med kjeldekodearkiv.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Må henta %sB med kjeldekodearkiv.\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Hent kjeldekode %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Hent kjeldekode %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "Klarte ikkje henta nokre av arkiva."
 
 msgid "Failed to fetch some archives."
 msgstr "Klarte ikkje henta nokre av arkiva."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Hoppar over utpakking av kjeldekode som er utpakka frå før i %s\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Hoppar over utpakking av kjeldekode som er utpakka frå før i %s\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Utpakkingskommandoen «%s» mislukkast.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Utpakkingskommandoen «%s» mislukkast.\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggjekommandoen «%s» mislukkast.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggjekommandoen «%s» mislukkast.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "Barneprosessen mislukkast"
 
 msgid "Child process failed"
 msgstr "Barneprosessen mislukkast"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr "Du må velja minst ein pakke som byggjekrava skal sjekkast for"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr "Du må velja minst ein pakke som byggjekrava skal sjekkast for"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Klarte ikkje henta byggjekrav for %s"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Klarte ikkje henta byggjekrav for %s"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen byggjekrav.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen byggjekrav.\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
 
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1222,31 +1227,31 @@ msgstr ""
 "Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon "
 "tilgjengelege versjonar av pakken %s som oppfyller versjonskrava"
 
 "Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon "
 "tilgjengelege versjonar av pakken %s som oppfyller versjonskrava"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "Klarte ikkje behandla byggjekrava"
 
 msgid "Failed to process build dependencies"
 msgstr "Klarte ikkje behandla byggjekrava"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "Støtta modular:"
 
 msgid "Supported modules:"
 msgstr "Støtta modular:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628

 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"


@@ -1263,7 +1268,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1862,7 +1867,7 @@ msgstr "Tidsavbrot p
 msgid "Unable to accept connection"
 msgstr "Klarte ikkje godta tilkoplinga"
 
 msgid "Unable to accept connection"
 msgstr "Klarte ikkje godta tilkoplinga"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "Problem ved oppretting av nøkkel for fil"
 
 msgid "Problem hashing file"
 msgstr "Problem ved oppretting av nøkkel for fil"
 


@@ -1946,39 +1951,39 @@ msgstr "Det hende noko dumt ved oppslag av 
 msgid "Unable to connect to %s %s:"
 msgstr "Klarte ikkje kopla til %s %s:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "Klarte ikkje kopla til %s %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, fuzzy, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Klarte ikkje slå opp «%s»"
 
 #, fuzzy, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Klarte ikkje slå opp «%s»"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr ""
 
 msgid "At least one invalid signature was encountered."
 msgstr ""
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr ""
 
 msgid "Unknown error executing gpgv"
 msgstr ""
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Dei følgjande tilleggspakkane vil verta installerte:"
 
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Dei følgjande tilleggspakkane vil verta installerte:"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -1994,81 +1999,81 @@ msgstr "Klarte ikkje opna r
 msgid "Read error from %s process"
 msgstr "Lesefeil frå %s-prosessen"
 
 msgid "Read error from %s process"
 msgstr "Lesefeil frå %s-prosessen"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "Ventar på hovud"
 
 msgid "Waiting for headers"
 msgstr "Ventar på hovud"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Fekk ei enkel hovudlinje over %u teikn"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Fekk ei enkel hovudlinje over %u teikn"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "Øydelagd hovudlinje"
 
 msgid "Bad header line"
 msgstr "Øydelagd hovudlinje"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP-tenaren sende eit ugyldig svarhovud"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP-tenaren sende eit ugyldig svarhovud"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP-tenaren sende eit ugyldig «Content-Length»-hovud"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP-tenaren sende eit ugyldig «Content-Length»-hovud"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP-tenaren sende eit ugyldig «Content-Range»-hovud"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP-tenaren sende eit ugyldig «Content-Range»-hovud"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "Denne HTTP-tenaren har øydelagd støtte for område"
 
 msgid "This HTTP server has broken range support"
 msgstr "Denne HTTP-tenaren har øydelagd støtte for område"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "Ukjend datoformat"
 
 msgid "Unknown date format"
 msgstr "Ukjend datoformat"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "Utvalet mislukkast"
 
 msgid "Select failed"
 msgstr "Utvalet mislukkast"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "Tidsavbrot på sambandet"
 
 msgid "Connection timed out"
 msgstr "Tidsavbrot på sambandet"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "Feil ved skriving til utfil"
 
 msgid "Error writing to output file"
 msgstr "Feil ved skriving til utfil"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "Feil ved skriving til fil"
 
 msgid "Error writing to file"
 msgstr "Feil ved skriving til fil"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "Feil ved skriving til fila"
 
 msgid "Error writing to the file"
 msgstr "Feil ved skriving til fila"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "Feil ved lesing frå tenaren. Sambandet vart lukka i andre enden"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Feil ved lesing frå tenaren. Sambandet vart lukka i andre enden"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "Feil ved lesing frå tenaren"
 
 msgid "Error reading from server"
 msgstr "Feil ved lesing frå tenaren"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Klarte ikkje skriva fila %s"
 
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Klarte ikkje skriva fila %s"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "Øydelagde hovuddata"
 
 msgid "Bad header data"
 msgstr "Øydelagde hovuddata"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "Sambandet mislukkast"
 
 msgid "Connection failed"
 msgstr "Sambandet mislukkast"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "Intern feil"
 
 msgid "Internal error"
 msgstr "Intern feil"
 


@@ -2088,7 +2093,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "Fann ikkje utvalet %s"
 #, c-format
 msgid "Selection %s not found"
 msgstr "Fann ikkje utvalet %s"


@@ -2517,7 +2546,7 @@ msgstr "Finn ikkje metodedrivaren %s."
 msgid "Method %s did not start correctly"
 msgstr "Metoden %s starta ikkje rett"
 
 msgid "Method %s did not start correctly"
 msgstr "Metoden %s starta ikkje rett"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, fuzzy, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 #, fuzzy, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""


@@ -2883,10 +2912,14 @@ msgstr "Opnar oppsettsfila %s"
 msgid "Completely removed %s"
 msgstr "Klarte ikkje fjerna %s"
 
 msgid "Completely removed %s"
 msgstr "Klarte ikkje fjerna %s"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 #, fuzzy
 msgid "Could not patch file"
 #: methods/rred.cc:219
 #, fuzzy
 msgid "Could not patch file"

diff --git a/po/pl.po b/po/pl.po
index eb20592cd319f316cefbd58a2a4af47d86320e83..5174d6f4fc08e9faa334637efcac1c4a304f6304 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.14\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt 0.7.14\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2008-11-13 17:10+0100\n"
 "Last-Translator: Wiktor Wandachowicz <siryes@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
 "PO-Revision-Date: 2008-11-13 17:10+0100\n"
 "Last-Translator: Wiktor Wandachowicz <siryes@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"


@@ -161,7 +161,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s dla %s skompilowany %s %s\n"
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s dla %s skompilowany %s %s\n"


@@ -661,7 +661,7 @@ msgstr "Nie udało się zmienić nazwy %s na %s"
 msgid "Y"
 msgstr "T"
 
 msgid "Y"
 msgstr "T"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Błąd kompilacji wyrażenia regularnego - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Błąd kompilacji wyrażenia regularnego - %s"


@@ -822,11 +822,11 @@ msgstr "Pakiety powinny zostać usunięte, ale Remove jest wyłączone."
 msgid "Internal error, Ordering didn't finish"
 msgstr "Błąd wewnętrzny, sortowanie niezakończone"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "Błąd wewnętrzny, sortowanie niezakończone"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "Nie udało się zablokować katalogu pobierania"
 
 msgid "Unable to lock the download directory"
 msgstr "Nie udało się zablokować katalogu pobierania"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Nie udało się odczytać list źródeł."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Nie udało się odczytać list źródeł."


@@ -857,7 +857,7 @@ msgstr "Po tej operacji zostanie dodatkowo użyte %sB miejsca na dysku.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Po tej operacji zostanie zwolnione %sB miejsca na dysku.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Po tej operacji zostanie zwolnione %sB miejsca na dysku.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nie udało się ustalić ilości wolnego miejsca w %s"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nie udało się ustalić ilości wolnego miejsca w %s"


@@ -894,7 +894,7 @@ msgstr "Przerwane."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Kontynuować [T/n]? "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "Kontynuować [T/n]? "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Nie udało się pobrać %s  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Nie udało się pobrać %s  %s\n"


@@ -903,7 +903,7 @@ msgstr "Nie udało się pobrać %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Nie udało się pobrać niektórych plików"
 
 msgid "Some files failed to download"
 msgstr "Nie udało się pobrać niektórych plików"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "Ukończono pobieranie w trybie samego pobierania"
 
 msgid "Download complete and in download only mode"
 msgstr "Ukończono pobieranie w trybie samego pobierania"
 


@@ -1002,19 +1002,24 @@ msgstr "Wersja \"%s\" dla \"%s\" nie została znaleziona"
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Wybrano wersję %s (%s) dla %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Wybrano wersję %s (%s) dla %s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "Polecenie update nie wymaga żadnych argumentów"
 
 msgid "The update command takes no arguments"
 msgstr "Polecenie update nie wymaga żadnych argumentów"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "Nie udało się zablokować katalogu list"
 
 msgid "Unable to lock the list directory"
 msgstr "Nie udało się zablokować katalogu list"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Nic nie powinno być usuwane, AutoRemover nie zostanie uruchomiony"
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Nic nie powinno być usuwane, AutoRemover nie zostanie uruchomiony"
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"


@@ -1022,11 +1027,11 @@ msgstr ""
 "Następujące pakiety zostały zainstalowane automatycznie i nie są już więcej "
 "wymagane:"
 
 "Następujące pakiety zostały zainstalowane automatycznie i nie są już więcej "
 "wymagane:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Aby je usunąć należy użyć \"apt-get autoremove\"."
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Aby je usunąć należy użyć \"apt-get autoremove\"."
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1044,43 +1049,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "Następujące informacje mogą pomóc rozwiązać sytuację:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "Następujące informacje mogą pomóc rozwiązać sytuację:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Błąd wewnętrzny, AutoRemover wszystko popsuł"
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Błąd wewnętrzny, AutoRemover wszystko popsuł"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Błąd wewnętrzny, AllUpgrade wszystko popsuło"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Błąd wewnętrzny, AllUpgrade wszystko popsuło"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Nie udało się odnaleźć zadania %s"
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Nie udało się odnaleźć zadania %s"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nie udało się odnaleźć pakietu %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nie udało się odnaleźć pakietu %s"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Uwaga, wybieranie %s za wyrażenie \"%s\"\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Uwaga, wybieranie %s za wyrażenie \"%s\"\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s zaznaczony jako zainstalowany ręcznie.\n"
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s zaznaczony jako zainstalowany ręcznie.\n"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić:"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić:"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1088,7 +1093,7 @@ msgstr ""
 "Niespełnione zależności. Proszę spróbować \"apt-get -f install\" bez "
 "pakietów (lub podać rozwiązanie)."
 
 "Niespełnione zależności. Proszę spróbować \"apt-get -f install\" bez "
 "pakietów (lub podać rozwiązanie)."
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1100,120 +1105,120 @@ msgstr ""
 "w której niektóre pakiety nie zostały jeszcze utworzone lub przeniesione\n"
 "z katalogu Incoming (\"Przychodzące\")."
 
 "w której niektóre pakiety nie zostały jeszcze utworzone lub przeniesione\n"
 "z katalogu Incoming (\"Przychodzące\")."
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "Pakiety są uszkodzone"
 
 msgid "Broken packages"
 msgstr "Pakiety są uszkodzone"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "Zostaną zainstalowane następujące dodatkowe pakiety:"
 
 msgid "The following extra packages will be installed:"
 msgstr "Zostaną zainstalowane następujące dodatkowe pakiety:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "Sugerowane pakiety:"
 
 msgid "Suggested packages:"
 msgstr "Sugerowane pakiety:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "Polecane pakiety:"
 
 msgid "Recommended packages:"
 msgstr "Polecane pakiety:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "Obliczanie aktualizacji..."
 
 msgid "Calculating upgrade... "
 msgstr "Obliczanie aktualizacji..."
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "Nie udało się"
 
 msgid "Failed"
 msgstr "Nie udało się"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "Gotowe"
 
 msgid "Done"
 msgstr "Gotowe"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr "Błąd wewnętrzny, rozwiązywanie problemów wszystko popsuło"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Błąd wewnętrzny, rozwiązywanie problemów wszystko popsuło"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Należy podać przynajmniej jeden pakiet, dla którego mają zostać pobrane "
 "źródła"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Należy podać przynajmniej jeden pakiet, dla którego mają zostać pobrane "
 "źródła"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nie udało się odnaleźć źródła dla pakietu %s"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nie udało się odnaleźć źródła dla pakietu %s"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Pomijanie już pobranego pliku \"%s\"\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Pomijanie już pobranego pliku \"%s\"\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "W %s nie ma wystarczającej ilości wolnego miejsca"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "W %s nie ma wystarczającej ilości wolnego miejsca"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Konieczne pobranie %sB/%sB archiwów źródeł.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Konieczne pobranie %sB/%sB archiwów źródeł.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Konieczne pobranie %sB archiwów źródeł.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Konieczne pobranie %sB archiwów źródeł.\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Pobierz źródło %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Pobierz źródło %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "Nie udało się pobrać niektórych archiwów."
 
 msgid "Failed to fetch some archives."
 msgstr "Nie udało się pobrać niektórych archiwów."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Pomijanie rozpakowania już rozpakowanego źródła w %s\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Pomijanie rozpakowania już rozpakowanego źródła w %s\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Polecenie rozpakowania \"%s\" zawiodło.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Polecenie rozpakowania \"%s\" zawiodło.\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Polecenie budowania \"%s\" zawiodło.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Polecenie budowania \"%s\" zawiodło.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "Proces potomny zawiódł"
 
 msgid "Child process failed"
 msgstr "Proces potomny zawiódł"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Należy podać przynajmniej jeden pakiet, dla którego mają zostać sprawdzone "
 "zależności na czas budowania"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Należy podać przynajmniej jeden pakiet, dla którego mają zostać sprawdzone "
 "zależności na czas budowania"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 "Nie udało się pobrać informacji o zależnościach na czas budowania dla %s"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 "Nie udało się pobrać informacji o zależnościach na czas budowania dla %s"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nie ma zależności czasu budowania.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nie ma zależności czasu budowania.\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "


@@ -1222,7 +1227,7 @@ msgstr ""
 "Zależność %s od %s nie może zostać spełniona, ponieważ nie znaleziono "
 "pakietu %s"
 
 "Zależność %s od %s nie może zostać spełniona, ponieważ nie znaleziono "
 "pakietu %s"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1231,32 +1236,33 @@ msgstr ""
 "Zależność %s od %s nie może zostać spełniona, ponieważ żadna z dostępnych "
 "wersji pakietu %s nie ma odpowiedniej wersji"
 
 "Zależność %s od %s nie może zostać spełniona, ponieważ żadna z dostępnych "
 "wersji pakietu %s nie ma odpowiedniej wersji"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Nie udało się spełnić zależności %s od %s: Zainstalowany pakiet %s jest zbyt "
 "nowy"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Nie udało się spełnić zależności %s od %s: Zainstalowany pakiet %s jest zbyt "
 "nowy"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Nie udało się spełnić zależności %s od %s: %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Nie udało się spełnić zależności %s od %s: %s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Nie udało się spełnić zależności na czas budowania od %s."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Nie udało się spełnić zależności na czas budowania od %s."
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "Nie udało się przetworzyć zależności na czas budowania"
 
 msgid "Failed to process build dependencies"
 msgstr "Nie udało się przetworzyć zależności na czas budowania"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "Obsługiwane moduły:"
 
 msgid "Supported modules:"
 msgstr "Obsługiwane moduły:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1272,7 +1278,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1877,7 +1883,7 @@ msgstr "Przekroczony czas połączenia gniazda danych"
 msgid "Unable to accept connection"
 msgstr "Nie udało się przyjąć połączenia"
 
 msgid "Unable to accept connection"
 msgstr "Nie udało się przyjąć połączenia"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "Nie udało się obliczyć skrótu pliku"
 
 msgid "Problem hashing file"
 msgstr "Nie udało się obliczyć skrótu pliku"
 


@@ -1961,42 +1967,42 @@ msgstr "Coś niewłaściwego stało się przy tłumaczeniu \"%s:%s\" (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Nie udało się połączyć z %s %s:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "Nie udało się połączyć z %s %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Nie udało się uzyskać dostępu do bazy kluczy: \"%s\""
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Nie udało się uzyskać dostępu do bazy kluczy: \"%s\""
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: Lista argumentów Acquire::gpgv::Options zbyt długa. Zakończenie."
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: Lista argumentów Acquire::gpgv::Options zbyt długa. Zakończenie."
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Błąd wewnętrzny: Prawidłowy podpis, ale nie nie udało się ustalić odcisku "
 "klucza?!"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Błąd wewnętrzny: Prawidłowy podpis, ale nie nie udało się ustalić odcisku "
 "klucza?!"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "Napotkano przynajmniej jeden nieprawidłowy podpis."
 
 msgid "At least one invalid signature was encountered."
 msgstr "Napotkano przynajmniej jeden nieprawidłowy podpis."
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Nie udało się uruchomić \"%s\" by zweryfikować podpis (czy gpgv jest "
 "zainstalowane?)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Nie udało się uruchomić \"%s\" by zweryfikować podpis (czy gpgv jest "
 "zainstalowane?)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "Nieznany błąd podczas uruchamiania gpgv"
 
 msgid "Unknown error executing gpgv"
 msgstr "Nieznany błąd podczas uruchamiania gpgv"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "Następujące podpisy były błędne:\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "Następujące podpisy były błędne:\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -2014,80 +2020,80 @@ msgstr "Nie udało się otworzyć potoku dla %s"
 msgid "Read error from %s process"
 msgstr "Błąd odczytu z procesu %s"
 
 msgid "Read error from %s process"
 msgstr "Błąd odczytu z procesu %s"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "Oczekiwanie na nagłówki"
 
 msgid "Waiting for headers"
 msgstr "Oczekiwanie na nagłówki"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Otrzymano pojedynczą linię nagłówka o długości ponad %u znaków"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Otrzymano pojedynczą linię nagłówka o długości ponad %u znaków"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "Nieprawidłowa linia nagłówka"
 
 msgid "Bad header line"
 msgstr "Nieprawidłowa linia nagłówka"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek odpowiedzi"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek odpowiedzi"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek Content-Length"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek Content-Length"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek Content-Range"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek Content-Range"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "Ten serwer HTTP nieprawidłowo obsługuje zakresy (ranges)"
 
 msgid "This HTTP server has broken range support"
 msgstr "Ten serwer HTTP nieprawidłowo obsługuje zakresy (ranges)"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "Nieznany format daty"
 
 msgid "Unknown date format"
 msgstr "Nieznany format daty"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "Operacja select nie powiodła się"
 
 msgid "Select failed"
 msgstr "Operacja select nie powiodła się"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "Przekroczenie czasu połączenia"
 
 msgid "Connection timed out"
 msgstr "Przekroczenie czasu połączenia"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "Błąd przy pisaniu do pliku wyjściowego"
 
 msgid "Error writing to output file"
 msgstr "Błąd przy pisaniu do pliku wyjściowego"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "Błąd przy pisaniu do pliku"
 
 msgid "Error writing to file"
 msgstr "Błąd przy pisaniu do pliku"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "Błąd przy pisaniu do pliku"
 
 msgid "Error writing to the file"
 msgstr "Błąd przy pisaniu do pliku"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "Błąd czytania z serwera: Zdalna strona zamknęła połączenie"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Błąd czytania z serwera: Zdalna strona zamknęła połączenie"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "Błąd czytania z serwera"
 
 msgid "Error reading from server"
 msgstr "Błąd czytania z serwera"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 msgid "Failed to truncate file"
 msgstr "Nie udało się uciąć zawartości pliku %s"
 
 msgid "Failed to truncate file"
 msgstr "Nie udało się uciąć zawartości pliku %s"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "Błędne dane nagłówka"
 
 msgid "Bad header data"
 msgstr "Błędne dane nagłówka"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "Połączenie nie udało się"
 
 msgid "Connection failed"
 msgstr "Połączenie nie udało się"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "Błąd wewnętrzny"
 
 msgid "Internal error"
 msgstr "Błąd wewnętrzny"
 


@@ -2107,7 +2113,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "Nie odnaleziono wyboru %s"
 #, c-format
 msgid "Selection %s not found"
 msgstr "Nie odnaleziono wyboru %s"


@@ -2536,7 +2566,7 @@ msgstr "Nie udało się odnaleźć sterownika metody %s."
 msgid "Method %s did not start correctly"
 msgstr "Metoda %s nie uruchomiła się poprawnie"
 
 msgid "Method %s did not start correctly"
 msgstr "Metoda %s nie uruchomiła się poprawnie"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Proszę włożyć do napędu \"%s\" dysk o nazwie: \"%s\" i nacisnąć enter."
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Proszę włożyć do napędu \"%s\" dysk o nazwie: \"%s\" i nacisnąć enter."


@@ -2901,12 +2931,16 @@ msgstr "Przygotowanie do całkowitego usunięcia %s"
 msgid "Completely removed %s"
 msgstr "Całkowicie usunięto %s"
 
 msgid "Completely removed %s"
 msgstr "Całkowicie usunięto %s"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Nie można zapisać dziennika, openpty() nie powiodło się (/dev/pts nie "
 "zamontowane?)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Nie można zapisać dziennika, openpty() nie powiodło się (/dev/pts nie "
 "zamontowane?)\n"
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Nie udało się nałożyć łatki na plik"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Nie udało się nałożyć łatki na plik"

diff --git a/po/pt.po b/po/pt.po
index 400b949c1591698c66783bb00f85648ef5800052..5d1ef1d634a4cf8c92633b5b52f371e41b99e623 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2008-09-09 20:54+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
 "PO-Revision-Date: 2008-09-09 20:54+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"


@@ -157,7 +157,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para %s compilado em %s %s\n"
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para %s compilado em %s %s\n"


@@ -657,7 +657,7 @@ msgstr "Falhou renomear %s para %s"
 msgid "Y"
 msgstr "S"
 
 msgid "Y"
 msgstr "S"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Erro de compilação de regex - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Erro de compilação de regex - %s"


@@ -818,11 +818,11 @@ msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado."
 msgid "Internal error, Ordering didn't finish"
 msgstr "Erro Interno, Ordering não terminou"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "Erro Interno, Ordering não terminou"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "Impossível criar acesso exclusivo ao directório de downloads"
 
 msgid "Unable to lock the download directory"
 msgstr "Impossível criar acesso exclusivo ao directório de downloads"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "A lista de fontes não pôde ser lida."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "A lista de fontes não pôde ser lida."


@@ -853,7 +853,7 @@ msgstr ""
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Após esta operação, será libertado %sB de espaço em disco.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Após esta operação, será libertado %sB de espaço em disco.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Não foi possível determinar o espaço livre em %s"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Não foi possível determinar o espaço livre em %s"


@@ -890,7 +890,7 @@ msgstr "Abortado."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Deseja continuar [Y/n]? "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "Deseja continuar [Y/n]? "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Falhou obter %s  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Falhou obter %s  %s\n"


@@ -899,7 +899,7 @@ msgstr "Falhou obter %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Falhou o download de alguns ficheiros"
 
 msgid "Some files failed to download"
 msgstr "Falhou o download de alguns ficheiros"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "Download completo e em modo de fazer apenas o download"
 
 msgid "Download complete and in download only mode"
 msgstr "Download completo e em modo de fazer apenas o download"
 


@@ -998,19 +998,24 @@ msgstr "Não foi encontrada a versão '%s' para '%s'"
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Versão seleccionada %s (%s) para %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Versão seleccionada %s (%s) para %s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "O comando update não leva argumentos"
 
 msgid "The update command takes no arguments"
 msgstr "O comando update não leva argumentos"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "Impossível criar acesso exclusivo ao directório de listas"
 
 msgid "Unable to lock the list directory"
 msgstr "Impossível criar acesso exclusivo ao directório de listas"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Não é suposto nós apagarmos coisas, não pode iniciar o AutoRemover"
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Não é suposto nós apagarmos coisas, não pode iniciar o AutoRemover"
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"


@@ -1018,11 +1023,11 @@ msgstr ""
 "Os seguintes pacotes foram instalados automaticamente e já não são "
 "necessários:"
 
 "Os seguintes pacotes foram instalados automaticamente e já não são "
 "necessários:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Utilize 'apt-get autoremove' para os remover."
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Utilize 'apt-get autoremove' para os remover."
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1040,43 +1045,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "A seguinte informação pode ajudar a resolver a situação:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "A seguinte informação pode ajudar a resolver a situação:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Erro Interno, o AutoRemover estragou coisas"
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Erro Interno, o AutoRemover estragou coisas"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Erro Interno, AllUpgrade estragou algo"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Erro Interno, AllUpgrade estragou algo"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Não foi possível encontrar a tarefa %s"
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Não foi possível encontrar a tarefa %s"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossível encontrar o pacote %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossível encontrar o pacote %s"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Note, a seleccionar %s para a expressão regular '%s'\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Note, a seleccionar %s para a expressão regular '%s'\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s está definido para ser instalado manualmente.\n"
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s está definido para ser instalado manualmente.\n"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Você deve querer executar `apt-get -f install' para corrigir estes:"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Você deve querer executar `apt-get -f install' para corrigir estes:"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1084,7 +1089,7 @@ msgstr ""
 "Dependências não satisfeitas. Tente `apt-get -f install' sem nenhum pacote "
 "(ou especifique uma solução)."
 
 "Dependências não satisfeitas. Tente `apt-get -f install' sem nenhum pacote "
 "(ou especifique uma solução)."
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1096,119 +1101,119 @@ msgstr ""
 "distribuição unstable em que alguns pacotes pedidos ainda não foram \n"
 "criados ou foram movidos do Incoming."
 
 "distribuição unstable em que alguns pacotes pedidos ainda não foram \n"
 "criados ou foram movidos do Incoming."
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "Pacotes estragados"
 
 msgid "Broken packages"
 msgstr "Pacotes estragados"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "Os seguintes pacotes extra serão instalados:"
 
 msgid "The following extra packages will be installed:"
 msgstr "Os seguintes pacotes extra serão instalados:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "Pacotes sugeridos:"
 
 msgid "Suggested packages:"
 msgstr "Pacotes sugeridos:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "Pacotes recomendados:"
 
 msgid "Recommended packages:"
 msgstr "Pacotes recomendados:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "A calcular a actualização... "
 
 msgid "Calculating upgrade... "
 msgstr "A calcular a actualização... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "Falhou"
 
 msgid "Failed"
 msgstr "Falhou"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "Pronto"
 
 msgid "Done"
 msgstr "Pronto"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr "Erro Interno, o solucionador de problemas estragou coisas"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Erro Interno, o solucionador de problemas estragou coisas"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr "Tem de especificar pelo menos um pacote para obter o código fonte de"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "Tem de especificar pelo menos um pacote para obter o código fonte de"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Não foi possível encontrar um pacote de código fonte para %s"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Não foi possível encontrar um pacote de código fonte para %s"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "A saltar o ficheiro '%s', já tinha sido feito download'\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "A saltar o ficheiro '%s', já tinha sido feito download'\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Você não possui espaço livre suficiente em %s"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Você não possui espaço livre suficiente em %s"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "É necessário obter %sB/%sB de arquivos de código fonte.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "É necessário obter %sB/%sB de arquivos de código fonte.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "É necessário obter %sB de arquivos de código fonte.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "É necessário obter %sB de arquivos de código fonte.\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obter código fonte %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obter código fonte %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "Falhou obter alguns arquivos."
 
 msgid "Failed to fetch some archives."
 msgstr "Falhou obter alguns arquivos."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "A saltar a descompactação do pacote de código fonte já descompactado em %s\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "A saltar a descompactação do pacote de código fonte já descompactado em %s\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "O comando de descompactação '%s' falhou.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "O comando de descompactação '%s' falhou.\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "O comando de compilação '%s' falhou.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "O comando de compilação '%s' falhou.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "O processo filho falhou"
 
 msgid "Child process failed"
 msgstr "O processo filho falhou"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Deve especificar pelo menos um pacote para verificar as dependências de "
 "compilação"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Deve especificar pelo menos um pacote para verificar as dependências de "
 "compilação"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 "Não foi possível obter informações de dependências de compilação para %s"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 "Não foi possível obter informações de dependências de compilação para %s"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s não tem dependências de compilação.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s não tem dependências de compilação.\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "


@@ -1217,7 +1222,7 @@ msgstr ""
 "a dependência de %s para %s não pôde ser satisfeita porque o pacote %s não "
 "pôde ser encontrado"
 
 "a dependência de %s para %s não pôde ser satisfeita porque o pacote %s não "
 "pôde ser encontrado"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1226,32 +1231,33 @@ msgstr ""
 "a dependência de %s para %s não pode ser satisfeita porque nenhuma versão "
 "disponível do pacote %s pode satisfazer os requisitos de versão"
 
 "a dependência de %s para %s não pode ser satisfeita porque nenhuma versão "
 "disponível do pacote %s pode satisfazer os requisitos de versão"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Falha ao satisfazer a dependência %s para %s: O pacote instalado %s é "
 "demasiado novo"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Falha ao satisfazer a dependência %s para %s: O pacote instalado %s é "
 "demasiado novo"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Falha ao satisfazer a dependência %s para %s: %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Falha ao satisfazer a dependência %s para %s: %s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Não foi possível satisfazer as dependências de compilação para %s."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Não foi possível satisfazer as dependências de compilação para %s."
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "Falhou processar as dependências de compilação"
 
 msgid "Failed to process build dependencies"
 msgstr "Falhou processar as dependências de compilação"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "Módulos Suportados:"
 
 msgid "Supported modules:"
 msgstr "Módulos Suportados:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1267,7 +1273,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1872,7 +1878,7 @@ msgstr "Ligação de socket de dados expirou"
 msgid "Unable to accept connection"
 msgstr "Impossível aceitar ligação"
 
 msgid "Unable to accept connection"
 msgstr "Impossível aceitar ligação"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "Problema ao calcular o hash do ficheiro"
 
 msgid "Problem hashing file"
 msgstr "Problema ao calcular o hash do ficheiro"
 


@@ -1956,43 +1962,43 @@ msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Não foi possível ligar a %s %s:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "Não foi possível ligar a %s %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Não foi possível aceder à 'keyring': '%s'"
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Não foi possível aceder à 'keyring': '%s'"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: A lista de argumentos de Acquire::gpgv::Options é demasiado longa. A sair."
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: A lista de argumentos de Acquire::gpgv::Options é demasiado longa. A sair."
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Erro interno: Assinatura válida, mas não foi possível determinar a impressão "
 "digital da chave?!"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Erro interno: Assinatura válida, mas não foi possível determinar a impressão "
 "digital da chave?!"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "Pelo menos uma assinatura inválida foi encontrada."
 
 msgid "At least one invalid signature was encountered."
 msgstr "Pelo menos uma assinatura inválida foi encontrada."
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Não foi possível executar '%s' para verificar a assinatura (o gpgv está "
 "instalado?)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Não foi possível executar '%s' para verificar a assinatura (o gpgv está "
 "instalado?)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "Erro desconhecido ao executar gpgv"
 
 msgid "Unknown error executing gpgv"
 msgstr "Erro desconhecido ao executar gpgv"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "As seguintes assinaturas eram inválidas:\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "As seguintes assinaturas eram inválidas:\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -2010,80 +2016,80 @@ msgstr "Não foi possível abrir pipe para %s"
 msgid "Read error from %s process"
 msgstr "Erro de leitura do processo %s"
 
 msgid "Read error from %s process"
 msgstr "Erro de leitura do processo %s"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "A aguardar por cabeçalhos"
 
 msgid "Waiting for headers"
 msgstr "A aguardar por cabeçalhos"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "Linha de cabeçalho errada"
 
 msgid "Bad header line"
 msgstr "Linha de cabeçalho errada"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "O servidor HTTP enviou um cabeçalho de resposta inválido"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "O servidor HTTP enviou um cabeçalho de resposta inválido"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "O servidor HTTP enviou um cabeçalho Content-Length inválido"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "O servidor HTTP enviou um cabeçalho Content-Length inválido"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "O servidor HTTP enviou um cabeçalho Content-Range inválido"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "O servidor HTTP enviou um cabeçalho Content-Range inválido"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "Este servidor HTTP possui suporte de range errado"
 
 msgid "This HTTP server has broken range support"
 msgstr "Este servidor HTTP possui suporte de range errado"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "Formato de data desconhecido"
 
 msgid "Unknown date format"
 msgstr "Formato de data desconhecido"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "A selecção falhou"
 
 msgid "Select failed"
 msgstr "A selecção falhou"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "O tempo da ligação expirou"
 
 msgid "Connection timed out"
 msgstr "O tempo da ligação expirou"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "Erro ao escrever para o ficheiro de saída"
 
 msgid "Error writing to output file"
 msgstr "Erro ao escrever para o ficheiro de saída"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "Erro ao escrever para ficheiro"
 
 msgid "Error writing to file"
 msgstr "Erro ao escrever para ficheiro"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "Erro ao escrever para o ficheiro"
 
 msgid "Error writing to the file"
 msgstr "Erro ao escrever para o ficheiro"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "Erro ao ler do servidor. O lado remoto fechou a ligação"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Erro ao ler do servidor. O lado remoto fechou a ligação"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "Erro ao ler do servidor"
 
 msgid "Error reading from server"
 msgstr "Erro ao ler do servidor"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 msgid "Failed to truncate file"
 msgstr "Falhou truncar o ficheiro"
 
 msgid "Failed to truncate file"
 msgstr "Falhou truncar o ficheiro"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "Dados de cabeçalho errados"
 
 msgid "Bad header data"
 msgstr "Dados de cabeçalho errados"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "A ligação falhou"
 
 msgid "Connection failed"
 msgstr "A ligação falhou"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "Erro interno"
 
 msgid "Internal error"
 msgstr "Erro interno"
 


@@ -2103,7 +2109,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "A selecção %s não foi encontrada"
 #, c-format
 msgid "Selection %s not found"
 msgstr "A selecção %s não foi encontrada"


@@ -2538,7 +2568,7 @@ msgstr "O driver do método %s não pôde ser encontrado."
 msgid "Method %s did not start correctly"
 msgstr "Método %s não iniciou corretamente"
 
 msgid "Method %s did not start correctly"
 msgstr "Método %s não iniciou corretamente"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""


@@ -2916,12 +2946,16 @@ msgstr "A preparar para remover completamente %s"
 msgid "Completely removed %s"
 msgstr "Remoção completa de %s"
 
 msgid "Completely removed %s"
 msgstr "Remoção completa de %s"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Não é possível escrever o registo (log), openpty() falhou (/dev/pts não está "
 "montado?)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Não é possível escrever o registo (log), openpty() falhou (/dev/pts não está "
 "montado?)\n"
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Não foi possível aplicar o 'patch' ao ficheiro"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Não foi possível aplicar o 'patch' ao ficheiro"

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 105727002fe448210c1f14db15fca9cf75330fa6..c524bcd9e021e65b18fcc07c6fb3b1a82b5deaf6 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2008-11-17 02:33-0200\n"
 "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
 "PO-Revision-Date: 2008-11-17 02:33-0200\n"
 "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."


@@ -159,7 +159,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para %s compilado em %s %s\n"
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para %s compilado em %s %s\n"


@@ -662,7 +662,7 @@ msgstr "Falhou ao renomear %s para %s"
 msgid "Y"
 msgstr "S"
 
 msgid "Y"
 msgstr "S"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Erro de compilação de regex - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Erro de compilação de regex - %s"


@@ -824,11 +824,11 @@ msgstr "Pacotes precisam ser removidos mas a remoção está desabilitada."
 msgid "Internal error, Ordering didn't finish"
 msgstr "Erro interno, Ordenação não finalizou"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "Erro interno, Ordenação não finalizou"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "Impossível criar trava no diretório de download"
 
 msgid "Unable to lock the download directory"
 msgstr "Impossível criar trava no diretório de download"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "A lista de fontes não pode ser lida."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "A lista de fontes não pode ser lida."


@@ -860,7 +860,7 @@ msgstr ""
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Depois desta operação, %sB de espaço em disco serão liberados.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Depois desta operação, %sB de espaço em disco serão liberados.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Não foi possível determinar o espaço livre em %s"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Não foi possível determinar o espaço livre em %s"


@@ -897,7 +897,7 @@ msgstr "Abortar."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Você quer continuar [S/n]? "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "Você quer continuar [S/n]? "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Falhou ao buscar %s  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Falhou ao buscar %s  %s\n"


@@ -906,7 +906,7 @@ msgstr "Falhou ao buscar %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Alguns arquivos falharam ao baixar"
 
 msgid "Some files failed to download"
 msgstr "Alguns arquivos falharam ao baixar"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "Baixar completo e no modo somente baixar (\"download only\")"
 
 msgid "Download complete and in download only mode"
 msgstr "Baixar completo e no modo somente baixar (\"download only\")"
 


@@ -1003,19 +1003,24 @@ msgstr "Versão '%s' para '%s' não foi encontrada"
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Versão selecionada %s (%s) para %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Versão selecionada %s (%s) para %s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "O comando update não leva argumentos"
 
 msgid "The update command takes no arguments"
 msgstr "O comando update não leva argumentos"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "Impossível criar trava no diretório de listas"
 
 msgid "Unable to lock the list directory"
 msgstr "Impossível criar trava no diretório de listas"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Nós não deveríamos apagar coisas, impossível iniciar AutoRemover"
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Nós não deveríamos apagar coisas, impossível iniciar AutoRemover"
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"


@@ -1023,11 +1028,11 @@ msgstr ""
 "Os seguintes pacotes foram automaticamente instalados e não são mais "
 "requeridos:"
 
 "Os seguintes pacotes foram automaticamente instalados e não são mais "
 "requeridos:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Use 'apt-get autoremove' para removê-los."
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Use 'apt-get autoremove' para removê-los."
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1045,43 +1050,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "A informação a seguir pode ajudar a resolver a situação:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "A informação a seguir pode ajudar a resolver a situação:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Erro Interno, o AutoRemover quebrou coisas"
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Erro Interno, o AutoRemover quebrou coisas"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Erro interno, AllUpgrade quebrou coisas"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Erro interno, AllUpgrade quebrou coisas"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Impossível achar tarefa %s"
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Impossível achar tarefa %s"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossível achar pacote %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossível achar pacote %s"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Nota, selecionando %s para expressão regular '%s'\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Nota, selecionando %s para expressão regular '%s'\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s configurado para instalar manualmente.\n"
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s configurado para instalar manualmente.\n"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Você deve querer executar 'apt-get -f install' para corrigí-los:"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Você deve querer executar 'apt-get -f install' para corrigí-los:"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1089,7 +1094,7 @@ msgstr ""
 "Dependências desencontradas. Tente 'apt-get -f install' sem nenhum pacote "
 "(ou especifique uma solução)."
 
 "Dependências desencontradas. Tente 'apt-get -f install' sem nenhum pacote "
 "(ou especifique uma solução)."
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1101,117 +1106,117 @@ msgstr ""
 "distribuição instável, que alguns pacotes requeridos não foram\n"
 "criados ainda ou foram retirados da \"Incoming\"."
 
 "distribuição instável, que alguns pacotes requeridos não foram\n"
 "criados ainda ou foram retirados da \"Incoming\"."
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "Pacotes quebrados"
 
 msgid "Broken packages"
 msgstr "Pacotes quebrados"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "Os pacotes extra a seguir serão instalados:"
 
 msgid "The following extra packages will be installed:"
 msgstr "Os pacotes extra a seguir serão instalados:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "Pacotes sugeridos:"
 
 msgid "Suggested packages:"
 msgstr "Pacotes sugeridos:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "Pacotes recomendados:"
 
 msgid "Recommended packages:"
 msgstr "Pacotes recomendados:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "Calculando atualização... "
 
 msgid "Calculating upgrade... "
 msgstr "Calculando atualização... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "Falhou"
 
 msgid "Failed"
 msgstr "Falhou"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "Pronto"
 
 msgid "Done"
 msgstr "Pronto"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr "Erro interno, o solucionador de problemas quebrou coisas"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Erro interno, o solucionador de problemas quebrou coisas"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Impossível encontrar um pacote fonte para %s"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Impossível encontrar um pacote fonte para %s"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Pulando arquivo já baixado '%s'\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Pulando arquivo já baixado '%s'\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Você não possui espaço livre suficiente em %s"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Você não possui espaço livre suficiente em %s"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Preciso obter %sB/%sB de arquivos fonte.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Preciso obter %sB/%sB de arquivos fonte.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Preciso obter %sB de arquivos fonte.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Preciso obter %sB de arquivos fonte.\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obter fonte %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obter fonte %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "Falhou ao buscar alguns arquivos."
 
 msgid "Failed to fetch some archives."
 msgstr "Falhou ao buscar alguns arquivos."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Pulando o desempacotamento de fontes já desempacotados em %s\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Pulando o desempacotamento de fontes já desempacotados em %s\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Comando de desempacotamento '%s' falhou.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Comando de desempacotamento '%s' falhou.\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Comando de construção '%s' falhou.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Comando de construção '%s' falhou.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "Processo filho falhou"
 
 msgid "Child process failed"
 msgstr "Processo filho falhou"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Deve-se especificar pelo menos um pacote para que se cheque as dependências "
 "de construção"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Deve-se especificar pelo menos um pacote para que se cheque as dependências "
 "de construção"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Impossível conseguir informações de dependência de construção para %s"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Impossível conseguir informações de dependência de construção para %s"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s não tem dependências de construção.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s não tem dependências de construção.\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "


@@ -1220,7 +1225,7 @@ msgstr ""
 "a dependência de %s por %s não pode ser satisfeita porque o pacote %s não "
 "pode ser encontrado"
 
 "a dependência de %s por %s não pode ser satisfeita porque o pacote %s não "
 "pode ser encontrado"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1229,32 +1234,33 @@ msgstr ""
 "a dependência de %s por %s não pode ser satisfeita porque nenhuma versão "
 "disponível do pacote %s pode satisfazer os requerimentos de versão"
 
 "a dependência de %s por %s não pode ser satisfeita porque nenhuma versão "
 "disponível do pacote %s pode satisfazer os requerimentos de versão"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Falhou ao satisfazer a dependência de %s por %s: Pacote instalado %s é muito "
 "novo"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Falhou ao satisfazer a dependência de %s por %s: Pacote instalado %s é muito "
 "novo"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Falhou ao satisfazer a dependência de %s por %s: %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Falhou ao satisfazer a dependência de %s por %s: %s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Não foi possível satisfazer as dependências de compilação para %s."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Não foi possível satisfazer as dependências de compilação para %s."
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "Falhou ao processar as dependências de construção"
 
 msgid "Failed to process build dependencies"
 msgstr "Falhou ao processar as dependências de construção"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "Módulos para os quais há suporte:"
 
 msgid "Supported modules:"
 msgstr "Módulos para os quais há suporte:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1270,7 +1276,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1875,7 +1881,7 @@ msgstr "Conexão do socket de dados expirou"
 msgid "Unable to accept connection"
 msgstr "Impossível aceitar conexão"
 
 msgid "Unable to accept connection"
 msgstr "Impossível aceitar conexão"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "Problema criando o hash do arquivo"
 
 msgid "Problem hashing file"
 msgstr "Problema criando o hash do arquivo"
 


@@ -1959,43 +1965,43 @@ msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Impossível conectar em %s %s:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "Impossível conectar em %s %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Não foi possível acessar o chaveiro: '%s'"
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Não foi possível acessar o chaveiro: '%s'"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: Lista de argumentos de Acquire::gpgv::Options muito extensa. Saindo."
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: Lista de argumentos de Acquire::gpgv::Options muito extensa. Saindo."
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Erro interno: Assinatura boa, mas não foi possível determinar a impressão "
 "digital da chave?!"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Erro interno: Assinatura boa, mas não foi possível determinar a impressão "
 "digital da chave?!"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "Ao menos uma assinatura inválida foi encontrada."
 
 msgid "At least one invalid signature was encountered."
 msgstr "Ao menos uma assinatura inválida foi encontrada."
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Não foi possível executar '%s' para verificar a assinatura (o gpgv está "
 "instalado?)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Não foi possível executar '%s' para verificar a assinatura (o gpgv está "
 "instalado?)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "Erro desconhecido executando gpgv"
 
 msgid "Unknown error executing gpgv"
 msgstr "Erro desconhecido executando gpgv"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "As seguintes assinaturas eram inválidas:\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "As seguintes assinaturas eram inválidas:\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -2013,80 +2019,80 @@ msgstr "Não foi possível abrir \"pipe\" para %s"
 msgid "Read error from %s process"
 msgstr "Erro de leitura do processo %s"
 
 msgid "Read error from %s process"
 msgstr "Erro de leitura do processo %s"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "Aguardando por cabeçalhos"
 
 msgid "Waiting for headers"
 msgstr "Aguardando por cabeçalhos"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "Linha de cabeçalho ruim"
 
 msgid "Bad header line"
 msgstr "Linha de cabeçalho ruim"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "O servidor HTTP enviou um cabeçalho de resposta inválido"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "O servidor HTTP enviou um cabeçalho de resposta inválido"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "O servidor HTTP enviou um cabeçalho \"Content-Length\" inválido"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "O servidor HTTP enviou um cabeçalho \"Content-Length\" inválido"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "O servidor HTTP enviou um cabeçalho \"Content-Range\" inválido"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "O servidor HTTP enviou um cabeçalho \"Content-Range\" inválido"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "Este servidor HTTP possui suporte a \"range\" quebrado"
 
 msgid "This HTTP server has broken range support"
 msgstr "Este servidor HTTP possui suporte a \"range\" quebrado"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "Formato de data desconhecido"
 
 msgid "Unknown date format"
 msgstr "Formato de data desconhecido"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "Seleção falhou"
 
 msgid "Select failed"
 msgstr "Seleção falhou"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "Conexão expirou"
 
 msgid "Connection timed out"
 msgstr "Conexão expirou"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "Erro escrevendo para arquivo de saída"
 
 msgid "Error writing to output file"
 msgstr "Erro escrevendo para arquivo de saída"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "Erro escrevendo para arquivo"
 
 msgid "Error writing to file"
 msgstr "Erro escrevendo para arquivo"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "Erro escrevendo para o arquivo"
 
 msgid "Error writing to the file"
 msgstr "Erro escrevendo para o arquivo"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "Erro lendo do servidor"
 
 msgid "Error reading from server"
 msgstr "Erro lendo do servidor"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 msgid "Failed to truncate file"
 msgstr "Falhou ao truncar arquivo"
 
 msgid "Failed to truncate file"
 msgstr "Falhou ao truncar arquivo"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "Dados de cabeçalho ruins"
 
 msgid "Bad header data"
 msgstr "Dados de cabeçalho ruins"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "Conexão falhou"
 
 msgid "Connection failed"
 msgstr "Conexão falhou"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "Erro interno"
 
 msgid "Internal error"
 msgstr "Erro interno"
 


@@ -2106,7 +2112,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "Seleção %s não encontrada"
 #, c-format
 msgid "Selection %s not found"
 msgstr "Seleção %s não encontrada"


@@ -2538,7 +2568,7 @@ msgstr "O driver do método %s não pode ser encontrado."
 msgid "Method %s did not start correctly"
 msgstr "Método %s não iniciou corretamente"
 
 msgid "Method %s did not start correctly"
 msgstr "Método %s não iniciou corretamente"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""


@@ -2913,10 +2943,14 @@ msgstr "Preparando para remover completamente %s"
 msgid "Completely removed %s"
 msgstr "%s completamente removido"
 
 msgid "Completely removed %s"
 msgstr "%s completamente removido"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Impossível escrever log, openpty() falhou (/dev/pts não montado?)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Impossível escrever log, openpty() falhou (/dev/pts não montado?)\n"
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Não foi possível aplicar o patch"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Não foi possível aplicar o patch"

diff --git a/po/ro.po b/po/ro.po
index 755e59cc0405e07a7590d6f201511e3a8da185a7..ded8d6e26e4bcdb73e88a01d4d3d466be2cbfaa9 100644 (file)
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ro\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: ro\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2008-11-15 02:21+0200\n"
 "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
 "PO-Revision-Date: 2008-11-15 02:21+0200\n"
 "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"


@@ -160,7 +160,7 @@ msgstr "        %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s pentru %s compilat la %s %s\n"
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s pentru %s compilat la %s %s\n"


@@ -664,7 +664,7 @@ msgstr "Eșec la redenumirea lui %s în %s"
 msgid "Y"
 msgstr "Y"
 
 msgid "Y"
 msgstr "Y"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Eroare de compilare expresie regulată - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Eroare de compilare expresie regulată - %s"


@@ -825,11 +825,11 @@ msgstr "Pachete trebuiesc șterse dar ștergerea este dezactivată."
 msgid "Internal error, Ordering didn't finish"
 msgstr "Eroare internă, Ordering nu s-a terminat"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "Eroare internă, Ordering nu s-a terminat"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "Nu s-a putut bloca directorul de descărcare"
 
 msgid "Unable to lock the download directory"
 msgstr "Nu s-a putut bloca directorul de descărcare"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Lista surselor nu poate fi citită."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Lista surselor nu poate fi citită."


@@ -859,7 +859,7 @@ msgstr "După această operație vor fi folosiți din disc încă %sB.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "După această operație se vor elibera %sB din spațiul ocupat pe disc.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "După această operație se vor elibera %sB din spațiul ocupat pe disc.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "N-am putut determina spațiul disponibil în %s"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "N-am putut determina spațiul disponibil în %s"


@@ -897,7 +897,7 @@ msgstr "Renunțare."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vreți să continuați [Y/n]? "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vreți să continuați [Y/n]? "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Eșec la aducerea lui %s  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Eșec la aducerea lui %s  %s\n"


@@ -906,7 +906,7 @@ msgstr "Eșec la aducerea lui %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Descărcarea unor fișiere a eșuat"
 
 msgid "Some files failed to download"
 msgstr "Descărcarea unor fișiere a eșuat"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "Descărcare completă și în modul doar descărcare"
 
 msgid "Download complete and in download only mode"
 msgstr "Descărcare completă și în modul doar descărcare"
 


@@ -1003,30 +1003,35 @@ msgstr "Versiunea '%s' pentru '%s' n-a fost găsită"
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Versiune selectată %s (%s) pentru %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Versiune selectată %s (%s) pentru %s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "Comanda de actualizare nu are argumente"
 
 msgid "The update command takes no arguments"
 msgstr "Comanda de actualizare nu are argumente"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "Nu pot încuia directorul cu lista"
 
 # XXX: orice sugestie este bine-venită
 msgid "Unable to lock the list directory"
 msgstr "Nu pot încuia directorul cu lista"
 
 # XXX: orice sugestie este bine-venită

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Nu este voie să se șteargă lucruri, nu se poate porni AutoRemover"
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Nu este voie să se șteargă lucruri, nu se poate porni AutoRemover"
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
 
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Folosiți 'apt-get autoremove' pentru a le șterge."
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Folosiți 'apt-get autoremove' pentru a le șterge."
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1045,43 +1050,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "Următoarele informații ar putea să vă ajute la rezolvarea situației:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "Următoarele informații ar putea să vă ajute la rezolvarea situației:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Eroare internă, AutoRemover a deteriorat diverse chestiuni"
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Eroare internă, AutoRemover a deteriorat diverse chestiuni"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Nu s-a putut găsi sarcina %s"
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Nu s-a putut găsi sarcina %s"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nu pot găsi pachetul %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nu pot găsi pachetul %s"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Notă, selectare %s pentru expresie regulată '%s'\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Notă, selectare %s pentru expresie regulată '%s'\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s este marcat ca fiind instalat manual.\n"
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s este marcat ca fiind instalat manual.\n"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Ați putea porni 'apt-get -f install' pentru a corecta acestea:"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Ați putea porni 'apt-get -f install' pentru a corecta acestea:"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1089,7 +1094,7 @@ msgstr ""
 "Dependențe neîndeplinite. Încercați 'apt-get -f install' fără nici un pachet "
 "(sau oferiți o altă soluție)."
 
 "Dependențe neîndeplinite. Încercați 'apt-get -f install' fără nici un pachet "
 "(sau oferiți o altă soluție)."
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1102,118 +1107,118 @@ msgstr ""
 "pachete\n"
 "cerute n-au fost create încă sau au fost mutate din Incoming."
 
 "pachete\n"
 "cerute n-au fost create încă sau au fost mutate din Incoming."
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "Pachete deteriorate"
 
 msgid "Broken packages"
 msgstr "Pachete deteriorate"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "Următoarele extra pachete vor fi instalate:"
 
 msgid "The following extra packages will be installed:"
 msgstr "Următoarele extra pachete vor fi instalate:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "Pachete sugerate:"
 
 msgid "Suggested packages:"
 msgstr "Pachete sugerate:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "Pachete recomandate:"
 
 msgid "Recommended packages:"
 msgstr "Pachete recomandate:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "Calculez înnoirea... "
 
 msgid "Calculating upgrade... "
 msgstr "Calculez înnoirea... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "Eșec"
 
 msgid "Failed"
 msgstr "Eșec"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "Terminat"
 
 msgid "Done"
 msgstr "Terminat"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr "Trebuie specificat cel puțin un pachet pentru a-i aduce sursa"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "Trebuie specificat cel puțin un pachet pentru a-i aduce sursa"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nu s-a putut găsi o sursă pachet pentru %s"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nu s-a putut găsi o sursă pachet pentru %s"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Sar peste fișierul deja descărcat '%s'\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Sar peste fișierul deja descărcat '%s'\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Nu aveți suficient spațiu în %s"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Nu aveți suficient spațiu în %s"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Este nevoie să descărcați %sB/%sB din arhivele surselor.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Este nevoie să descărcați %sB/%sB din arhivele surselor.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Este nevoie să descărcați %sB din arhivele surselor.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Este nevoie să descărcați %sB din arhivele surselor.\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Aducere sursa %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Aducere sursa %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "Eșec la aducerea unor arhive."
 
 msgid "Failed to fetch some archives."
 msgstr "Eșec la aducerea unor arhive."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Sar peste despachetarea sursei deja despachetate în %s\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Sar peste despachetarea sursei deja despachetate în %s\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Comanda de despachetare '%s' eșuată.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Comanda de despachetare '%s' eșuată.\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Comanda de construire '%s' eșuată.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Comanda de construire '%s' eșuată.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "Procesul copil a eșuat"
 
 msgid "Child process failed"
 msgstr "Procesul copil a eșuat"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Trebuie specificat cel puțin un pachet pentru a-i verifica dependențele "
 "înglobate"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Trebuie specificat cel puțin un pachet pentru a-i verifica dependențele "
 "înglobate"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nu pot prelua informațiile despre dependențele înglobate ale lui %s"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nu pot prelua informațiile despre dependențele înglobate ale lui %s"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nu are dependențe înglobate.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nu are dependențe înglobate.\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "


@@ -1222,7 +1227,7 @@ msgstr ""
 "Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu "
 "poate fi găsit"
 
 "Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu "
 "poate fi găsit"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1231,32 +1236,33 @@ msgstr ""
 "Dependența lui %s de %s nu poate fi satisfăcută deoarece nici o versiune "
 "disponibilă a pachetului %s nu poate satisface versiunile cerute"
 
 "Dependența lui %s de %s nu poate fi satisfăcută deoarece nici o versiune "
 "disponibilă a pachetului %s nu poate satisface versiunile cerute"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Eșec la satisfacerea dependenței %s pentru %s: Pachetul instalat %s este "
 "prea nou"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Eșec la satisfacerea dependenței %s pentru %s: Pachetul instalat %s este "
 "prea nou"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Eșec la satisfacerea dependenței %s pentru %s: %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Eșec la satisfacerea dependenței %s pentru %s: %s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Dependențele înglobate pentru %s nu pot fi satisfăcute."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Dependențele înglobate pentru %s nu pot fi satisfăcute."
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "Eșec la prelucrarea dependențelor de compilare"
 
 msgid "Failed to process build dependencies"
 msgstr "Eșec la prelucrarea dependențelor de compilare"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "Module suportate:"
 
 msgid "Supported modules:"
 msgstr "Module suportate:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1272,7 +1278,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1884,7 +1890,7 @@ msgstr "Timpul de conectare la socket-ul de date expirat"
 msgid "Unable to accept connection"
 msgstr "Nu s-a putut accepta conexiune"
 
 msgid "Unable to accept connection"
 msgstr "Nu s-a putut accepta conexiune"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "Problemă la calcularea dispersiei pentru fișierul"
 
 msgid "Problem hashing file"
 msgstr "Problemă la calcularea dispersiei pentru fișierul"
 


@@ -1969,42 +1975,42 @@ msgstr "S-a întâmplat ceva „necurat” la rezolvarea lui „%s:%s” (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Nu s-a putut realiza conexiunea cu %s %s:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "Nu s-a putut realiza conexiunea cu %s %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Nu s-a putut accesa inelul de chei: '%s'"
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Nu s-a putut accesa inelul de chei: '%s'"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: Lista de argumente din Acquire::gpgv::Options este prea lungă. Se iese."
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: Lista de argumente din Acquire::gpgv::Options este prea lungă. Se iese."
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Eroare internă: Semnătură corespunzătoare, dar nu s-a putut determina "
 "amprenta digitale a cheii?!"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Eroare internă: Semnătură corespunzătoare, dar nu s-a putut determina "
 "amprenta digitale a cheii?!"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "Cel puțin o semnătură nevalidă a fost întâlnită."
 
 msgid "At least one invalid signature was encountered."
 msgstr "Cel puțin o semnătură nevalidă a fost întâlnită."
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Nu s-a putut executa „%s” pentru verificarea semnăturii (gpgv este instalat?)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Nu s-a putut executa „%s” pentru verificarea semnăturii (gpgv este instalat?)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "Eroare necunoscută în timp ce se execută gpgv"
 
 msgid "Unknown error executing gpgv"
 msgstr "Eroare necunoscută în timp ce se execută gpgv"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "Următoarele semnături nu au fost valide:\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "Următoarele semnături nu au fost valide:\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -2022,81 +2028,81 @@ msgstr "Nu s-a putut deschide conexiunea pentru %s"
 msgid "Read error from %s process"
 msgstr "Eroare de citire din procesul %s"
 
 msgid "Read error from %s process"
 msgstr "Eroare de citire din procesul %s"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "În așteptarea antetelor"
 
 msgid "Waiting for headers"
 msgstr "În așteptarea antetelor"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "S-a primit o singură linie de antet de peste %u caractere"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "S-a primit o singură linie de antet de peste %u caractere"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "Linie de antet necorespunzătoare"
 
 msgid "Bad header line"
 msgstr "Linie de antet necorespunzătoare"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "Serverul HTTP a trimis un antet de răspuns necorespunzător"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Serverul HTTP a trimis un antet de răspuns necorespunzător"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Serverul HTTP a trimis un antet Content-Length necorespunzător"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Serverul HTTP a trimis un antet Content-Length necorespunzător"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Serverul HTTP a trimis un antet zonă de conținut necorespunzător"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Serverul HTTP a trimis un antet zonă de conținut necorespunzător"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "Acest server HTTP are un suport defect de intervale"
 
 msgid "This HTTP server has broken range support"
 msgstr "Acest server HTTP are un suport defect de intervale"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "Format dată necunoscut"
 
 msgid "Unknown date format"
 msgstr "Format dată necunoscut"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "Selecția a eșuat"
 
 msgid "Select failed"
 msgstr "Selecția a eșuat"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "Timp de conectare expirat"
 
 msgid "Connection timed out"
 msgstr "Timp de conectare expirat"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "Eroare la scrierea fișierului de rezultat"
 
 msgid "Error writing to output file"
 msgstr "Eroare la scrierea fișierului de rezultat"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "Eroare la scrierea în fișier"
 
 msgid "Error writing to file"
 msgstr "Eroare la scrierea în fișier"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "Eroare la scrierea în fișierul"
 
 msgid "Error writing to the file"
 msgstr "Eroare la scrierea în fișierul"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Eroare la citirea de la server. Conexiunea a fost închisă de la distanță"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Eroare la citirea de la server. Conexiunea a fost închisă de la distanță"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "Eroare la citirea de la server"
 
 msgid "Error reading from server"
 msgstr "Eroare la citirea de la server"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 msgid "Failed to truncate file"
 msgstr "Eșec la trunchierea fișierului"
 
 msgid "Failed to truncate file"
 msgstr "Eșec la trunchierea fișierului"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "Antet de date necorespunzător"
 
 msgid "Bad header data"
 msgstr "Antet de date necorespunzător"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "Conectare eșuată"
 
 msgid "Connection failed"
 msgstr "Conectare eșuată"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "Eroare internă"
 
 msgid "Internal error"
 msgstr "Eroare internă"
 


@@ -2116,7 +2122,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "Selecția %s nu a fost găsită"
 #, c-format
 msgid "Selection %s not found"
 msgstr "Selecția %s nu a fost găsită"


@@ -2546,7 +2576,7 @@ msgstr "Metoda driver %s nu poate fi găsită."
 msgid "Method %s did not start correctly"
 msgstr "Metoda %s nu s-a lansat corect"
 
 msgid "Method %s did not start correctly"
 msgstr "Metoda %s nu s-a lansat corect"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""


@@ -2923,11 +2953,15 @@ msgstr "Se pregătește ștergerea completă a %s"
 msgid "Completely removed %s"
 msgstr "Șters complet %s"
 
 msgid "Completely removed %s"
 msgstr "Șters complet %s"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Nu se poate scrie jurnalul, openpty() a eșuat (oare /dev/pts e montat?)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Nu se poate scrie jurnalul, openpty() a eșuat (oare /dev/pts e montat?)\n"
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Nu s-a putut peteci fișierul"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Nu s-a putut peteci fișierul"

diff --git a/po/ru.po b/po/ru.po
index cdd0d65cafd788a0081aa097b8dd902fb56a30f8..659a10f3ffce73fa31de2a828db58e3857319299 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.19\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt 0.7.19\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2008-11-16 21:10+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
 "PO-Revision-Date: 2008-11-16 21:10+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"


@@ -165,7 +165,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s для %s скомпилирован %s %s\n"
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s для %s скомпилирован %s %s\n"


@@ -670,7 +670,7 @@ msgstr "Не удалось переименовать %s в %s"
 msgid "Y"
 msgstr "д"
 
 msgid "Y"
 msgstr "д"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Ошибка компиляции регулярного выражения - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Ошибка компиляции регулярного выражения - %s"


@@ -836,11 +836,11 @@ msgstr "Пакеты необходимо удалить, но удаление
 msgid "Internal error, Ordering didn't finish"
 msgstr "Внутренняя ошибка, Ordering не завершилась"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "Внутренняя ошибка, Ordering не завершилась"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "Невозможно заблокировать каталог для загрузки"
 
 msgid "Unable to lock the download directory"
 msgstr "Невозможно заблокировать каталог для загрузки"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Не читается перечень источников."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Не читается перечень источников."


@@ -873,7 +873,7 @@ msgstr ""
 "После данной операции, объём занятого дискового пространства уменьшится на %"
 "sB.\n"
 
 "После данной операции, объём занятого дискового пространства уменьшится на %"
 "sB.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Не удалось определить количество свободного места в %s"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Не удалось определить количество свободного места в %s"


@@ -912,7 +912,7 @@ msgstr "Аварийное завершение."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Хотите продолжить [Д/н]? "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "Хотите продолжить [Д/н]? "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Не удалось загрузить %s  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Не удалось загрузить %s  %s\n"


@@ -921,7 +921,7 @@ msgstr "Не удалось загрузить %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Некоторые файлы не удалось загрузить"
 
 msgid "Some files failed to download"
 msgstr "Некоторые файлы не удалось загрузить"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "Указан режим \"только загрузка\", и загрузка завершена"
 
 msgid "Download complete and in download only mode"
 msgstr "Указан режим \"только загрузка\", и загрузка завершена"
 


@@ -1019,29 +1019,34 @@ msgstr "Версия '%s' для '%s' не найдена"
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Выбрана версия %s (%s) для %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Выбрана версия %s (%s) для %s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "Команде update не нужны аргументы"
 
 msgid "The update command takes no arguments"
 msgstr "Команде update не нужны аргументы"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "Невозможно заблокировать каталог со списками пакетов"
 
 msgid "Unable to lock the list directory"
 msgstr "Невозможно заблокировать каталог со списками пакетов"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Не предполагалось удалять stuff, невозможно запустить AutoRemover"
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Не предполагалось удалять stuff, невозможно запустить AutoRemover"
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Следующие пакеты устанавливались автоматически и больше не требуются:"
 
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Следующие пакеты устанавливались автоматически и больше не требуются:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Для их удаления используйте 'apt-get autoremove'."
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Для их удаления используйте 'apt-get autoremove'."
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1059,45 +1064,45 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "Следующая информация, возможно, поможет вам:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "Следующая информация, возможно, поможет вам:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Внутренняя ошибка, AutoRemover всё поломал"
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Внутренняя ошибка, AutoRemover всё поломал"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Внутренняя ошибка, AllUpgrade всё поломал"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Внутренняя ошибка, AllUpgrade всё поломал"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Не удалось найти задачу %s"
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Не удалось найти задачу %s"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Не удалось найти пакет %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Не удалось найти пакет %s"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Заметьте, выбирается %s из-за регулярного выражения %s\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Заметьте, выбирается %s из-за регулярного выражения %s\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s установлен вручную.\n"
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s установлен вручную.\n"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -"
 "f install':"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -"
 "f install':"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1105,7 +1110,7 @@ msgstr ""
 "Неудовлетворённые зависимости. Попытайтесь выполнить 'apt-get -f install', "
 "не указывая имени пакета, (или найдите другое решение)."
 
 "Неудовлетворённые зависимости. Попытайтесь выполнить 'apt-get -f install', "
 "не указывая имени пакета, (или найдите другое решение)."
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1116,121 +1121,121 @@ msgstr ""
 "или же используете нестабильную версию дистрибутива, где запрошенные вами\n"
 "пакеты ещё не созданы или были удалены из Incoming."
 
 "или же используете нестабильную версию дистрибутива, где запрошенные вами\n"
 "пакеты ещё не созданы или были удалены из Incoming."
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "Сломанные пакеты"
 
 msgid "Broken packages"
 msgstr "Сломанные пакеты"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "Будут установлены следующие дополнительные пакеты:"
 
 msgid "The following extra packages will be installed:"
 msgstr "Будут установлены следующие дополнительные пакеты:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "Предлагаемые пакеты:"
 
 msgid "Suggested packages:"
 msgstr "Предлагаемые пакеты:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "Рекомендуемые пакеты:"
 
 msgid "Recommended packages:"
 msgstr "Рекомендуемые пакеты:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "Расчёт обновлений... "
 
 msgid "Calculating upgrade... "
 msgstr "Расчёт обновлений... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "Неудачно"
 
 msgid "Failed"
 msgstr "Неудачно"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "Готово"
 
 msgid "Done"
 msgstr "Готово"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr "Внутренняя ошибка, решатель проблем всё поломал"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Внутренняя ошибка, решатель проблем всё поломал"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Укажите как минимум один пакет, для которого необходимо загрузить исходные "
 "тексты"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Укажите как минимум один пакет, для которого необходимо загрузить исходные "
 "тексты"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Невозможно найти пакет с исходными текстами для %s"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Невозможно найти пакет с исходными текстами для %s"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Пропускаем уже загруженный файл '%s'\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Пропускаем уже загруженный файл '%s'\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Недостаточно места в %s"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Недостаточно места в %s"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Необходимо загрузить %sB/%sB из архивов исходных текстов.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Необходимо загрузить %sB/%sB из архивов исходных текстов.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Нужно загрузить %sB архивов с исходными текстами.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Нужно загрузить %sB архивов с исходными текстами.\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Загрузка исходных текстов %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Загрузка исходных текстов %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "Некоторые архивы не удалось загрузить."
 
 msgid "Failed to fetch some archives."
 msgstr "Некоторые архивы не удалось загрузить."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "Распаковка исходных текстов пропущена, так как в %s уже находятся "
 "распакованные исходные тексты\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "Распаковка исходных текстов пропущена, так как в %s уже находятся "
 "распакованные исходные тексты\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Команда распаковки '%s' завершилась неудачно.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Команда распаковки '%s' завершилась неудачно.\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Проверьте, установлен ли пакет 'dpkg-dev'.\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Проверьте, установлен ли пакет 'dpkg-dev'.\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Команда сборки '%s' завершилась неудачно.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Команда сборки '%s' завершилась неудачно.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "Порождённый процесс завершился неудачно"
 
 msgid "Child process failed"
 msgstr "Порождённый процесс завершился неудачно"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Для проверки зависимостей для сборки необходимо указать как минимум один "
 "пакет"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Для проверки зависимостей для сборки необходимо указать как минимум один "
 "пакет"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Невозможно получить информацию о зависимостях для сборки %s"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Невозможно получить информацию о зависимостях для сборки %s"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s не имеет зависимостей для сборки.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s не имеет зависимостей для сборки.\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "


@@ -1239,7 +1244,7 @@ msgstr ""
 "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не "
 "найден"
 
 "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не "
 "найден"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1248,32 +1253,33 @@ msgstr ""
 "Зависимость типа %s для %s не может быть удовлетворена, поскольку ни одна из "
 "версий пакета %s не удовлетворяет требованиям"
 
 "Зависимость типа %s для %s не может быть удовлетворена, поскольку ни одна из "
 "версий пакета %s не удовлетворяет требованиям"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный "
 "пакет %s новее, чем надо"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный "
 "пакет %s новее, чем надо"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Зависимости для сборки %s не могут быть удовлетворены."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Зависимости для сборки %s не могут быть удовлетворены."
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "Обработка зависимостей для сборки завершилась неудачно"
 
 msgid "Failed to process build dependencies"
 msgstr "Обработка зависимостей для сборки завершилась неудачно"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "Поддерживаемые модули:"
 
 msgid "Supported modules:"
 msgstr "Поддерживаемые модули:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1289,7 +1295,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1896,7 +1902,7 @@ msgstr "Время установления соединения для соке
 msgid "Unable to accept connection"
 msgstr "Невозможно принять соединение"
 
 msgid "Unable to accept connection"
 msgstr "Невозможно принять соединение"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "Проблема при хешировании файла"
 
 msgid "Problem hashing file"
 msgstr "Проблема при хешировании файла"
 


@@ -1981,42 +1987,42 @@ msgstr ""
 msgid "Unable to connect to %s %s:"
 msgstr "Невозможно соединиться с %s %s:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "Невозможно соединиться с %s %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Нет доступа к связке (keyring) ключей: '%s'"
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Нет доступа к связке (keyring) ключей: '%s'"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: Слишком большой список параметров у Acquire::gpgv::Options. Завершение "
 "работы."
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: Слишком большой список параметров у Acquire::gpgv::Options. Завершение "
 "работы."
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток "
 "ключа?!"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток "
 "ключа?!"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "Найдена как минимум одна неправильная подпись."
 
 msgid "At least one invalid signature was encountered."
 msgstr "Найдена как минимум одна неправильная подпись."
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "Не удалось выполнить '%s' для проверки подписи (gpgv установлена?)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "Не удалось выполнить '%s' для проверки подписи (gpgv установлена?)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "Неизвестная ошибка при выполнении gpgv"
 
 msgid "Unknown error executing gpgv"
 msgstr "Неизвестная ошибка при выполнении gpgv"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "Следующие подписи неверные:\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "Следующие подписи неверные:\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -2034,80 +2040,80 @@ msgstr "Не удалось открыть канал для %s"
 msgid "Read error from %s process"
 msgstr "Ошибка чтения из процесса %s"
 
 msgid "Read error from %s process"
 msgstr "Ошибка чтения из процесса %s"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "Ожидание заголовков"
 
 msgid "Waiting for headers"
 msgstr "Ожидание заголовков"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Получен заголовок длиннее %u символов"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Получен заголовок длиннее %u символов"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "Неверный заголовок"
 
 msgid "Bad header line"
 msgstr "Неверный заголовок"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "Http-сервер послал неверный заголовок"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Http-сервер послал неверный заголовок"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Http сервер послал неверный заголовок Content-Length"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Http сервер послал неверный заголовок Content-Length"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Http-сервер послал неверный заголовок Content-Range"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Http-сервер послал неверный заголовок Content-Range"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "Этот http-сервер не поддерживает загрузку фрагментов файлов"
 
 msgid "This HTTP server has broken range support"
 msgstr "Этот http-сервер не поддерживает загрузку фрагментов файлов"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "Неизвестный формат данных"
 
 msgid "Unknown date format"
 msgstr "Неизвестный формат данных"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "Ошибка в select"
 
 msgid "Select failed"
 msgstr "Ошибка в select"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "Время ожидания для соединения истекло"
 
 msgid "Connection timed out"
 msgstr "Время ожидания для соединения истекло"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "Ошибка записи в выходной файл"
 
 msgid "Error writing to output file"
 msgstr "Ошибка записи в выходной файл"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "Ошибка записи в файл"
 
 msgid "Error writing to file"
 msgstr "Ошибка записи в файл"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "Ошибка записи в файл"
 
 msgid "Error writing to the file"
 msgstr "Ошибка записи в файл"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "Ошибка чтения, удалённый сервер прервал соединение"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Ошибка чтения, удалённый сервер прервал соединение"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "Ошибка чтения с сервера"
 
 msgid "Error reading from server"
 msgstr "Ошибка чтения с сервера"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 msgid "Failed to truncate file"
 msgstr "Не удалось обрезать файл"
 
 msgid "Failed to truncate file"
 msgstr "Не удалось обрезать файл"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "Неверный заголовок данных"
 
 msgid "Bad header data"
 msgstr "Неверный заголовок данных"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "Соединение разорвано"
 
 msgid "Connection failed"
 msgstr "Соединение разорвано"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "Внутренняя ошибка"
 
 msgid "Internal error"
 msgstr "Внутренняя ошибка"
 


@@ -2127,7 +2133,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "Не найдено: %s"
 #, c-format
 msgid "Selection %s not found"
 msgstr "Не найдено: %s"


@@ -2564,7 +2594,7 @@ msgstr "Драйвер для метода %s не найден."
 msgid "Method %s did not start correctly"
 msgstr "Метод %s запустился не корректно"
 
 msgid "Method %s did not start correctly"
 msgstr "Метод %s запустился не корректно"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Вставьте диск с меткой '%s' в устройство '%s' и нажмите ввод."
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Вставьте диск с меткой '%s' в устройство '%s' и нажмите ввод."


@@ -2928,12 +2958,16 @@ msgstr "Подготовка к полному удалению %s"
 msgid "Completely removed %s"
 msgstr "%s полностью удалён"
 
 msgid "Completely removed %s"
 msgstr "%s полностью удалён"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Не удалось записать в журнал, неудачное выполнение openpty() (/dev/pts не "
 "смонтирован?)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Не удалось записать в журнал, неудачное выполнение openpty() (/dev/pts не "
 "смонтирован?)\n"
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Не удалось пропатчить файл"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Не удалось пропатчить файл"

diff --git a/po/sk.po b/po/sk.po
index c6073b22d759a21257a435fcfd561aaaa3855594..432bd065363337d1dc01deb380b6a724ac224da2 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2009-04-08 16:08+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "PO-Revision-Date: 2009-04-08 16:08+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"


@@ -160,7 +160,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s pre %s skompilovaný %s %s\n"
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s pre %s skompilovaný %s %s\n"


@@ -655,7 +655,7 @@ msgstr "Premenovanie %s na %s zlyhalo"
 msgid "Y"
 msgstr "Y"
 
 msgid "Y"
 msgstr "Y"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Chyba pri preklade regulárneho výrazu - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Chyba pri preklade regulárneho výrazu - %s"


@@ -816,11 +816,11 @@ msgstr "Je potrebné odstránenie balíka, ale funkcia Odstrániť je vypnutá."
 msgid "Internal error, Ordering didn't finish"
 msgstr "Vnútorná chyba, Triedenie sa neukončilo"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "Vnútorná chyba, Triedenie sa neukončilo"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "Adresár pre sťahovanie sa nedá zamknúť"
 
 msgid "Unable to lock the download directory"
 msgstr "Adresár pre sťahovanie sa nedá zamknúť"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Nedá sa načítať zoznam zdrojov."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Nedá sa načítať zoznam zdrojov."


@@ -851,7 +851,7 @@ msgstr "Po tejto operácii sa na disku použije ďalších %sB.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Po tejto operácii sa na disku uvoľní %sB.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Po tejto operácii sa na disku uvoľní %sB.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Na %s sa nedá zistiť veľkosť voľného miesta"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Na %s sa nedá zistiť veľkosť voľného miesta"


@@ -888,7 +888,7 @@ msgstr "Prerušené."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Chcete pokračovať [Y/n]? "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "Chcete pokračovať [Y/n]? "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Zlyhalo stiahnutie %s  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Zlyhalo stiahnutie %s  %s\n"


@@ -897,7 +897,7 @@ msgstr "Zlyhalo stiahnutie %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Niektoré súbory sa nedajú stiahnuť"
 
 msgid "Some files failed to download"
 msgstr "Niektoré súbory sa nedajú stiahnuť"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "Sťahovanie ukončené v režime „iba stiahnuť“"
 
 msgid "Download complete and in download only mode"
 msgstr "Sťahovanie ukončené v režime „iba stiahnuť“"
 


@@ -993,30 +993,35 @@ msgstr "Nebola nájdená verzia „%s“ pre „%s“"
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Zvolená verzia %s (%s) pre %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Zvolená verzia %s (%s) pre %s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "Príkaz update neprijíma žiadne argumenty"
 
 msgid "The update command takes no arguments"
 msgstr "Príkaz update neprijíma žiadne argumenty"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "Adresár zoznamov sa nedá zamknúť"
 
 msgid "Unable to lock the list directory"
 msgstr "Adresár zoznamov sa nedá zamknúť"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Nemajú sa odstraňovať veci, nespustí sa AutoRemover"
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Nemajú sa odstraňovať veci, nespustí sa AutoRemover"
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 "Nasledovné balíky boli nainštalované automaticky a už viac nie sú potrebné:"
 
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 "Nasledovné balíky boli nainštalované automaticky a už viac nie sú potrebné:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Na ich odstránenie použite „apt-get autoremove“."
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Na ich odstránenie použite „apt-get autoremove“."
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1034,43 +1039,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "Nasledovné informácie vám možno pomôžu vyriešiť túto situáciu:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "Nasledovné informácie vám možno pomôžu vyriešiť túto situáciu:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Vnútorná chyba, AutoRemover niečo pokazil"
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Vnútorná chyba, AutoRemover niečo pokazil"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Vnútorná chyba, AllUpgrade pokazil veci"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Vnútorná chyba, AllUpgrade pokazil veci"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Nebolo možné nájsť úlohu %s"
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Nebolo možné nájsť úlohu %s"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Balík %s sa nedá nájsť"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Balík %s sa nedá nájsť"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Poznámka: vyberá sa %s pre regulárny výraz „%s“\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Poznámka: vyberá sa %s pre regulárny výraz „%s“\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s je nastavený na manuálnu inštaláciu.\n"
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s je nastavený na manuálnu inštaláciu.\n"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Na opravu nasledovných môžete spustiť „apt-get -f install“:"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Na opravu nasledovných môžete spustiť „apt-get -f install“:"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1078,7 +1083,7 @@ msgstr ""
 "Nesplnené závislosti. Skúste spustiť „apt-get -f install“ bez balíkov (alebo "
 "navrhnite riešenie)."
 
 "Nesplnené závislosti. Skúste spustiť „apt-get -f install“ bez balíkov (alebo "
 "navrhnite riešenie)."
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1090,124 +1095,124 @@ msgstr ""
 "požadované balíky ešte neboli vytvorené alebo presunuté z fronty\n"
 "Novoprichádzajúcich (Incoming) balíkov."
 
 "požadované balíky ešte neboli vytvorené alebo presunuté z fronty\n"
 "Novoprichádzajúcich (Incoming) balíkov."
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "Poškodené balíky"
 
 msgid "Broken packages"
 msgstr "Poškodené balíky"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "Nainštalujú sa nasledovné extra balíky:"
 
 msgid "The following extra packages will be installed:"
 msgstr "Nainštalujú sa nasledovné extra balíky:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "Navrhované balíky:"
 
 msgid "Suggested packages:"
 msgstr "Navrhované balíky:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "Odporúčané balíky:"
 
 msgid "Recommended packages:"
 msgstr "Odporúčané balíky:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "Prepočítava sa aktualizácia... "
 
 msgid "Calculating upgrade... "
 msgstr "Prepočítava sa aktualizácia... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "Chyba"
 
 msgid "Failed"
 msgstr "Chyba"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "Hotovo"
 
 msgid "Done"
 msgstr "Hotovo"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr "Vnútorná chyba, „problem resolver“ niečo pokazil"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Vnútorná chyba, „problem resolver“ niečo pokazil"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr "Musíte zadať aspoň jeden balík, pre ktorý sa stiahnu zdrojové texty"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "Musíte zadať aspoň jeden balík, pre ktorý sa stiahnu zdrojové texty"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nedá sa nájsť zdrojový balík pre %s"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nedá sa nájsť zdrojový balík pre %s"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Preskakuje sa už stiahnutý súbor „%s“\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Preskakuje sa už stiahnutý súbor „%s“\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Na %s nemáte dostatok voľného miesta"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Na %s nemáte dostatok voľného miesta"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Je potrebné stiahnuť %sB/%sB zdrojových archívov.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Je potrebné stiahnuť %sB/%sB zdrojových archívov.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Je potrebné stiahnuť %sB zdrojových archívov.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Je potrebné stiahnuť %sB zdrojových archívov.\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Stiahnuť zdroj %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Stiahnuť zdroj %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "Zlyhalo stiahnutie niektorých archívov."
 
 msgid "Failed to fetch some archives."
 msgstr "Zlyhalo stiahnutie niektorých archívov."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Preskakuje sa rozbalenie už rozbaleného zdroja v %s\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Preskakuje sa rozbalenie už rozbaleného zdroja v %s\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Príkaz na rozbalenie „%s“ zlyhal.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Príkaz na rozbalenie „%s“ zlyhal.\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Skontrolujte, či je nainštalovaný balík „dpkg-dev“.\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Skontrolujte, či je nainštalovaný balík „dpkg-dev“.\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Príkaz na zostavenie „%s“ zlyhal.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Príkaz na zostavenie „%s“ zlyhal.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "Proces potomka zlyhal"
 
 msgid "Child process failed"
 msgstr "Proces potomka zlyhal"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Musíte zadať aspoň jeden balík, pre ktorý sa budú overovať závislosti na "
 "zostavenie"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Musíte zadať aspoň jeden balík, pre ktorý sa budú overovať závislosti na "
 "zostavenie"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nedajú sa získať závislosti na zostavenie %s"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nedajú sa získať závislosti na zostavenie %s"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nemá žiadne závislosti na zostavenie.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nemá žiadne závislosti na zostavenie.\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%s závislosť pre %s sa nemôže splniť, pretože sa nedá nájsť balík %s"
 
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%s závislosť pre %s sa nemôže splniť, pretože sa nedá nájsť balík %s"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1216,31 +1221,32 @@ msgstr ""
 "%s závislosť pre %s sa nedá splniť, pretože sa nedá nájsť verzia balíka %s, "
 "ktorá zodpovedá požiadavke na verziu"
 
 "%s závislosť pre %s sa nedá splniť, pretože sa nedá nájsť verzia balíka %s, "
 "ktorá zodpovedá požiadavke na verziu"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Zlyhalo splnenie %s závislosti pre %s: Inštalovaný balík %s je príliš nový"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Zlyhalo splnenie %s závislosti pre %s: Inštalovaný balík %s je príliš nový"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Zlyhalo splnenie %s závislosti pre %s: %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Zlyhalo splnenie %s závislosti pre %s: %s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Závislosti na zostavenie %s sa nedajú splniť."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Závislosti na zostavenie %s sa nedajú splniť."
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "Spracovanie závislostí na zostavenie zlyhalo"
 
 msgid "Failed to process build dependencies"
 msgstr "Spracovanie závislostí na zostavenie zlyhalo"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "Podporované moduly:"
 
 msgid "Supported modules:"
 msgstr "Podporované moduly:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1256,7 +1262,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1853,7 +1859,7 @@ msgstr "Uplynulo spojenie dátového socketu"
 msgid "Unable to accept connection"
 msgstr "Spojenie sa nedá prijať"
 
 msgid "Unable to accept connection"
 msgstr "Spojenie sa nedá prijať"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "Problém s hašovaním súboru"
 
 msgid "Problem hashing file"
 msgstr "Problém s hašovaním súboru"
 


@@ -1937,40 +1943,40 @@ msgstr "Niečo veľmi zlé sa prihodilo pri preklade „%s:%s“ (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Nedá sa pripojiť k %s %s:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "Nedá sa pripojiť k %s %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Zväzok kľúčov „%s“ je nedostupný."
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Zväzok kľúčov „%s“ je nedostupný."
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "CHYBA: zoznam argumentov z Acquire::gpgv::Options je príliš dlhý. Ukončuje "
 "sa."
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "CHYBA: zoznam argumentov z Acquire::gpgv::Options je príliš dlhý. Ukončuje "
 "sa."
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "Vnútorná chyba: Správna signatúra, ale sa nedá zistiť odtlačok kľúča?!"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "Vnútorná chyba: Správna signatúra, ale sa nedá zistiť odtlačok kľúča?!"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "Bola zistená aspoň jedna nesprávna signatúra."
 
 msgid "At least one invalid signature was encountered."
 msgstr "Bola zistená aspoň jedna nesprávna signatúra."
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "Nedá sa spustiť „%s“ na kontrolu signatúry (je nainštalované gpgv?)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "Nedá sa spustiť „%s“ na kontrolu signatúry (je nainštalované gpgv?)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "Neznáma chyba pri spustení gpgv"
 
 msgid "Unknown error executing gpgv"
 msgstr "Neznáma chyba pri spustení gpgv"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "Nasledovné signatúry sú neplatné:\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "Nasledovné signatúry sú neplatné:\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -1988,80 +1994,80 @@ msgstr "Nedá sa otvoriť rúra pre %s"
 msgid "Read error from %s process"
 msgstr "Chyba pri čítaní z procesu %s"
 
 msgid "Read error from %s process"
 msgstr "Chyba pri čítaní z procesu %s"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "Čaká sa na hlavičky"
 
 msgid "Waiting for headers"
 msgstr "Čaká sa na hlavičky"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Získal sa jeden riadok hlavičky cez %u znakov"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Získal sa jeden riadok hlavičky cez %u znakov"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "Chybná hlavička"
 
 msgid "Bad header line"
 msgstr "Chybná hlavička"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP server poslal neplatnú hlavičku odpovede"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP server poslal neplatnú hlavičku odpovede"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP server poslal neplatnú hlavičku Content-Length"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP server poslal neplatnú hlavičku Content-Length"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP server poslal neplatnú hlavičku Content-Range"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP server poslal neplatnú hlavičku Content-Range"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "Tento HTTP server má poškodenú podporu rozsahov"
 
 msgid "This HTTP server has broken range support"
 msgstr "Tento HTTP server má poškodenú podporu rozsahov"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "Neznámy formát dátumu"
 
 msgid "Unknown date format"
 msgstr "Neznámy formát dátumu"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "Výber zlyhal"
 
 msgid "Select failed"
 msgstr "Výber zlyhal"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "Uplynul čas spojenia"
 
 msgid "Connection timed out"
 msgstr "Uplynul čas spojenia"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "Chyba zápisu do výstupného súboru"
 
 msgid "Error writing to output file"
 msgstr "Chyba zápisu do výstupného súboru"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "Chyba zápisu do súboru"
 
 msgid "Error writing to file"
 msgstr "Chyba zápisu do súboru"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "Chyba zápisu do tohto súboru"
 
 msgid "Error writing to the file"
 msgstr "Chyba zápisu do tohto súboru"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "Chyba pri čítaní zo servera"
 
 msgid "Error reading from server"
 msgstr "Chyba pri čítaní zo servera"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 msgid "Failed to truncate file"
 msgstr "Nepodarilo sa skrátiť súbor"
 
 msgid "Failed to truncate file"
 msgstr "Nepodarilo sa skrátiť súbor"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "Zlé dátové záhlavie"
 
 msgid "Bad header data"
 msgstr "Zlé dátové záhlavie"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 
 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "Vnútorná chyba"
 
 msgid "Internal error"
 msgstr "Vnútorná chyba"
 


@@ -2083,7 +2089,31 @@ msgstr ""
 "Nedostatok miesta pre dynamický MMap. Prosím, zväčšite veľkosť APT::Cache-"
 "Limit. Aktuálna hodnota: %lu. (man 5 apt.conf)"
 
 "Nedostatok miesta pre dynamický MMap. Prosím, zväčšite veľkosť APT::Cache-"
 "Limit. Aktuálna hodnota: %lu. (man 5 apt.conf)"
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "Voľba %s nenájdená"
 #, c-format
 msgid "Selection %s not found"
 msgstr "Voľba %s nenájdená"


@@ -2510,7 +2540,7 @@ msgstr "Nedá sa nájsť ovládač spôsobu %s."
 msgid "Method %s did not start correctly"
 msgstr "Spôsob %s nebol správne spustený"
 
 msgid "Method %s did not start correctly"
 msgstr "Spôsob %s nebol správne spustený"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Vložte disk nazvaný „%s“ do mechaniky „%s“ a stlačte Enter."
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Vložte disk nazvaný „%s“ do mechaniky „%s“ a stlačte Enter."


@@ -2873,12 +2903,16 @@ msgstr "Pripravuje sa úplné odstránenie %s"
 msgid "Completely removed %s"
 msgstr "Balík „%s“ je úplne odstránený"
 
 msgid "Completely removed %s"
 msgstr "Balík „%s“ je úplne odstránený"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Nedá sa zapísať záznam, volanie openpty() zlyhalo (/dev/pts nie je "
 "pripojený?)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Nedá sa zapísať záznam, volanie openpty() zlyhalo (/dev/pts nie je "
 "pripojený?)\n"
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Nedá sa upraviť súbor"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Nedá sa upraviť súbor"

diff --git a/po/sl.po b/po/sl.po
index 62746793525726be22ffc6b0a34d88d330c2935f..083d313975136ad5b87a54c78251e8fa3c3ce954 100644 (file)
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.5\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt 0.5.5\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2005-02-16 22:18+0100\n"
 "Last-Translator: Jure Cuhalev <gandalf@owca.info>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "PO-Revision-Date: 2005-02-16 22:18+0100\n"
 "Last-Translator: Jure Cuhalev <gandalf@owca.info>\n"
 "Language-Team: Slovenian <sl@li.org>\n"


@@ -155,7 +155,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s za %s %s preveden na %s %s\n"
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s za %s %s preveden na %s %s\n"


@@ -654,7 +654,7 @@ msgstr "Ni mogo
 msgid "Y"
 msgstr "Y"
 
 msgid "Y"
 msgstr "Y"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Napaka pri prevajanju regex - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Napaka pri prevajanju regex - %s"


@@ -817,11 +817,11 @@ msgstr "Odstraniti je potrebno pakete, a je Odstranjevanje onemogo
 msgid "Internal error, Ordering didn't finish"
 msgstr "Notranja napaka pri dodajanju odklona"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "Notranja napaka pri dodajanju odklona"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "Ni mogoèe zakleniti imenika za prenose"
 
 msgid "Unable to lock the download directory"
 msgstr "Ni mogoèe zakleniti imenika za prenose"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Seznama virov ni mogoèe brati."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Seznama virov ni mogoèe brati."


@@ -850,7 +850,7 @@ msgstr "Po odpakiranju bo uporabljenega %sB dodatnega prostora na disku.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Po odpakiranju bo spro¹èenega %sB prostora na disku.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Po odpakiranju bo spro¹èenega %sB prostora na disku.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nimate dovolj prostora na %s"
 #, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nimate dovolj prostora na %s"


@@ -887,7 +887,7 @@ msgstr "Prekini."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Ali ¾elite nadaljevati [Y/n]? "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "Ali ¾elite nadaljevati [Y/n]? "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Ni mogoèe dobiti %s  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Ni mogoèe dobiti %s  %s\n"


@@ -896,7 +896,7 @@ msgstr "Ni mogo
 msgid "Some files failed to download"
 msgstr "Prenos nekaterih datotek ni uspel"
 
 msgid "Some files failed to download"
 msgstr "Prenos nekaterih datotek ni uspel"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "Prenos dokonèan in uporabljen naèin samo prenos"
 
 msgid "Download complete and in download only mode"
 msgstr "Prenos dokonèan in uporabljen naèin samo prenos"
 


@@ -993,30 +993,35 @@ msgstr "Razli
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Izbrana razlièica %s (%s) za %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Izbrana razlièica %s (%s) za %s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "Ukaz update ne potrebuje argumentov"
 
 msgid "The update command takes no arguments"
 msgstr "Ukaz update ne potrebuje argumentov"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "Imenika seznamov ni mogoèe zakleniti"
 
 msgid "Unable to lock the list directory"
 msgstr "Imenika seznamov ni mogoèe zakleniti"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Naslednji NOVI paketi bodo name¹èeni:"
 
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Naslednji NOVI paketi bodo name¹èeni:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1032,44 +1037,44 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "Naslednji podatki vam bodo morda pomagali re¹iti te¾avo:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "Naslednji podatki vam bodo morda pomagali re¹iti te¾avo:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Notranja napaka zaradi AllUpgrade."
 
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Notranja napaka zaradi AllUpgrade."
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Notranja napaka zaradi AllUpgrade."
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Notranja napaka zaradi AllUpgrade."
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "Ni mogoèe najti paketa %s"
 
 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "Ni mogoèe najti paketa %s"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Ni mogoèe najti paketa %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Ni mogoèe najti paketa %s"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Opomba: izbran %s namesto regex '%s'\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Opomba: izbran %s namesto regex '%s'\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "vendar bo paket %s name¹èen"
 
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "vendar bo paket %s name¹èen"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Poskusite zagnati 'apt-get -f install', èe ¾elite popraviti:"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Poskusite zagnati 'apt-get -f install', èe ¾elite popraviti:"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1077,7 +1082,7 @@ msgstr ""
 "Nere¹ene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali "
 "podajte re¹itev)."
 
 "Nere¹ene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali "
 "podajte re¹itev)."
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1088,126 +1093,126 @@ msgstr ""
 "nemogoè polo¾aj, èe uporabljate nestabilno izdajo pa, da nekateri zahtevani "
 "paketi ¹e niso ustvarjeni ali prene¹eni iz Prihajajoèe."
 
 "nemogoè polo¾aj, èe uporabljate nestabilno izdajo pa, da nekateri zahtevani "
 "paketi ¹e niso ustvarjeni ali prene¹eni iz Prihajajoèe."
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "Pokvarjeni paketi"
 
 msgid "Broken packages"
 msgstr "Pokvarjeni paketi"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "Naslednji dodatni paketi bodo name¹èeni:"
 
 msgid "The following extra packages will be installed:"
 msgstr "Naslednji dodatni paketi bodo name¹èeni:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "Predlagani paketi:"
 
 msgid "Suggested packages:"
 msgstr "Predlagani paketi:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "Priporoèeni paketi:"
 
 msgid "Recommended packages:"
 msgstr "Priporoèeni paketi:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "Preraèunavanje nadgradnje ... "
 
 msgid "Calculating upgrade... "
 msgstr "Preraèunavanje nadgradnje ... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "Spodletelo"
 
 msgid "Failed"
 msgstr "Spodletelo"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "Opravljeno"
 
 msgid "Done"
 msgstr "Opravljeno"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Notranja napaka zaradi AllUpgrade."
 
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Notranja napaka zaradi AllUpgrade."
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Potrebno je navesti vsaj en paket, za katerega ¾elite dobiti izorno kodo"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Potrebno je navesti vsaj en paket, za katerega ¾elite dobiti izorno kodo"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Izvornega paketa za %s ni mogoèe najti"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Izvornega paketa za %s ni mogoèe najti"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, fuzzy, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Odpakiranje ¾e odpakiranih izvornih paketov v %s preskoèeno\n"
 
 #, fuzzy, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Odpakiranje ¾e odpakiranih izvornih paketov v %s preskoèeno\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Nimate dovolj prostora na %s"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Nimate dovolj prostora na %s"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Potrebno je dobiti %sB izvornih arhivov.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Potrebno je dobiti %sB izvornih arhivov.\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Dobi vir %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Dobi vir %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "Nekaterih arhivov ni mogoèe dobiti."
 
 msgid "Failed to fetch some archives."
 msgstr "Nekaterih arhivov ni mogoèe dobiti."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Odpakiranje ¾e odpakiranih izvornih paketov v %s preskoèeno\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Odpakiranje ¾e odpakiranih izvornih paketov v %s preskoèeno\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Ukaz odpakiranja '%s' ni uspel.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Ukaz odpakiranja '%s' ni uspel.\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Ukaz gradnje '%s' ni uspel.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Ukaz gradnje '%s' ni uspel.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "Otro¹ki proces ni uspel"
 
 msgid "Child process failed"
 msgstr "Otro¹ki proces ni uspel"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Potrebno je navesti vsaj en paket, za katerega ¾elite preveriti odvisnosti "
 "za gradnjo"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Potrebno je navesti vsaj en paket, za katerega ¾elite preveriti odvisnosti "
 "za gradnjo"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Ni mogoèe dobiti informacij o odvisnostih za gradnjo za %s"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Ni mogoèe dobiti informacij o odvisnostih za gradnjo za %s"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nima odvisnosti za gradnjo.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nima odvisnosti za gradnjo.\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%s odvisnosti za %s ni mogoèe zadostiti, ker ni mogoèe najti paketa %s"
 
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%s odvisnosti za %s ni mogoèe zadostiti, ker ni mogoèe najti paketa %s"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1216,31 +1221,31 @@ msgstr ""
 "%s odvisnosti za %s ni mogoèe zadostiti, ker nobena razlièica paketa %s ne "
 "more zadostiti zahtevi po razlièici"
 
 "%s odvisnosti za %s ni mogoèe zadostiti, ker nobena razlièica paketa %s ne "
 "more zadostiti zahtevi po razlièici"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Ni mogoèe zadostiti %s odvisnosti za %s. Name¹èen paket %s je preveè nov"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Ni mogoèe zadostiti %s odvisnosti za %s. Name¹èen paket %s je preveè nov"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Ni mogoèe zadostiti %s odvisnosti za %s. %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Ni mogoèe zadostiti %s odvisnosti za %s. %s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Odvisnostim za gradnjo %s ni mogoèe zadostiti."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Odvisnostim za gradnjo %s ni mogoèe zadostiti."
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "Obdelava odvisnosti za gradnjo ni uspela"
 
 msgid "Failed to process build dependencies"
 msgstr "Obdelava odvisnosti za gradnjo ni uspela"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "Podprti moduli:"
 
 msgid "Supported modules:"
 msgstr "Podprti moduli:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628

 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"


@@ -1257,7 +1262,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1854,7 +1859,7 @@ msgstr "Povezava podatkovne vti
 msgid "Unable to accept connection"
 msgstr "Ni mogoèe sprejeti povezave"
 
 msgid "Unable to accept connection"
 msgstr "Ni mogoèe sprejeti povezave"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "Te¾ava pri razpr¹evanju datoteke"
 
 msgid "Problem hashing file"
 msgstr "Te¾ava pri razpr¹evanju datoteke"
 


@@ -1938,39 +1943,39 @@ msgstr "Pri
 msgid "Unable to connect to %s %s:"
 msgstr "Ni se mogoèe povezati z %s %s:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "Ni se mogoèe povezati z %s %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, fuzzy, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Ni mogoèe razre¹iti '%s'"
 
 #, fuzzy, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Ni mogoèe razre¹iti '%s'"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr ""
 
 msgid "At least one invalid signature was encountered."
 msgstr ""
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr ""
 
 msgid "Unknown error executing gpgv"
 msgstr ""
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Naslednji dodatni paketi bodo name¹èeni:"
 
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Naslednji dodatni paketi bodo name¹èeni:"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -1986,81 +1991,81 @@ msgstr "Ni mogo
 msgid "Read error from %s process"
 msgstr "Napaka pri branju iz procesa %s"
 
 msgid "Read error from %s process"
 msgstr "Napaka pri branju iz procesa %s"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "Èakanje na glave"
 
 msgid "Waiting for headers"
 msgstr "Èakanje na glave"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Dobljena je ena vrstica glave preko %u znakov"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Dobljena je ena vrstica glave preko %u znakov"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "Napaèna vrstica glave"
 
 msgid "Bad header line"
 msgstr "Napaèna vrstica glave"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "Stre¾nik HTTP je poslal napaèno glavo odgovora"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Stre¾nik HTTP je poslal napaèno glavo odgovora"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Stre¾nik HTTP je poslal glavo z napaèno dol¾ino vsebine"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Stre¾nik HTTP je poslal glavo z napaèno dol¾ino vsebine"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Stre¾nik HTTP je poslal glavo z napaènim obsegom vsebine"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Stre¾nik HTTP je poslal glavo z napaènim obsegom vsebine"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "Ta stre¾nik HTTP ima pokvarjen obseg podpore"
 
 msgid "This HTTP server has broken range support"
 msgstr "Ta stre¾nik HTTP ima pokvarjen obseg podpore"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "Neznana oblika datuma"
 
 msgid "Unknown date format"
 msgstr "Neznana oblika datuma"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "Izbira ni uspela"
 
 msgid "Select failed"
 msgstr "Izbira ni uspela"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "Èas za povezavo se je iztekel"
 
 msgid "Connection timed out"
 msgstr "Èas za povezavo se je iztekel"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "Napaka pri pisanju v izhodno datoteko"
 
 msgid "Error writing to output file"
 msgstr "Napaka pri pisanju v izhodno datoteko"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "Napaka pri pisanju v datoteko"
 
 msgid "Error writing to file"
 msgstr "Napaka pri pisanju v datoteko"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "Napaka pri pisanju v datoteko"
 
 msgid "Error writing to the file"
 msgstr "Napaka pri pisanju v datoteko"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "Napaka pri branju oddaljene in zaprte povezave s stre¾nika "
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Napaka pri branju oddaljene in zaprte povezave s stre¾nika "
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "Napaka pri branju s stre¾nika"
 
 msgid "Error reading from server"
 msgstr "Napaka pri branju s stre¾nika"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Napaka pri pisanju datoteke %s"
 
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Napaka pri pisanju datoteke %s"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "Napaèni podatki glave"
 
 msgid "Bad header data"
 msgstr "Napaèni podatki glave"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "Povezava ni uspela"
 
 msgid "Connection failed"
 msgstr "Povezava ni uspela"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "Notranja napaka"
 
 msgid "Internal error"
 msgstr "Notranja napaka"
 


@@ -2080,7 +2085,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "Izbira %s ni mogoèe najti"
 #, c-format
 msgid "Selection %s not found"
 msgstr "Izbira %s ni mogoèe najti"


@@ -2509,7 +2538,7 @@ msgstr "Ni mogo
 msgid "Method %s did not start correctly"
 msgstr "Metoda %s se ni zaèela pravilno"
 
 msgid "Method %s did not start correctly"
 msgstr "Metoda %s se ni zaèela pravilno"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, fuzzy, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 #, fuzzy, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""


@@ -2878,10 +2907,14 @@ msgstr "Odpiranje nastavitvene datoteke %s"
 msgid "Completely removed %s"
 msgstr "Odstranitev %s ni uspela"
 
 msgid "Completely removed %s"
 msgstr "Odstranitev %s ni uspela"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 #, fuzzy
 msgid "Could not patch file"
 #: methods/rred.cc:219
 #, fuzzy
 msgid "Could not patch file"

diff --git a/po/sv.po b/po/sv.po
index cc4e2a51e511ff16370ea5084ecf6a01cb55ab49..e1aeb90669500b7691bc47287358830a955436a4 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2009-03-03 23:15+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish@debian.org>\n"
 "PO-Revision-Date: 2009-03-03 23:15+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish@debian.org>\n"


@@ -158,7 +158,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s för %s kompilerad den %s %s\n"
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s för %s kompilerad den %s %s\n"


@@ -659,7 +659,7 @@ msgstr "Misslyckades med att byta namn på %s till %s"
 msgid "Y"
 msgstr "J"
 
 msgid "Y"
 msgstr "J"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Fel vid kompilering av reguljärt uttryck - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Fel vid kompilering av reguljärt uttryck - %s"


@@ -821,11 +821,11 @@ msgstr "Paketen måste tas bort men \"Remove\" är inaktiverat."
 msgid "Internal error, Ordering didn't finish"
 msgstr "Internt fel. Sorteringen färdigställdes inte"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "Internt fel. Sorteringen färdigställdes inte"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "Kunde inte låsa hämtningskatalogen"
 
 msgid "Unable to lock the download directory"
 msgstr "Kunde inte låsa hämtningskatalogen"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Listan över källor kunde inte läsas."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Listan över källor kunde inte läsas."


@@ -857,7 +857,7 @@ msgstr ""
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Efter denna åtgärd kommer %sB att frigöras på disken.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Efter denna åtgärd kommer %sB att frigöras på disken.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kunde inte fastställa ledigt utrymme i %s"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kunde inte fastställa ledigt utrymme i %s"


@@ -895,7 +895,7 @@ msgstr "Avbryter."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vill du fortsätta [J/n]? "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vill du fortsätta [J/n]? "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Misslyckades med att hämta %s  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Misslyckades med att hämta %s  %s\n"


@@ -904,7 +904,7 @@ msgstr "Misslyckades med att hämta %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Misslyckades med att hämta vissa filer"
 
 msgid "Some files failed to download"
 msgstr "Misslyckades med att hämta vissa filer"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "Hämtningen färdig i \"endast-hämta\"-läge"
 
 msgid "Download complete and in download only mode"
 msgstr "Hämtningen färdig i \"endast-hämta\"-läge"
 


@@ -1002,31 +1002,36 @@ msgstr "Version \"%s\" för \"%s\" hittades inte"
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Vald version %s (%s) för %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Vald version %s (%s) för %s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "Uppdateringskommandot tar inga argument"
 
 msgid "The update command takes no arguments"
 msgstr "Uppdateringskommandot tar inga argument"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "Kunde inte låsa listkatalogen"
 
 msgid "Unable to lock the list directory"
 msgstr "Kunde inte låsa listkatalogen"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Det är inte meningen att vi ska ta bort något, kan inte starta AutoRemover"
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Det är inte meningen att vi ska ta bort något, kan inte starta AutoRemover"
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 "Följande paket har installerats automatiskt och är inte längre nödvändiga:"
 
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 "Följande paket har installerats automatiskt och är inte längre nödvändiga:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Använd \"apt-get autoremove\" för att ta bort dem."
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Använd \"apt-get autoremove\" för att ta bort dem."
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1044,44 +1049,44 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "Följande information kan vara till hjälp för att lösa situationen:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "Följande information kan vara till hjälp för att lösa situationen:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Internt fel, AutoRemover förstörde något"
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Internt fel, AutoRemover förstörde något"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Internt fel, AllUpgrade förstörde något"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Internt fel, AllUpgrade förstörde något"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Kunde inte hitta funktionen %s"
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Kunde inte hitta funktionen %s"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Kunde inte hitta paketet %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Kunde inte hitta paketet %s"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Observera, väljer %s för det reguljära uttrycket \"%s\"\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Observera, väljer %s för det reguljära uttrycket \"%s\"\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s är satt till manuellt installerad.\n"
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s är satt till manuellt installerad.\n"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 "Du kan möjligen rätta till detta genom att köra \"apt-get -f install\":"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 "Du kan möjligen rätta till detta genom att köra \"apt-get -f install\":"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1089,7 +1094,7 @@ msgstr ""
 "Otillfredsställda beroenden. Prova med \"apt-get -f install\" utan paket "
 "(eller ange en lösning)."
 
 "Otillfredsställda beroenden. Prova med \"apt-get -f install\" utan paket "
 "(eller ange en lösning)."
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1101,115 +1106,115 @@ msgstr ""
 "att några nödvändiga paket ännu inte har skapats eller flyttats\n"
 "ut från \"Incoming\"."
 
 "att några nödvändiga paket ännu inte har skapats eller flyttats\n"
 "ut från \"Incoming\"."
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "Trasiga paket"
 
 msgid "Broken packages"
 msgstr "Trasiga paket"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "Följande ytterligare paket kommer att installeras:"
 
 msgid "The following extra packages will be installed:"
 msgstr "Följande ytterligare paket kommer att installeras:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "Föreslagna paket:"
 
 msgid "Suggested packages:"
 msgstr "Föreslagna paket:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "Rekommenderade paket:"
 
 msgid "Recommended packages:"
 msgstr "Rekommenderade paket:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "Beräknar uppgradering... "
 
 msgid "Calculating upgrade... "
 msgstr "Beräknar uppgradering... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "Misslyckades"
 
 msgid "Failed"
 msgstr "Misslyckades"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "Färdig"
 
 msgid "Done"
 msgstr "Färdig"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr "Internt fel, problemlösaren förstörde någonting"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Internt fel, problemlösaren förstörde någonting"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr "Du måste ange minst ett paket att hämta källkod för"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "Du måste ange minst ett paket att hämta källkod för"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Kunde inte hitta något källkodspaket för %s"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Kunde inte hitta något källkodspaket för %s"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Hoppar över redan hämtade filen \"%s\"\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Hoppar över redan hämtade filen \"%s\"\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Behöver hämta %sB/%sB källkodsarkiv.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Behöver hämta %sB/%sB källkodsarkiv.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Behöver hämta %sB källkodsarkiv.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Behöver hämta %sB källkodsarkiv.\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Hämtar källkoden %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Hämtar källkoden %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "Misslyckades med att hämta vissa arkiv."
 
 msgid "Failed to fetch some archives."
 msgstr "Misslyckades med att hämta vissa arkiv."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Packar inte upp redan uppackad källkod i %s\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Packar inte upp redan uppackad källkod i %s\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Uppackningskommandot \"%s\" misslyckades.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Uppackningskommandot \"%s\" misslyckades.\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Försäkra dig om att paketet \"dpkg-dev\" är installerat.\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Försäkra dig om att paketet \"dpkg-dev\" är installerat.\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggkommandot \"%s\" misslyckades.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggkommandot \"%s\" misslyckades.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "Barnprocessen misslyckades"
 
 msgid "Child process failed"
 msgstr "Barnprocessen misslyckades"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr "Du måste ange minst ett paket att kontrollera byggberoenden för"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr "Du måste ange minst ett paket att kontrollera byggberoenden för"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Kunde inte hämta information om byggberoenden för %s"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Kunde inte hämta information om byggberoenden för %s"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har inga byggberoenden.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har inga byggberoenden.\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "


@@ -1218,7 +1223,7 @@ msgstr ""
 "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan "
 "hittas"
 
 "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan "
 "hittas"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1227,32 +1232,33 @@ msgstr ""
 "%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga "
 "versioner av paketet %s tillfredsställer versionskraven"
 
 "%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga "
 "versioner av paketet %s tillfredsställer versionskraven"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Misslyckades med att tillfredsställa %s-beroendet för %s: Det installerade "
 "paketet %s är för nytt"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Misslyckades med att tillfredsställa %s-beroendet för %s: Det installerade "
 "paketet %s är för nytt"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Misslyckades med att tillfredsställa %s-beroendet för %s: %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Misslyckades med att tillfredsställa %s-beroendet för %s: %s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Byggberoenden för %s kunde inte tillfredsställas."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Byggberoenden för %s kunde inte tillfredsställas."
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "Misslyckades med att behandla byggberoenden"
 
 msgid "Failed to process build dependencies"
 msgstr "Misslyckades med att behandla byggberoenden"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "Moduler som stöds:"
 
 msgid "Supported modules:"
 msgstr "Moduler som stöds:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1268,7 +1274,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1872,7 +1878,7 @@ msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgränsen"
 msgid "Unable to accept connection"
 msgstr "Kunde inte ta emot anslutningen"
 
 msgid "Unable to accept connection"
 msgstr "Kunde inte ta emot anslutningen"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "Problem med att lägga filen till hashtabellen"
 
 msgid "Problem hashing file"
 msgstr "Problem med att lägga filen till hashtabellen"
 


@@ -1960,41 +1966,41 @@ msgstr "Något konstigt hände när \"%s:%s\" slogs upp (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Kunde inte ansluta till %s %s:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "Kunde inte ansluta till %s %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Kunde inte komma åt nyckelring: \"%s\""
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Kunde inte komma åt nyckelring: \"%s\""
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: Argumentslistan från Acquire::gpgv::Options är för lång. Avslutar."
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: Argumentslistan från Acquire::gpgv::Options är för lång. Avslutar."
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Internt fel: Korrekt signatur men kunde inte fastställa nyckelns "
 "fingeravtryck?!"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Internt fel: Korrekt signatur men kunde inte fastställa nyckelns "
 "fingeravtryck?!"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "Minst en ogiltig signatur träffades på."
 
 msgid "At least one invalid signature was encountered."
 msgstr "Minst en ogiltig signatur träffades på."
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Kunde inte köra \"%s\" för att verifiera signatur (är gpgv installerad?)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Kunde inte köra \"%s\" för att verifiera signatur (är gpgv installerad?)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "Okänt fel vid körning av gpgv"
 
 msgid "Unknown error executing gpgv"
 msgstr "Okänt fel vid körning av gpgv"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "Följande signaturer är ogiltiga:\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "Följande signaturer är ogiltiga:\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -2013,80 +2019,80 @@ msgstr "Kunde inte öppna rör för %s"
 msgid "Read error from %s process"
 msgstr "Läsfel från %s-processen"
 
 msgid "Read error from %s process"
 msgstr "Läsfel från %s-processen"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "Väntar på rubriker"
 
 msgid "Waiting for headers"
 msgstr "Väntar på rubriker"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Fick en ensam rubrikrad på %u tecken"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Fick en ensam rubrikrad på %u tecken"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "Felaktig rubrikrad"
 
 msgid "Bad header line"
 msgstr "Felaktig rubrikrad"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "Http-servern sände ett ogiltigt svarshuvud"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Http-servern sände ett ogiltigt svarshuvud"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Http-servern sände ett ogiltigt Content-Length-rubrik"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Http-servern sände ett ogiltigt Content-Length-rubrik"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Http-servern sände ett ogiltigt Content-Range-rubrik"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Http-servern sände ett ogiltigt Content-Range-rubrik"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "Den här http-serverns stöd för delvis hämtning fungerar inte"
 
 msgid "This HTTP server has broken range support"
 msgstr "Den här http-serverns stöd för delvis hämtning fungerar inte"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "Okänt datumformat"
 
 msgid "Unknown date format"
 msgstr "Okänt datumformat"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "\"Select\" misslyckades"
 
 msgid "Select failed"
 msgstr "\"Select\" misslyckades"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "Anslutningen överskred tidsgränsen"
 
 msgid "Connection timed out"
 msgstr "Anslutningen överskred tidsgränsen"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "Fel vid skrivning till utdatafil"
 
 msgid "Error writing to output file"
 msgstr "Fel vid skrivning till utdatafil"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "Fel vid skrivning till fil"
 
 msgid "Error writing to file"
 msgstr "Fel vid skrivning till fil"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "Fel vid skrivning till filen"
 
 msgid "Error writing to the file"
 msgstr "Fel vid skrivning till filen"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "Fel vid läsning från server: Andra änden stängde förbindelsen"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Fel vid läsning från server: Andra änden stängde förbindelsen"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "Fel vid läsning från server"
 
 msgid "Error reading from server"
 msgstr "Fel vid läsning från server"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 msgid "Failed to truncate file"
 msgstr "Misslyckades med att kapa av filen"
 
 msgid "Failed to truncate file"
 msgstr "Misslyckades med att kapa av filen"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "Felaktiga data i huvud"
 
 msgid "Bad header data"
 msgstr "Felaktiga data i huvud"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "Anslutningen misslyckades"
 
 msgid "Connection failed"
 msgstr "Anslutningen misslyckades"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "Internt fel"
 
 msgid "Internal error"
 msgstr "Internt fel"
 


@@ -2108,7 +2114,31 @@ msgstr ""
 "Dynamisk MMap fick slut på utrymme. Öka storleken för APT::Cache-Limit. "
 "Aktuellt värde: %lu. (man 5 apt.conf)"
 
 "Dynamisk MMap fick slut på utrymme. Öka storleken för APT::Cache-Limit. "
 "Aktuellt värde: %lu. (man 5 apt.conf)"
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "Valet %s hittades inte"
 #, c-format
 msgid "Selection %s not found"
 msgstr "Valet %s hittades inte"


@@ -2541,7 +2571,7 @@ msgstr "Metoddrivrutinen %s kunde inte hittas."
 msgid "Method %s did not start correctly"
 msgstr "Metoden %s startade inte korrekt"
 
 msgid "Method %s did not start correctly"
 msgstr "Metoden %s startade inte korrekt"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""


@@ -2908,11 +2938,15 @@ msgstr "Förbereder borttagning av hela %s"
 msgid "Completely removed %s"
 msgstr "Tog bort hela %s"
 
 msgid "Completely removed %s"
 msgstr "Tog bort hela %s"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Kan inte skriva loggfil, openpty() misslyckades (/dev/pts inte monterad?)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Kan inte skriva loggfil, openpty() misslyckades (/dev/pts inte monterad?)\n"
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Kunde inte lägga på programfix på filen"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Kunde inte lägga på programfix på filen"

diff --git a/po/th.po b/po/th.po
index 0f9e9bc4c227bbaf903f6efea73ad52f31abbec9..a33a86ddfe4715ed0c0e1910c4df762ee9355731 100644 (file)
--- a/po/th.po
+++ b/po/th.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2008-11-06 15:54+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
 "PO-Revision-Date: 2008-11-06 15:54+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"


@@ -157,7 +157,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s สำหรับ %s คอมไพล์เมื่อ %s %s\n"
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s สำหรับ %s คอมไพล์เมื่อ %s %s\n"


@@ -648,7 +648,7 @@ msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไป
 msgid "Y"
 msgstr "Y"
 
 msgid "Y"
 msgstr "Y"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s"


@@ -809,11 +809,11 @@ msgstr "มีแพกเกจที่จำเป็นต้องถอด
 msgid "Internal error, Ordering didn't finish"
 msgstr "ข้อผิดพลาดภายใน: การเรียงลำดับไม่เสร็จสิ้น"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "ข้อผิดพลาดภายใน: การเรียงลำดับไม่เสร็จสิ้น"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "ไม่สามารถล็อคไดเรกทอรีดาวน์โหลด"
 
 msgid "Unable to lock the download directory"
 msgstr "ไม่สามารถล็อคไดเรกทอรีดาวน์โหลด"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "ไม่สามารถอ่านรายชื่อแหล่งแพกเกจได้"
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "ไม่สามารถอ่านรายชื่อแหล่งแพกเกจได้"


@@ -842,7 +842,7 @@ msgstr "หลังจากการกระทำนี้ ต้องใ
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "หลังจากการกระทำนี้ เนื้อที่บนดิสก์จะว่างเพิ่มอีก %sB\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "หลังจากการกระทำนี้ เนื้อที่บนดิสก์จะว่างเพิ่มอีก %sB\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "ไม่สามารถคำนวณพื้นที่ว่างใน %s"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "ไม่สามารถคำนวณพื้นที่ว่างใน %s"


@@ -879,7 +879,7 @@ msgstr "เลิกทำ"
 msgid "Do you want to continue [Y/n]? "
 msgstr "คุณต้องการจะดำเนินการต่อไปหรือไม่ [Y/n]?"
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "คุณต้องการจะดำเนินการต่อไปหรือไม่ [Y/n]?"
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "ไม่สามารถดาวน์โหลด %s  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "ไม่สามารถดาวน์โหลด %s  %s\n"


@@ -888,7 +888,7 @@ msgstr "ไม่สามารถดาวน์โหลด %s  %s\n"
 msgid "Some files failed to download"
 msgstr "ดาวน์โหลดบางแฟ้มไม่สำเร็จ"
 
 msgid "Some files failed to download"
 msgstr "ดาวน์โหลดบางแฟ้มไม่สำเร็จ"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "ดาวน์โหลดสำเร็จแล้ว และอยู่ในโหมดดาวน์โหลดอย่างเดียว"
 
 msgid "Download complete and in download only mode"
 msgstr "ดาวน์โหลดสำเร็จแล้ว และอยู่ในโหมดดาวน์โหลดอย่างเดียว"
 


@@ -984,29 +984,34 @@ msgstr "ไม่พบรุ่น '%s' ของ '%s'"
 msgid "Selected version %s (%s) for %s\n"
 msgstr "เลือกรุ่น %s (%s) สำหรับ %s แล้ว\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "เลือกรุ่น %s (%s) สำหรับ %s แล้ว\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม"
 
 msgid "The update command takes no arguments"
 msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "ไม่สามารถล็อคไดเรกทอรีรายชื่อแพกเกจ"
 
 msgid "Unable to lock the list directory"
 msgstr "ไม่สามารถล็อคไดเรกทอรีรายชื่อแพกเกจ"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "apt ถูกกำหนดไม่ให้มีการลบใดๆ จึงไม่สามารถดำเนินการถอดถอนอัตโนมัติได้"
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "apt ถูกกำหนดไม่ให้มีการลบใดๆ จึงไม่สามารถดำเนินการถอดถอนอัตโนมัติได้"
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "แพกเกจต่อไปนี้ถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว:"
 
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "แพกเกจต่อไปนี้ถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "ใช้ 'apt-get autoremove' เพื่อลบแพกเกจดังกล่าวได้"
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "ใช้ 'apt-get autoremove' เพื่อลบแพกเกจดังกล่าวได้"
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1024,43 +1029,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "ข้อมูลต่อไปนี้อาจช่วยแก้ปัญหาได้:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "ข้อมูลต่อไปนี้อาจช่วยแก้ปัญหาได้:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "เกิดข้อผิดพลาดภายใน: AutoRemover ทำความเสียหาย"
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "เกิดข้อผิดพลาดภายใน: AutoRemover ทำความเสียหาย"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "เกิดข้อผิดพลาดภายใน: AllUpgrade ทำความเสียหาย"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "เกิดข้อผิดพลาดภายใน: AllUpgrade ทำความเสียหาย"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr "ไม่พบงาน %s"
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "ไม่พบงาน %s"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "ไม่พบแพกเกจ %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "ไม่พบแพกเกจ %s"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "หมายเหตุ: จะเลือก %s สำหรับนิพจน์เรกิวลาร์ '%s'\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "หมายเหตุ: จะเลือก %s สำหรับนิพจน์เรกิวลาร์ '%s'\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "กำหนด %s ให้เป็นการติดตั้งแบบเลือกเองแล้ว\n"
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "กำหนด %s ให้เป็นการติดตั้งแบบเลือกเองแล้ว\n"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "คุณอาจเรียก `apt-get -f install' เพื่อแก้ปัญหานี้ได้:"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "คุณอาจเรียก `apt-get -f install' เพื่อแก้ปัญหานี้ได้:"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1068,7 +1073,7 @@ msgstr ""
 "มีปัญหาความขึ้นต่อกันระหว่างแพกเกจ กรุณาลองใช้ 'apt-get -f install' โดยไม่ระบุแพกเกจ "
 "(หรือจะระบุทางแก้ก็ได้)"
 
 "มีปัญหาความขึ้นต่อกันระหว่างแพกเกจ กรุณาลองใช้ 'apt-get -f install' โดยไม่ระบุแพกเกจ "
 "(หรือจะระบุทางแก้ก็ได้)"
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1079,122 +1084,122 @@ msgstr ""
 "หรือถ้าคุณกำลังใช้รุ่น unstable ก็เป็นไปได้ว่าแพกเกจที่จำเป็นบางรายการ\n"
 "ยังไม่ถูกสร้างขึ้น หรือถูกย้ายออกจาก Incoming"
 
 "หรือถ้าคุณกำลังใช้รุ่น unstable ก็เป็นไปได้ว่าแพกเกจที่จำเป็นบางรายการ\n"
 "ยังไม่ถูกสร้างขึ้น หรือถูกย้ายออกจาก Incoming"
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "แพกเกจมีปัญหา"
 
 msgid "Broken packages"
 msgstr "แพกเกจมีปัญหา"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "จะติดตั้งแพกเกจเพิ่มเติมต่อไปนี้:"
 
 msgid "The following extra packages will be installed:"
 msgstr "จะติดตั้งแพกเกจเพิ่มเติมต่อไปนี้:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "แพกเกจที่แนะนำ:"
 
 msgid "Suggested packages:"
 msgstr "แพกเกจที่แนะนำ:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "แพกเกจที่ควรใช้ร่วมกัน:"
 
 msgid "Recommended packages:"
 msgstr "แพกเกจที่ควรใช้ร่วมกัน:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "กำลังคำนวณการปรับรุ่น... "
 
 msgid "Calculating upgrade... "
 msgstr "กำลังคำนวณการปรับรุ่น... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "ล้มเหลว"
 
 msgid "Failed"
 msgstr "ล้มเหลว"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "เสร็จแล้ว"
 
 msgid "Done"
 msgstr "เสร็จแล้ว"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr "เกิดข้อผิดพลาดภายใน: กลไกการแก้ปัญหาทำความเสียหาย"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "เกิดข้อผิดพลาดภายใน: กลไกการแก้ปัญหาทำความเสียหาย"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะดาวน์โหลดซอร์สโค้ด"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะดาวน์โหลดซอร์สโค้ด"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "ไม่พบแพกเกจซอร์สโค้ดสำหรับ %s"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "ไม่พบแพกเกจซอร์สโค้ดสำหรับ %s"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "จะข้ามแฟ้ม '%s' ที่ดาวน์โหลดไว้แล้ว\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "จะข้ามแฟ้ม '%s' ที่ดาวน์โหลดไว้แล้ว\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB/%sB\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB/%sB\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ดาวน์โหลดซอร์ส %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ดาวน์โหลดซอร์ส %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "ไม่สามารถดาวน์โหลดบางแฟ้ม"
 
 msgid "Failed to fetch some archives."
 msgstr "ไม่สามารถดาวน์โหลดบางแฟ้ม"
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "จะข้ามการแตกซอร์สของซอร์สที่แตกไว้แล้วใน %s\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "จะข้ามการแตกซอร์สของซอร์สที่แตกไว้แล้วใน %s\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "คำสั่งแตกแฟ้ม '%s' ล้มเหลว\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "คำสั่งแตกแฟ้ม '%s' ล้มเหลว\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "กรุณาตรวจสอบว่าได้ติดตั้งแพกเกจ 'dpkg-dev' แล้ว\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "กรุณาตรวจสอบว่าได้ติดตั้งแพกเกจ 'dpkg-dev' แล้ว\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "คำสั่ง build '%s' ล้มเหลว\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "คำสั่ง build '%s' ล้มเหลว\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "โพรเซสลูกล้มเหลว"
 
 msgid "Child process failed"
 msgstr "โพรเซสลูกล้มเหลว"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะตรวจสอบสิ่งที่ต้องการสำหรับการ build"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะตรวจสอบสิ่งที่ต้องการสำหรับการ build"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "ไม่สามารถอ่านข้อมูลสิ่งที่ต้องการสำหรับการ build ของ %s"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "ไม่สามารถอ่านข้อมูลสิ่งที่ต้องการสำหรับการ build ของ %s"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ไม่ต้องการสิ่งใดสำหรับ build\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ไม่ต้องการสิ่งใดสำหรับ build\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่พบแพกเกจ %s"
 
 #, 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:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1203,30 +1208,31 @@ msgstr ""
 "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่มีแพกเกจ %s "
 "รุ่นที่จะสอดคล้องกับความต้องการรุ่นของแพกเกจได้"
 
 "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่มีแพกเกจ %s "
 "รุ่นที่จะสอดคล้องกับความต้องการรุ่นของแพกเกจได้"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: แพกเกจ %s ที่ติดตั้งไว้ใหม่เกินไป"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: แพกเกจ %s ที่ติดตั้งไว้ใหม่เกินไป"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: %s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "ไม่สามารถติดตั้งสิ่งที่จำเป็นสำหรับการ build ของ %s ได้"
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "ไม่สามารถติดตั้งสิ่งที่จำเป็นสำหรับการ build ของ %s ได้"
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับการ build ไม่สำเร็จ"
 
 msgid "Failed to process build dependencies"
 msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับการ build ไม่สำเร็จ"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "มอดูลที่รองรับ:"
 
 msgid "Supported modules:"
 msgstr "มอดูลที่รองรับ:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1242,7 +1248,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1833,7 +1839,7 @@ msgstr "หมดเวลารอเชื่อมต่อซ็อกเก
 msgid "Unable to accept connection"
 msgstr "ไม่สามารถรับการเชื่อมต่อ"
 
 msgid "Unable to accept connection"
 msgstr "ไม่สามารถรับการเชื่อมต่อ"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "เกิดปัญหาขณะคำนวณค่าแฮชของแฟ้ม"
 
 msgid "Problem hashing file"
 msgstr "เกิดปัญหาขณะคำนวณค่าแฮชของแฟ้ม"
 


@@ -1917,38 +1923,38 @@ msgstr "เกิดปัญหาร้ายแรงบางอย่าง
 msgid "Unable to connect to %s %s:"
 msgstr "ไม่สามารถเชื่อมต่อไปยัง %s %s:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "ไม่สามารถเชื่อมต่อไปยัง %s %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "ไม่สามารถเข้าใช้พวงกุญแจ: '%s'"
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "ไม่สามารถเข้าใช้พวงกุญแจ: '%s'"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: รายการอาร์กิวเมนต์ใน Acquire::gpgv::Options ยาวเกินไป จะจบการทำงาน"
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: รายการอาร์กิวเมนต์ใน Acquire::gpgv::Options ยาวเกินไป จะจบการทำงาน"
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "ข้อผิดพลาดภายใน: ลายเซ็นใช้การได้ แต่ไม่สามารถระบุลายนิ้วมือของกุญแจ?!"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "ข้อผิดพลาดภายใน: ลายเซ็นใช้การได้ แต่ไม่สามารถระบุลายนิ้วมือของกุญแจ?!"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "พบลายเซ็นที่ใช้การไม่ได้อย่างน้อยหนึ่งรายการ"
 
 msgid "At least one invalid signature was encountered."
 msgstr "พบลายเซ็นที่ใช้การไม่ได้อย่างน้อยหนึ่งรายการ"
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "ไม่สามารถเรียก '%s' เพื่อตรวจสอบลายเซ็น (ได้ติดตั้ง gpgv ไว้หรือไม่?)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "ไม่สามารถเรียก '%s' เพื่อตรวจสอบลายเซ็น (ได้ติดตั้ง gpgv ไว้หรือไม่?)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุขณะเรียก gpgv"
 
 msgid "Unknown error executing gpgv"
 msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุขณะเรียก gpgv"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "ลายเซ็นต่อไปนี้ใช้การไม่ได้:\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "ลายเซ็นต่อไปนี้ใช้การไม่ได้:\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -1964,80 +1970,80 @@ msgstr "ไม่สามารถเปิดไปป์สำหรับ %s
 msgid "Read error from %s process"
 msgstr "เกิดข้อผิดพลาดขณะอ่านจากโพรเซส %s"
 
 msgid "Read error from %s process"
 msgstr "เกิดข้อผิดพลาดขณะอ่านจากโพรเซส %s"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "รอหัวข้อมูล"
 
 msgid "Waiting for headers"
 msgstr "รอหัวข้อมูล"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "ได้รับบรรทัดข้อมูลส่วนหัวยาวเกิน %u อักขระ"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "ได้รับบรรทัดข้อมูลส่วนหัวยาวเกิน %u อักขระ"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "บรรทัดข้อมูลส่วนหัวผิดพลาด"
 
 msgid "Bad header line"
 msgstr "บรรทัดข้อมูลส่วนหัวผิดพลาด"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัวตอบมาไม่ถูกต้อง"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัวตอบมาไม่ถูกต้อง"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัว Content-Length มาไม่ถูกต้อง"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัว Content-Length มาไม่ถูกต้อง"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัว Content-Range มาไม่ถูกต้อง"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัว Content-Range มาไม่ถูกต้อง"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "การสนับสนุน Content-Range ที่เซิร์ฟเวอร์ HTTP ผิดพลาด"
 
 msgid "This HTTP server has broken range support"
 msgstr "การสนับสนุน Content-Range ที่เซิร์ฟเวอร์ HTTP ผิดพลาด"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "พบรูปแบบวันที่ที่ไม่รู้จัก"
 
 msgid "Unknown date format"
 msgstr "พบรูปแบบวันที่ที่ไม่รู้จัก"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "select ไม่สำเร็จ"
 
 msgid "Select failed"
 msgstr "select ไม่สำเร็จ"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "หมดเวลารอเชื่อมต่อ"
 
 msgid "Connection timed out"
 msgstr "หมดเวลารอเชื่อมต่อ"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้มผลลัพธ์"
 
 msgid "Error writing to output file"
 msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้มผลลัพธ์"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม"
 
 msgid "Error writing to file"
 msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม"
 
 msgid "Error writing to the file"
 msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์ ปลายทางอีกด้านหนึ่งปิดการเชื่อมต่อ"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์ ปลายทางอีกด้านหนึ่งปิดการเชื่อมต่อ"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์"
 
 msgid "Error reading from server"
 msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 msgid "Failed to truncate file"
 msgstr "ไม่สามารถตัดท้ายแฟ้ม"
 
 msgid "Failed to truncate file"
 msgstr "ไม่สามารถตัดท้ายแฟ้ม"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "ข้อมูลส่วนหัวผิดพลาด"
 
 msgid "Bad header data"
 msgstr "ข้อมูลส่วนหัวผิดพลาด"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "เชื่อมต่อไม่สำเร็จ"
 
 msgid "Connection failed"
 msgstr "เชื่อมต่อไม่สำเร็จ"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "ข้อผิดพลาดภายใน"
 
 msgid "Internal error"
 msgstr "ข้อผิดพลาดภายใน"
 


@@ -2057,7 +2063,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "ไม่พบรายการเลือก %s"
 #, c-format
 msgid "Selection %s not found"
 msgstr "ไม่พบรายการเลือก %s"


@@ -2482,7 +2512,7 @@ msgstr "ไม่พบไดรเวอร์สำหรับวิธีก
 msgid "Method %s did not start correctly"
 msgstr "ไม่สามารถเรียกทำงานวิธีการ %s"
 
 msgid "Method %s did not start correctly"
 msgstr "ไม่สามารถเรียกทำงานวิธีการ %s"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "กรุณาใส่แผ่นชื่อ: '%s' ลงในไดรว์ '%s' แล้วกด enter"
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "กรุณาใส่แผ่นชื่อ: '%s' ลงในไดรว์ '%s' แล้วกด enter"


@@ -2839,12 +2869,16 @@ msgstr "กำลังเตรียมถอดถอน %s อย่าง
 msgid "Completely removed %s"
 msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว"
 
 msgid "Completely removed %s"
 msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "ไม่สามารถเขียนบันทึกปฏิบัติการ เนื่องจาก openpty() ล้มเหลว (ไม่ได้เมานท์ /dev/pts "
 "หรือเปล่า?)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "ไม่สามารถเขียนบันทึกปฏิบัติการ เนื่องจาก openpty() ล้มเหลว (ไม่ได้เมานท์ /dev/pts "
 "หรือเปล่า?)\n"
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "ไม่สามารถแพตช์แฟ้ม"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "ไม่สามารถแพตช์แฟ้ม"

diff --git a/po/tl.po b/po/tl.po
index 996559be50a4a8423951e6d69f1f3ffba38ea9a6..870260d85639d80f6c74d54e82213f527e4f2d06 100644 (file)
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2007-03-29 21:36+0800\n"
 "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
 "PO-Revision-Date: 2007-03-29 21:36+0800\n"
 "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"


@@ -162,7 +162,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para sa %s %s kinompile noong %s %s\n"
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para sa %s %s kinompile noong %s %s\n"


@@ -666,7 +666,7 @@ msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
 msgid "Y"
 msgstr "O"
 
 msgid "Y"
 msgstr "O"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Error sa pag-compile ng regex - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Error sa pag-compile ng regex - %s"


@@ -831,11 +831,11 @@ msgstr ""
 msgid "Internal error, Ordering didn't finish"
 msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "Hindi maaldaba ang directory ng download"
 
 msgid "Unable to lock the download directory"
 msgstr "Hindi maaldaba ang directory ng download"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)."


@@ -867,7 +867,7 @@ msgstr ""
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Hindi matantsa ang libreng puwang sa %s"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Hindi matantsa ang libreng puwang sa %s"


@@ -904,7 +904,7 @@ msgstr "Abort."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Nais niyo bang magpatuloy [O/h]? "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "Nais niyo bang magpatuloy [O/h]? "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Bigo sa pagkuha ng %s  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Bigo sa pagkuha ng %s  %s\n"


@@ -913,7 +913,7 @@ msgstr "Bigo sa pagkuha ng %s  %s\n"
 msgid "Some files failed to download"
 msgstr "May mga talaksang hindi nakuha"
 
 msgid "Some files failed to download"
 msgstr "May mga talaksang hindi nakuha"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang"
 
 msgid "Download complete and in download only mode"
 msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang"
 


@@ -1011,30 +1011,35 @@ msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap"
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Ang napiling bersyon %s (%s) para sa %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Ang napiling bersyon %s (%s) para sa %s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento"
 
 msgid "The update command takes no arguments"
 msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "Hindi maaldaba ang directory ng talaan"
 
 msgid "Unable to lock the list directory"
 msgstr "Hindi maaldaba ang directory ng talaan"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
 
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1050,46 +1055,46 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr ""
 "Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 "Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Error na internal, may nasira ang problem resolver"
 
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Error na internal, may nasira ang problem resolver"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "Hindi mahanap ang paketeng %s"
 
 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "Hindi mahanap ang paketeng %s"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Hindi mahanap ang paketeng %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Hindi mahanap ang paketeng %s"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Paunawa, pinili ang %s para sa regex '%s'\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Paunawa, pinili ang %s para sa regex '%s'\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ngunit ang %s ay iluluklok"
 
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ngunit ang %s ay iluluklok"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 "Maaaring patakbuhin niyo ang `apt-get -f install' upang ayusin ang mga ito:"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 "Maaaring patakbuhin niyo ang `apt-get -f install' upang ayusin ang mga ito:"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1097,7 +1102,7 @@ msgstr ""
 "May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang "
 "mga pakete (o magtakda ng solusyon)."
 
 "May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang "
 "mga pakete (o magtakda ng solusyon)."
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1108,115 +1113,115 @@ msgstr ""
 "o kung kayo'y gumagamit ng pamudmod na unstable ay may ilang mga paketeng\n"
 "kailangan na hindi pa nalikha o linipat mula sa Incoming."
 
 "o kung kayo'y gumagamit ng pamudmod na unstable ay may ilang mga paketeng\n"
 "kailangan na hindi pa nalikha o linipat mula sa Incoming."
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "Sirang mga pakete"
 
 msgid "Broken packages"
 msgstr "Sirang mga pakete"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:"
 
 msgid "The following extra packages will be installed:"
 msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "Mga paketeng mungkahi:"
 
 msgid "Suggested packages:"
 msgstr "Mga paketeng mungkahi:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "Mga paketeng rekomendado:"
 
 msgid "Recommended packages:"
 msgstr "Mga paketeng rekomendado:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "Sinusuri ang pag-upgrade... "
 
 msgid "Calculating upgrade... "
 msgstr "Sinusuri ang pag-upgrade... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "Bigo"
 
 msgid "Failed"
 msgstr "Bigo"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "Tapos"
 
 msgid "Done"
 msgstr "Tapos"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr "Error na internal, may nasira ang problem resolver"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Error na internal, may nasira ang problem resolver"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Hindi mahanap ang paketeng source para sa %s"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Hindi mahanap ang paketeng source para sa %s"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Linaktawan ang nakuha na na talaksan '%s'\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Linaktawan ang nakuha na na talaksan '%s'\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Kulang kayo ng libreng puwang sa %s"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Kulang kayo ng libreng puwang sa %s"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Kailangang kumuha ng %sB ng arkibong source.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Kailangang kumuha ng %sB ng arkibong source.\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Kunin ang Source %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Kunin ang Source %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "Bigo sa pagkuha ng ilang mga arkibo."
 
 msgid "Failed to fetch some archives."
 msgstr "Bigo sa pagkuha ng ilang mga arkibo."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Bigo ang utos ng pagbuklat '%s'.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Bigo ang utos ng pagbuklat '%s'.\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Utos na build '%s' ay bigo.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Utos na build '%s' ay bigo.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "Bigo ang prosesong anak"
 
 msgid "Child process failed"
 msgstr "Bigo ang prosesong anak"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr "Kailangang magtakda ng kahit isang pakete na susuriin ang builddeps"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr "Kailangang magtakda ng kahit isang pakete na susuriin ang builddeps"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Hindi makuha ang impormasyong build-dependency para sa %s"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Hindi makuha ang impormasyong build-dependency para sa %s"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Walang build depends ang %s.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Walang build depends ang %s.\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "


@@ -1225,7 +1230,7 @@ msgstr ""
 "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
 "mahanap"
 
 "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
 "mahanap"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1234,32 +1239,32 @@ msgstr ""
 "Dependensiyang %s para sa %s ay hindi mabuo dahil walang magamit na bersyon "
 "ng paketeng %s na tumutugon sa kinakailangang bersyon"
 
 "Dependensiyang %s para sa %s ay hindi mabuo dahil walang magamit na bersyon "
 "ng paketeng %s na tumutugon sa kinakailangang bersyon"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %"
 "s ay bagong-bago pa lamang."
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %"
 "s ay bagong-bago pa lamang."
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Hindi mabuo ang build-dependencies para sa %s."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Hindi mabuo ang build-dependencies para sa %s."
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "Bigo sa pagproseso ng build dependencies"
 
 msgid "Failed to process build dependencies"
 msgstr "Bigo sa pagproseso ng build dependencies"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "Suportadong mga Module:"
 
 msgid "Supported modules:"
 msgstr "Suportadong mga Module:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628

 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"


@@ -1276,7 +1281,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1875,7 +1880,7 @@ msgstr "Nag-timeout ang socket ng datos"
 msgid "Unable to accept connection"
 msgstr "Hindi makatanggap ng koneksyon"
 
 msgid "Unable to accept connection"
 msgstr "Hindi makatanggap ng koneksyon"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "Problema sa pag-hash ng talaksan"
 
 msgid "Problem hashing file"
 msgstr "Problema sa pag-hash ng talaksan"
 


@@ -1959,43 +1964,43 @@ msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Hindi maka-konekta sa %s %s:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "Hindi maka-konekta sa %s %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Hindi mabasa ang keyring: '%s'"
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Hindi mabasa ang keyring: '%s'"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: Sobrang haba ng talaan ng argumento mula sa Acquire::gpgv::Options. "
 "Lalabas."
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: Sobrang haba ng talaan ng argumento mula sa Acquire::gpgv::Options. "
 "Lalabas."
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Error na internal: Tanggap na lagda, ngunit hindi malaman ang key "
 "fingerprint?!"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Error na internal: Tanggap na lagda, ngunit hindi malaman ang key "
 "fingerprint?!"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "Hindi kukulang sa isang hindi tanggap na lagda ang na-enkwentro."
 
 msgid "At least one invalid signature was encountered."
 msgstr "Hindi kukulang sa isang hindi tanggap na lagda ang na-enkwentro."
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Hindi maitakbo ang '%s' upang maberipika ang lagda (nakaluklok ba ang gpgv?)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Hindi maitakbo ang '%s' upang maberipika ang lagda (nakaluklok ba ang gpgv?)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "Hindi kilalang error sa pag-execute ng gpgv"
 
 msgid "Unknown error executing gpgv"
 msgstr "Hindi kilalang error sa pag-execute ng gpgv"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "Ang sumusunod na mga lagda ay imbalido:\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "Ang sumusunod na mga lagda ay imbalido:\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -2013,81 +2018,81 @@ msgstr "Hindi makapag-bukas ng pipe para sa %s"
 msgid "Read error from %s process"
 msgstr "Error sa pagbasa mula sa prosesong %s"
 
 msgid "Read error from %s process"
 msgstr "Error sa pagbasa mula sa prosesong %s"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "Naghihintay ng panimula"
 
 msgid "Waiting for headers"
 msgstr "Naghihintay ng panimula"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Nakatanggap ng isang linyang panimula mula %u na mga karakter"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Nakatanggap ng isang linyang panimula mula %u na mga karakter"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "Maling linyang panimula"
 
 msgid "Bad header line"
 msgstr "Maling linyang panimula"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "Nagpadala ang HTTP server ng di tanggap na reply header"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Nagpadala ang HTTP server ng di tanggap na reply header"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Length header"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Length header"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Range header"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Range header"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "Sira ang range support ng HTTP server na ito"
 
 msgid "This HTTP server has broken range support"
 msgstr "Sira ang range support ng HTTP server na ito"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "Di kilalang anyo ng petsa"
 
 msgid "Unknown date format"
 msgstr "Di kilalang anyo ng petsa"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "Bigo ang pagpili"
 
 msgid "Select failed"
 msgstr "Bigo ang pagpili"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "Nag-timeout ang koneksyon"
 
 msgid "Connection timed out"
 msgstr "Nag-timeout ang koneksyon"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "Error sa pagsulat ng talaksang output"
 
 msgid "Error writing to output file"
 msgstr "Error sa pagsulat ng talaksang output"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "Error sa pagsulat sa talaksan"
 
 msgid "Error writing to file"
 msgstr "Error sa pagsulat sa talaksan"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "Error sa pagsusulat sa talaksan"
 
 msgid "Error writing to the file"
 msgstr "Error sa pagsusulat sa talaksan"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "Error sa pagbasa mula sa server"
 
 msgid "Error reading from server"
 msgstr "Error sa pagbasa mula sa server"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Bigo sa pagsulat ng talaksang %s"
 
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Bigo sa pagsulat ng talaksang %s"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "Maling datos sa panimula"
 
 msgid "Bad header data"
 msgstr "Maling datos sa panimula"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "Bigo ang koneksyon"
 
 msgid "Connection failed"
 msgstr "Bigo ang koneksyon"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "Internal na error"
 
 msgid "Internal error"
 msgstr "Internal na error"
 


@@ -2107,7 +2112,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "Piniling %s ay hindi nahanap"
 #, c-format
 msgid "Selection %s not found"
 msgstr "Piniling %s ay hindi nahanap"


@@ -2544,7 +2573,7 @@ msgstr "Ang driver ng paraang %s ay hindi mahanap."
 msgid "Method %s did not start correctly"
 msgstr "Hindi umandar ng tama ang paraang %s"
 
 msgid "Method %s did not start correctly"
 msgstr "Hindi umandar ng tama ang paraang %s"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""


@@ -2918,10 +2947,14 @@ msgstr "Naghahanda upang tanggalin ng lubusan ang %s"
 msgid "Completely removed %s"
 msgstr "Natanggal ng lubusan ang %s"
 
 msgid "Completely removed %s"
 msgstr "Natanggal ng lubusan ang %s"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Hindi mai-patch ang talaksan"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Hindi mai-patch ang talaksan"

diff --git a/po/uk.po b/po/uk.po
index 2951c4c200cc468b104193e0f8ba536ad8124185..b732afa462a0b61f6003923b59b499ce5fc44c1a 100644 (file)
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-all\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt-all\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2006-07-29 15:57+0300\n"
 "Last-Translator: Artem Bondarenko <artem.brz@gmail.com>\n"
 "Language-Team: Українська <uk@li.org>\n"
 "PO-Revision-Date: 2006-07-29 15:57+0300\n"
 "Last-Translator: Artem Bondarenko <artem.brz@gmail.com>\n"
 "Language-Team: Українська <uk@li.org>\n"


@@ -158,7 +158,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s для %s %s скомпільовано %s %s\n"
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s для %s %s скомпільовано %s %s\n"


@@ -664,7 +664,7 @@ msgstr "Не вдалося перейменувати %s в %s"
 msgid "Y"
 msgstr "Т"
 
 msgid "Y"
 msgstr "Т"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Помилка компіляції регулярного виразу - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Помилка компіляції регулярного виразу - %s"


@@ -829,11 +829,11 @@ msgstr "Пакунки необхідно видалити, але видале
 msgid "Internal error, Ordering didn't finish"
 msgstr "Внутрішня помилка, Ordering не завершилася"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "Внутрішня помилка, Ordering не завершилася"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "Неможливо заблокувати теку для завантаження"
 
 msgid "Unable to lock the download directory"
 msgstr "Неможливо заблокувати теку для завантаження"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Неможливо прочитати перелік джерел."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Неможливо прочитати перелік джерел."


@@ -863,7 +863,7 @@ msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 "Після розпакування об'єм зайнятого дискового простору зменшиться на %sB.\n"
 
 msgstr ""
 "Після розпакування об'єм зайнятого дискового простору зменшиться на %sB.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Не вдалося визначити кількість вільного місця в %s"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Не вдалося визначити кількість вільного місця в %s"


@@ -902,7 +902,7 @@ msgstr "Перервано."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Бажаєте продовжити [Т/н]? "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "Бажаєте продовжити [Т/н]? "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Не вдалося завантажити %s  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Не вдалося завантажити %s  %s\n"


@@ -911,7 +911,7 @@ msgstr "Не вдалося завантажити %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Деякі файли не вдалося завантажити"
 
 msgid "Some files failed to download"
 msgstr "Деякі файли не вдалося завантажити"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "Вказано режим \"тільки завантаження\", і завантаження завершено"
 
 msgid "Download complete and in download only mode"
 msgstr "Вказано режим \"тільки завантаження\", і завантаження завершено"
 


@@ -1011,30 +1011,35 @@ msgstr "Версія '%s' для '%s' не знайдена"
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Обрана версія %s (%s) для %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Обрана версія %s (%s) для %s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "Команді update не потрібні аргументи"
 
 msgid "The update command takes no arguments"
 msgstr "Команді update не потрібні аргументи"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "Неможливо заблокувати теку з переліками пакунків"
 
 msgid "Unable to lock the list directory"
 msgstr "Неможливо заблокувати теку з переліками пакунків"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "НОВІ пакунки були встановлені автоматично і більше не потрібні:"
 
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "НОВІ пакунки були встановлені автоматично і більше не потрібні:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Використовуйте 'apt-get autoremove' щоб видалити їх."
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Використовуйте 'apt-get autoremove' щоб видалити їх."
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1052,46 +1057,46 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "Наступна інформація можливо допоможе Вам:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "Наступна інформація можливо допоможе Вам:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Внутрішня помилка, вирішувач проблем все поламав"
 
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Внутрішня помилка, вирішувач проблем все поламав"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Внутрішня помилка, AllUpgrade все поламав"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Внутрішня помилка, AllUpgrade все поламав"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "Не можу знайти пакунок %s"
 
 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "Не можу знайти пакунок %s"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Не можу знайти пакунок %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Не можу знайти пакунок %s"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Помітьте, регулярний вираз %2$s призводить до вибору %1$s\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Помітьте, регулярний вираз %2$s призводить до вибору %1$s\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "але %s буде встановлений"
 
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "але %s буде встановлений"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 "Можливо, для виправлення цих помилок Ви захочете скористатися 'apt-get -f "
 "install':"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 "Можливо, для виправлення цих помилок Ви захочете скористатися 'apt-get -f "
 "install':"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1099,7 +1104,7 @@ msgstr ""
 "Незадоволені залежності. Спробуйте виконати 'apt-get -f install', не "
 "вказуючи імені пакунка (або знайдіть інше рішення)."
 
 "Незадоволені залежності. Спробуйте виконати 'apt-get -f install', не "
 "вказуючи імені пакунка (або знайдіть інше рішення)."
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1110,121 +1115,121 @@ msgstr ""
 "або ж використаєте нестабільний дистрибутив, і запитані Вами пакунки\n"
 "ще не створені або були вилучені з Incoming."
 
 "або ж використаєте нестабільний дистрибутив, і запитані Вами пакунки\n"
 "ще не створені або були вилучені з Incoming."
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "Зламані пакунки"
 
 msgid "Broken packages"
 msgstr "Зламані пакунки"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "Будуть встановлені наступні додаткові пакунки:"
 
 msgid "The following extra packages will be installed:"
 msgstr "Будуть встановлені наступні додаткові пакунки:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "Пропоновані пакунки:"
 
 msgid "Suggested packages:"
 msgstr "Пропоновані пакунки:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "Рекомендовані пакунки:"
 
 msgid "Recommended packages:"
 msgstr "Рекомендовані пакунки:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "Обчислення оновлень... "
 
 msgid "Calculating upgrade... "
 msgstr "Обчислення оновлень... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "Невдача"
 
 msgid "Failed"
 msgstr "Невдача"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "Виконано"
 
 msgid "Done"
 msgstr "Виконано"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr "Внутрішня помилка, вирішувач проблем все поламав"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Внутрішня помилка, вирішувач проблем все поламав"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні "
 "тексти"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні "
 "тексти"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Неможливо знайти пакунок з вихідними текстами для %s"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Неможливо знайти пакунок з вихідними текстами для %s"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Пропускаємо вже завантажений файл '%s'\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Пропускаємо вже завантажений файл '%s'\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Недостатньо місця в %s"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Недостатньо місця в %s"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Необхідно завантажити %sB/%sB з архівів вихідних текстів.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Необхідно завантажити %sB/%sB з архівів вихідних текстів.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Потрібно завантажити %sB архівів з вихідними текстами.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Потрібно завантажити %sB архівів з вихідними текстами.\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Завантаження вихідних текстів %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Завантаження вихідних текстів %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "Деякі архіви не вдалося завантажити."
 
 msgid "Failed to fetch some archives."
 msgstr "Деякі архіви не вдалося завантажити."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "Розпакування вихідних текстів пропущено, тому що в %s вже перебувають "
 "розпаковані вихідні тексти\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "Розпакування вихідних текстів пропущено, тому що в %s вже перебувають "
 "розпаковані вихідні тексти\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Команда розпакування '%s' завершилася невдало.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Команда розпакування '%s' завершилася невдало.\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Команда побудови '%s' закінчилася невдало.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Команда побудови '%s' закінчилася невдало.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "Породжений процес завершився невдало"
 
 msgid "Child process failed"
 msgstr "Породжений процес завершився невдало"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Для перевірки залежностей для побудови необхідно вказати як мінімум один "
 "пакунок"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Для перевірки залежностей для побудови необхідно вказати як мінімум один "
 "пакунок"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Неможливо одержати інформацію про залежності для побудови %s"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Неможливо одержати інформацію про залежності для побудови %s"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s не має залежностей для побудови.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s не має залежностей для побудови.\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "


@@ -1232,7 +1237,7 @@ msgid ""
 msgstr ""
 "Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено"
 
 msgstr ""
 "Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1241,32 +1246,32 @@ msgstr ""
 "Залежність типу %s для %s не може бути задоволена, бо ні одна з версій "
 "пакунка %s не задовольняє умови"
 
 "Залежність типу %s для %s не може бути задоволена, бо ні одна з версій "
 "пакунка %s не задовольняє умови"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Не вдалося задовольнити залежність типу %s для пакунка %s: Встановлений "
 "пакунок %s новіше, аніж треба"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Не вдалося задовольнити залежність типу %s для пакунка %s: Встановлений "
 "пакунок %s новіше, аніж треба"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Неможливо задовольнити залежність типу %s для пакунка %s: %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Неможливо задовольнити залежність типу %s для пакунка %s: %s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Залежності для побудови %s не можуть бути задоволені."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Залежності для побудови %s не можуть бути задоволені."
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "Обробка залежностей для побудови закінчилася невдало"
 
 msgid "Failed to process build dependencies"
 msgstr "Обробка залежностей для побудови закінчилася невдало"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "Підтримувані модулі:"
 
 msgid "Supported modules:"
 msgstr "Підтримувані модулі:"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628

 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"


@@ -1283,7 +1288,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1892,7 +1897,7 @@ msgstr "Час з'єднання з сокетом даних вичерпавс
 msgid "Unable to accept connection"
 msgstr "Неможливо прийняти з'єднання"
 
 msgid "Unable to accept connection"
 msgstr "Неможливо прийняти з'єднання"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "Проблема хешування файла"
 
 msgid "Problem hashing file"
 msgstr "Проблема хешування файла"
 


@@ -1976,41 +1981,41 @@ msgstr "Сталося щось дивне при спробі отримати
 msgid "Unable to connect to %s %s:"
 msgstr "Не можливо під'єднатися до %s %s:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "Не можливо під'єднатися до %s %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, fuzzy, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Неможливо отримати доступ до keyring: '%s'"
 
 #, fuzzy, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Неможливо отримати доступ до keyring: '%s'"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: Перелік аргументів з Acquire::gpgv::Options занадто довгий. Відміна."
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: Перелік аргументів з Acquire::gpgv::Options занадто довгий. Відміна."
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Внутрішня помилка: Вірний підпис (signature), але не можливо визначити його "
 "відбиток?!"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Внутрішня помилка: Вірний підпис (signature), але не можливо визначити його "
 "відбиток?!"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "Знайдено як мінімум один невірний підпис."
 
 msgid "At least one invalid signature was encountered."
 msgstr "Знайдено як мінімум один невірний підпис."
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "Неможливо виконати '%s' для перевірки підпису, gpgv встановлено?"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "Неможливо виконати '%s' для перевірки підпису, gpgv встановлено?"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "Невідома помилка виконання gpgv"
 
 msgid "Unknown error executing gpgv"
 msgstr "Невідома помилка виконання gpgv"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "Слідуючі підписи були невірними:\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "Слідуючі підписи були невірними:\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -2028,83 +2033,83 @@ msgstr "Неможливо відкрити канал (pipe) для %s"
 msgid "Read error from %s process"
 msgstr "Помилка читання з процесу %s"
 
 msgid "Read error from %s process"
 msgstr "Помилка читання з процесу %s"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "Очікування на заголовки"
 
 msgid "Waiting for headers"
 msgstr "Очікування на заголовки"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Отримано одну заголовкову лінію понад %u символів"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Отримано одну заголовкову лінію понад %u символів"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "Невірна лінія заголовку"
 
 msgid "Bad header line"
 msgstr "Невірна лінія заголовку"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP сервер відіслав невірний заголовок 'reply'"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP сервер відіслав невірний заголовок 'reply'"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP сервер відіслав невірний заголовок 'Content-Length'"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP сервер відіслав невірний заголовок 'Content-Length'"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP сервер відіслав невірний заголовок 'Content-Length'"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP сервер відіслав невірний заголовок 'Content-Length'"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "Цей HTTP сервер має поламану підтримку 'range'"
 
 msgid "This HTTP server has broken range support"
 msgstr "Цей HTTP сервер має поламану підтримку 'range'"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "Невідомий формат дати"
 
 msgid "Unknown date format"
 msgstr "Невідомий формат дати"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "Вибір не вдався"
 
 msgid "Select failed"
 msgstr "Вибір не вдався"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "Час очікування з'єднання вийшов"
 
 msgid "Connection timed out"
 msgstr "Час очікування з'єднання вийшов"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "Помилка запису в вихідний файл"
 
 msgid "Error writing to output file"
 msgstr "Помилка запису в вихідний файл"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 #, fuzzy
 msgid "Error writing to file"
 msgstr "Помилка запису в файл"
 
 #, fuzzy
 msgid "Error writing to file"
 msgstr "Помилка запису в файл"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 #, fuzzy
 msgid "Error writing to the file"
 msgstr "Помилка запису в файл"
 
 #, fuzzy
 msgid "Error writing to the file"
 msgstr "Помилка запису в файл"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "Помилка читання з сервера. Віддалена сторона закрила з'єднання"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Помилка читання з сервера. Віддалена сторона закрила з'єднання"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "Помилка читання з сервера"
 
 msgid "Error reading from server"
 msgstr "Помилка читання з сервера"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Не вдалося записати файл %s"
 
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Не вдалося записати файл %s"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "Погана заголовкова інформація"
 
 msgid "Bad header data"
 msgstr "Погана заголовкова інформація"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "З'єднання не вдалося"
 
 msgid "Connection failed"
 msgstr "З'єднання не вдалося"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "Внутрішня помилка"
 
 msgid "Internal error"
 msgstr "Внутрішня помилка"
 


@@ -2124,7 +2129,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "Вибір %s не знайдено"
 #, c-format
 msgid "Selection %s not found"
 msgstr "Вибір %s не знайдено"


@@ -2562,7 +2591,7 @@ msgstr "Драйвер для метода %s не знайдено."
 msgid "Method %s did not start correctly"
 msgstr "Метод %s не стартував коректно"
 
 msgid "Method %s did not start correctly"
 msgstr "Метод %s не стартував коректно"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""


@@ -2928,11 +2957,15 @@ msgstr "Підготовка до повного видалення %s"
 msgid "Completely removed %s"
 msgstr "Повністю видалено %s"
 
 msgid "Completely removed %s"
 msgstr "Повністю видалено %s"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Неможливо записати в лог, проблема з openpty() (не змонтовано /dev/pts?)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Неможливо записати в лог, проблема з openpty() (не змонтовано /dev/pts?)\n"
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Неможливо накласти латку на файл"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Неможливо накласти латку на файл"

diff --git a/po/vi.po b/po/vi.po
index 599549797fa3648170c56859bc9e52506d0503d5..8d4295cf164bacd41df692f67d2a6cec31219398 100644 (file)
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.14\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt 0.7.14\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2008-12-22 19:04+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "PO-Revision-Date: 2008-12-22 19:04+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"


@@ -160,7 +160,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s cho %s được biên dịch trên %s %s\n"
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s cho %s được biên dịch trên %s %s\n"


@@ -684,7 +684,7 @@ msgstr "Việc đổi tên %s thành %s bị lỗi"
 msgid "Y"
 msgstr "C"
 
 msgid "Y"
 msgstr "C"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Lỗi biên dich biểu thức chính quy - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Lỗi biên dich biểu thức chính quy - %s"


@@ -847,11 +847,11 @@ msgstr "Cần phải gỡ bỏ một số gói, nhưng mà khả năng Gỡ bỏ
 msgid "Internal error, Ordering didn't finish"
 msgstr "Gặp lỗi nội bộ: tiến trình Sắp xếp chưa xong"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "Gặp lỗi nội bộ: tiến trình Sắp xếp chưa xong"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "Không thể khóa thư mục tải về"
 
 msgid "Unable to lock the download directory"
 msgstr "Không thể khóa thư mục tải về"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Không thể đọc danh sách nguồn."
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Không thể đọc danh sách nguồn."


@@ -881,7 +881,7 @@ msgstr "Sau thao tác này, %sB sức chứa đĩa thêm sẽ được chiếm.\
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Sau thao tác này, %sB sức chứa đĩa thêm sẽ được giải phóng.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Sau thao tác này, %sB sức chứa đĩa thêm sẽ được giải phóng.\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Không thể quyết định chỗ rảnh trong %s"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Không thể quyết định chỗ rảnh trong %s"


@@ -919,7 +919,7 @@ msgstr "Hủy bỏ."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Bạn có muốn tiếp tục không? [Y/n] [C/k] "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "Bạn có muốn tiếp tục không? [Y/n] [C/k] "
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Việc gói %s bị lỗi  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Việc gói %s bị lỗi  %s\n"


@@ -928,7 +928,7 @@ msgstr "Việc gói %s bị lỗi  %s\n"
 msgid "Some files failed to download"
 msgstr "Một số tập tin không tải về được"
 
 msgid "Some files failed to download"
 msgstr "Một số tập tin không tải về được"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "Mới tải về xong và trong chế độ chỉ tải về"
 
 msgid "Download complete and in download only mode"
 msgstr "Mới tải về xong và trong chế độ chỉ tải về"
 


@@ -1027,30 +1027,35 @@ msgstr "Không tìm thấy phiên bản « %s » cho « %s »"
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Đã chọn phiên bản %s (%s) cho %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Đã chọn phiên bản %s (%s) cho %s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "Lệnh cập nhật không chấp nhật đối số"
 
 msgid "The update command takes no arguments"
 msgstr "Lệnh cập nhật không chấp nhật đối số"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "Không thể khóa thư mục danh sách"
 
 msgid "Unable to lock the list directory"
 msgstr "Không thể khóa thư mục danh sách"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Không nên xoá gì thì không thể khởi chạy Bộ Gỡ bỏ Tự động"
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Không nên xoá gì thì không thể khởi chạy Bộ Gỡ bỏ Tự động"
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 "Theo đây có những gói đã được cài đặt tự động nên không còn cần thiết lại:"
 
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 "Theo đây có những gói đã được cài đặt tự động nên không còn cần thiết lại:"
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Hãy sử dụng lệnh « apt-get autoremove » để gỡ bỏ chúng."
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Hãy sử dụng lệnh « apt-get autoremove » để gỡ bỏ chúng."
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1068,43 +1073,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ quyết định trường hợp:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ quyết định trường hợp:"
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Lỗi nội bộ : Bộ Gỡ bỏ Tự động đã làm hư gì."
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Lỗi nội bộ : Bộ Gỡ bỏ Tự động đã làm hư gì."
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Lỗi nội bộ: AllUpgrade (toàn bộ nâng cấp) đã ngắt gì"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Lỗi nội bộ: AllUpgrade (toàn bộ nâng cấp) đã ngắt gì"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Không tìm thấy tác vụ %s"
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Không tìm thấy tác vụ %s"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Không tìm thấy gói %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Không tìm thấy gói %s"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Ghi chú : đang chọn %s cho biểu thức chính quy « %s »\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Ghi chú : đang chọn %s cho biểu thức chính quy « %s »\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s được đặt thành « được cài đặt bằng tay ».\n"
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s được đặt thành « được cài đặt bằng tay ».\n"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Có lẽ bạn hãy chạy lênh « apt-get -f install » để sửa hết:"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Có lẽ bạn hãy chạy lênh « apt-get -f install » để sửa hết:"
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1112,7 +1117,7 @@ msgstr ""
 "Gói còn phụ thuộc vào phần mềm chưa có. Hãy cố chạy lệnh « apt-get -f install "
 "» mà không có gói nào (hoặc ghi rõ cách quyết định)."
 
 "Gói còn phụ thuộc vào phần mềm chưa có. Hãy cố chạy lệnh « apt-get -f install "
 "» mà không có gói nào (hoặc ghi rõ cách quyết định)."
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1124,123 +1129,123 @@ msgstr ""
 "bất định, có lẽ chưa tạo một số gói cần thiết,\n"
 "hoặc chưa di chuyển chúng ra phần Incoming (Đến)."
 
 "bất định, có lẽ chưa tạo một số gói cần thiết,\n"
 "hoặc chưa di chuyển chúng ra phần Incoming (Đến)."
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "Gói bị ngắt"
 
 msgid "Broken packages"
 msgstr "Gói bị ngắt"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "Những gói thêm theo đây sẽ được cài đặt:"
 
 msgid "The following extra packages will be installed:"
 msgstr "Những gói thêm theo đây sẽ được cài đặt:"
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "Gói được đệ nghị:"
 
 msgid "Suggested packages:"
 msgstr "Gói được đệ nghị:"
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "Gói được khuyên:"
 
 msgid "Recommended packages:"
 msgstr "Gói được khuyên:"
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "Đang tính nâng cấp... "
 
 msgid "Calculating upgrade... "
 msgstr "Đang tính nâng cấp... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "Bị lỗi"
 
 msgid "Failed"
 msgstr "Bị lỗi"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "Xong"
 
 msgid "Done"
 msgstr "Xong"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr "Phải ghi rõ ít nhất một gói cần lấy nguồn cho nó"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "Phải ghi rõ ít nhất một gói cần lấy nguồn cho nó"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Không tìm thấy gói nguồn cho %s"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Không tìm thấy gói nguồn cho %s"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Đang bỏ qua tập tin đã được tải về « %s »\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Đang bỏ qua tập tin đã được tải về « %s »\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Không đủ sức chứa còn rảnh trong %s"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Không đủ sức chứa còn rảnh trong %s"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Cần phải lấy %sB/%sB kho nguồn.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Cần phải lấy %sB/%sB kho nguồn.\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Cần phải lấy %sB kho nguồn.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Cần phải lấy %sB kho nguồn.\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Lấy nguồn %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Lấy nguồn %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "Việc lấy một số kho bị lỗi."
 
 msgid "Failed to fetch some archives."
 msgstr "Việc lấy một số kho bị lỗi."
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Đang bỏ qua giải nén nguồn đã giải nén trong %s\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Đang bỏ qua giải nén nguồn đã giải nén trong %s\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Lệnh giải nén « %s » bị lỗi.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Lệnh giải nén « %s » bị lỗi.\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Hãy kiểm tra xem gói « dpkg-dev » có được cài đặt chưa.\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Hãy kiểm tra xem gói « dpkg-dev » có được cài đặt chưa.\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Lệnh xây dụng « %s » bị lỗi.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Lệnh xây dụng « %s » bị lỗi.\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "Tiến trình con bị lỗi"
 
 msgid "Child process failed"
 msgstr "Tiến trình con bị lỗi"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Phải ghi rõ ít nhất một gói cần kiểm tra cách phụ thuộc khi xây dụng cho nó"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Phải ghi rõ ít nhất một gói cần kiểm tra cách phụ thuộc khi xây dụng cho nó"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Không thể lấy thông tin về cách phụ thuộc khi xây dụng cho %s"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Không thể lấy thông tin về cách phụ thuộc khi xây dụng cho %s"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s không phụ thuộc vào gì khi xây dụng.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s không phụ thuộc vào gì khi xây dụng.\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "cách phụ thuộc %s cho %s không thể được thỏa vì không tìm thấy gọi %s"
 
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "cách phụ thuộc %s cho %s không thể được thỏa vì không tìm thấy gọi %s"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1249,31 +1254,32 @@ msgstr ""
 "cách phụ thuộc %s cho %s không thể được thỏa vì không có phiên bản sẵn sàng "
 "của gói %s có thể thỏa điều kiện phiên bản."
 
 "cách phụ thuộc %s cho %s không thể được thỏa vì không có phiên bản sẵn sàng "
 "của gói %s có thể thỏa điều kiện phiên bản."
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s quá mới"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s quá mới"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi: %s."
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi: %s."
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Không thể thỏa cách phụ thuộc khi xây dụng cho %s."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Không thể thỏa cách phụ thuộc khi xây dụng cho %s."
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "Việc xử lý cách phụ thuộc khi xây dụng bị lỗi"
 
 msgid "Failed to process build dependencies"
 msgstr "Việc xử lý cách phụ thuộc khi xây dụng bị lỗi"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "Mô-đun đã hỗ trợ :"
 
 msgid "Supported modules:"
 msgstr "Mô-đun đã hỗ trợ :"
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1289,7 +1295,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1902,7 +1908,7 @@ msgstr "Kết nối ổ cắm dữ liệu đã quá giờ"
 msgid "Unable to accept connection"
 msgstr "Không thể chấp nhận kết nối"
 
 msgid "Unable to accept connection"
 msgstr "Không thể chấp nhận kết nối"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "Gặp khó khăn băm tập tin"
 
 msgid "Problem hashing file"
 msgstr "Gặp khó khăn băm tập tin"
 


@@ -1986,39 +1992,39 @@ msgstr "Gặp lỗi nghiệm trọng khi tháo gỡ « %s:%s » (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Không thể kết nối đến %s %s:"
 
 msgid "Unable to connect to %s %s:"
 msgstr "Không thể kết nối đến %s %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Không thể truy cập vòng khoá « %s »"
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Không thể truy cập vòng khoá « %s »"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: Danh sách lệnh từ « Acquire::gpgv::Options » quá dài nên thoát."
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: Danh sách lệnh từ « Acquire::gpgv::Options » quá dài nên thoát."
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "Lỗi nội bộ: chữ ký đúng, nhưng không thể quyết định vân tay khóa ?!"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "Lỗi nội bộ: chữ ký đúng, nhưng không thể quyết định vân tay khóa ?!"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "Gặp ít nhất một chữ ký không hợp lệ."
 
 msgid "At least one invalid signature was encountered."
 msgstr "Gặp ít nhất một chữ ký không hợp lệ."
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Không thể thực hiện « %s » để kiểm chứng chữ ký (gpgv có được cài đặt chưa?)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Không thể thực hiện « %s » để kiểm chứng chữ ký (gpgv có được cài đặt chưa?)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "Gặp lỗi lạ khi thực hiện gpgv"
 
 msgid "Unknown error executing gpgv"
 msgstr "Gặp lỗi lạ khi thực hiện gpgv"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "Những chữ ký theo đây là không hợp lệ:\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "Những chữ ký theo đây là không hợp lệ:\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -2035,84 +2041,84 @@ msgstr "Không thể mở ống dẫn cho %s"
 msgid "Read error from %s process"
 msgstr "Gặp lỗi đọc từ tiến trình %s"
 
 msgid "Read error from %s process"
 msgstr "Gặp lỗi đọc từ tiến trình %s"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "Đang đợi những phần đầu..."
 
 msgid "Waiting for headers"
 msgstr "Đang đợi những phần đầu..."
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Đã lấy một dòng đầu riêng lẻ chứa hơn %u ky tự"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Đã lấy một dòng đầu riêng lẻ chứa hơn %u ky tự"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "Dòng đầu sai"
 
 msgid "Bad header line"
 msgstr "Dòng đầu sai"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "Máy phục vụ HTTP đã gởi một dòng đầu trả lời không hợp lệ"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Máy phục vụ HTTP đã gởi một dòng đầu trả lời không hợp lệ"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 "Máy phục vụ HTTP đã gởi một dòng đầu Content-Length (độ dài nội dụng) không "
 "hợp lệ"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 "Máy phục vụ HTTP đã gởi một dòng đầu Content-Length (độ dài nội dụng) không "
 "hợp lệ"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 "Máy phục vụ HTTP đã gởi một dòng đầu Content-Range (phạm vị nội dụng) không "
 "hợp lệ"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 "Máy phục vụ HTTP đã gởi một dòng đầu Content-Range (phạm vị nội dụng) không "
 "hợp lệ"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "Máy phục vụ HTTP đã ngắt cách hỗ trợ phạm vị"
 
 msgid "This HTTP server has broken range support"
 msgstr "Máy phục vụ HTTP đã ngắt cách hỗ trợ phạm vị"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "Không biết dạng ngày"
 
 msgid "Unknown date format"
 msgstr "Không biết dạng ngày"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "Việc chọn bị lỗi"
 
 msgid "Select failed"
 msgstr "Việc chọn bị lỗi"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "Kết nối đã quá giờ"
 
 msgid "Connection timed out"
 msgstr "Kết nối đã quá giờ"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "Gặp lỗi khi ghi vào tập tin xuất"
 
 msgid "Error writing to output file"
 msgstr "Gặp lỗi khi ghi vào tập tin xuất"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "Gặp lỗi khi ghi vào tập tin"
 
 msgid "Error writing to file"
 msgstr "Gặp lỗi khi ghi vào tập tin"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "Gặp lỗi khi ghi vào tập tin đó"
 
 msgid "Error writing to the file"
 msgstr "Gặp lỗi khi ghi vào tập tin đó"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "Gặp lỗi khi đọc từ máy phục vụ : cuối ở xa đã đóng kết nối"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Gặp lỗi khi đọc từ máy phục vụ : cuối ở xa đã đóng kết nối"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "Gặp lỗi khi đọc từ máy phục vụ"
 
 msgid "Error reading from server"
 msgstr "Gặp lỗi khi đọc từ máy phục vụ"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 msgid "Failed to truncate file"
 msgstr "Lỗi cắt ngắn tập tin"
 
 msgid "Failed to truncate file"
 msgstr "Lỗi cắt ngắn tập tin"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "Dữ liệu dòng đầu sai"
 
 msgid "Bad header data"
 msgstr "Dữ liệu dòng đầu sai"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "Kết nối bị ngắt"
 
 msgid "Connection failed"
 msgstr "Kết nối bị ngắt"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "Gặp lỗi nội bộ"
 
 msgid "Internal error"
 msgstr "Gặp lỗi nội bộ"
 


@@ -2132,7 +2138,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "Không tìm thấy vùng chọn %s"
 #, c-format
 msgid "Selection %s not found"
 msgstr "Không tìm thấy vùng chọn %s"


@@ -2562,7 +2592,7 @@ msgstr "Không tìm thấy trình điều khiển phương pháp %s."
 msgid "Method %s did not start correctly"
 msgstr "Phương pháp %s đã không bắt đầu cho đúng."
 
 msgid "Method %s did not start correctly"
 msgstr "Phương pháp %s đã không bắt đầu cho đúng."
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Hãy nạp đĩa có nhãn « %s » vào ổ « %s » và bấm nút Enter."
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Hãy nạp đĩa có nhãn « %s » vào ổ « %s » và bấm nút Enter."


@@ -2932,10 +2962,14 @@ msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s..."
 msgid "Completely removed %s"
 msgstr "Mới gỡ bỏ hoàn toàn %s"
 
 msgid "Completely removed %s"
 msgstr "Mới gỡ bỏ hoàn toàn %s"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Không thể ghi lưu, openpty() bị lỗi (« /dev/pts » chưa lắp ?)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Không thể ghi lưu, openpty() bị lỗi (« /dev/pts » chưa lắp ?)\n"
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Không thể vá lỗi trong tập tin %s"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Không thể vá lỗi trong tập tin %s"

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8c169ff7f2c1d314c142ef4704329c7f9ddb0246..68183040df4a618e609d65eba311ff364b002970 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2008-11-15 00:49+0800\n"
 "Last-Translator: Deng Xiyue <manphiz-guest@users.alioth.debian.org>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
 "PO-Revision-Date: 2008-11-15 00:49+0800\n"
 "Last-Translator: Deng Xiyue <manphiz-guest@users.alioth.debian.org>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"


@@ -157,7 +157,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s 编译于 %s %s\n"
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s 编译于 %s %s\n"


@@ -651,7 +651,7 @@ msgstr "无法将 %s 重命名为 %s"
 msgid "Y"
 msgstr "Y"
 
 msgid "Y"
 msgstr "Y"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "编译正则表达式时出错 - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "编译正则表达式时出错 - %s"


@@ -812,11 +812,11 @@ msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止
 msgid "Internal error, Ordering didn't finish"
 msgstr "内部错误，Ordering 未能完成"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "内部错误，Ordering 未能完成"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "无法对下载目录加锁"
 
 msgid "Unable to lock the download directory"
 msgstr "无法对下载目录加锁"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "无法读取安装源列表。"
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "无法读取安装源列表。"


@@ -845,7 +845,7 @@ msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "解压缩后将会空出 %sB 的空间。\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "解压缩后将会空出 %sB 的空间。\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "无法获知您在 %s 上的空余空间"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "无法获知您在 %s 上的空余空间"


@@ -882,7 +882,7 @@ msgstr "中止执行。"
 msgid "Do you want to continue [Y/n]? "
 msgstr "您希望继续执行吗？[Y/n]"
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "您希望继续执行吗？[Y/n]"
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "无法下载 %s  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "无法下载 %s  %s\n"


@@ -891,7 +891,7 @@ msgstr "无法下载 %s  %s\n"
 msgid "Some files failed to download"
 msgstr "有一些文件下载失败"
 
 msgid "Some files failed to download"
 msgstr "有一些文件下载失败"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "下载完毕，目前是“仅下载”模式"
 
 msgid "Download complete and in download only mode"
 msgstr "下载完毕，目前是“仅下载”模式"
 


@@ -988,29 +988,34 @@ msgstr "未找到“%2$s”的“%1$s”版本"
 msgid "Selected version %s (%s) for %s\n"
 msgstr "选定了版本为 %s (%s) 的 %s\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "选定了版本为 %s (%s) 的 %s\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr " update 命令是不需任何参数的"
 
 msgid "The update command takes no arguments"
 msgstr " update 命令是不需任何参数的"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "无法对状态列表目录加锁"
 
 msgid "Unable to lock the list directory"
 msgstr "无法对状态列表目录加锁"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "我们不应该进行删除，无法启动自动删除器"
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "我们不应该进行删除，无法启动自动删除器"
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "下列软件包是自动安装的并且现在不再被使用了："
 
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "下列软件包是自动安装的并且现在不再被使用了："
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "使用'apt-get autoremove'来删除它们"
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "使用'apt-get autoremove'来删除它们"
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1026,43 +1031,43 @@ msgstr "似乎自动删除器毁掉了一些软件，这不应该发生。请向
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "下列的信息可能会对解决问题有所帮助："
 
 msgid "The following information may help to resolve the situation:"
 msgstr "下列的信息可能会对解决问题有所帮助："
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "内部错误，自动删除器坏事了"
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "内部错误，自动删除器坏事了"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "内部错误，全部升级坏事了"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "内部错误，全部升级坏事了"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr "无法找到任务 %s"
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "无法找到任务 %s"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "无法找到软件包 %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "无法找到软件包 %s"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s 被设置为手动安装。\n"
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s 被设置为手动安装。\n"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "您可能需要运行“apt-get -f install”来纠正下列错误："
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "您可能需要运行“apt-get -f install”来纠正下列错误："
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1070,7 +1075,7 @@ msgstr ""
 "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
 "以指定一个解决办法)。"
 
 "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
 "以指定一个解决办法)。"
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1081,122 +1086,122 @@ msgstr ""
 "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
 "包尚未被创建或是它们还在新到(incoming)目录中。"
 
 "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
 "包尚未被创建或是它们还在新到(incoming)目录中。"
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "无法安装的软件包"
 
 msgid "Broken packages"
 msgstr "无法安装的软件包"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "将会安装下列额外的软件包："
 
 msgid "The following extra packages will be installed:"
 msgstr "将会安装下列额外的软件包："
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "建议安装的软件包："
 
 msgid "Suggested packages:"
 msgstr "建议安装的软件包："
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "推荐安装的软件包："
 
 msgid "Recommended packages:"
 msgstr "推荐安装的软件包："
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "正在筹划升级... "
 
 msgid "Calculating upgrade... "
 msgstr "正在筹划升级... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "失败"
 
 msgid "Failed"
 msgstr "失败"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "完成"
 
 msgid "Done"
 msgstr "完成"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr "内部错误，问题解决器坏事了"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "内部错误，问题解决器坏事了"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr "要下载源代码，必须指定至少一个对应的软件包"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "要下载源代码，必须指定至少一个对应的软件包"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "无法找到与 %s 对应的源代码包"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "无法找到与 %s 对应的源代码包"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "忽略已下载过的文件“%s”\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "忽略已下载过的文件“%s”\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "您在 %s 上没有足够的空余空间"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "您在 %s 上没有足够的空余空间"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "需要下载 %sB/%sB 的源代码包。\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "需要下载 %sB/%sB 的源代码包。\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "需要下载 %sB 的源代码包。\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "需要下载 %sB 的源代码包。\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "下载源代码 %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "下载源代码 %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "有一些包文件无法下载。"
 
 msgid "Failed to fetch some archives."
 msgstr "有一些包文件无法下载。"
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "运行解包的命令“%s”出错。\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "运行解包的命令“%s”出错。\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "执行构造软件包命令“%s”失败。\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "执行构造软件包命令“%s”失败。\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "子进程出错"
 
 msgid "Child process failed"
 msgstr "子进程出错"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr " %s 没有构建依赖关系信息。\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr " %s 没有构建依赖关系信息。\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
 
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1205,30 +1210,31 @@ msgstr ""
 "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1"
 "$s 依赖关系"
 
 "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1"
 "$s 依赖关系"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新了"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新了"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "无法处理构建依赖关系"
 
 msgid "Failed to process build dependencies"
 msgstr "无法处理构建依赖关系"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "被支持模块："
 
 msgid "Supported modules:"
 msgstr "被支持模块："
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1244,7 +1250,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1837,7 +1843,7 @@ msgstr "数据套接字连接超时"
 msgid "Unable to accept connection"
 msgstr "无法接受连接"
 
 msgid "Unable to accept connection"
 msgstr "无法接受连接"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "把文件加入散列表时出错"
 
 msgid "Problem hashing file"
 msgstr "把文件加入散列表时出错"
 


@@ -1921,38 +1927,38 @@ msgstr "解析“%s:%s”时，出现了某些故障 (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "不能连接上 %s %s："
 
 msgid "Unable to connect to %s %s:"
 msgstr "不能连接上 %s %s："
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "无法访问密匙：“%s”"
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "无法访问密匙：“%s”"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "错误：Acquire::gpgv::Options 的参数列表超长。结束运行。"
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "错误：Acquire::gpgv::Options 的参数列表超长。结束运行。"
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "内部错误：签名正确无误，但是无法确认密钥的指纹(key fingerprint)？！"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "内部错误：签名正确无误，但是无法确认密钥的指纹(key fingerprint)？！"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "至少发现一个无效的签名。"
 
 msgid "At least one invalid signature was encountered."
 msgstr "至少发现一个无效的签名。"
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "无法运行\"%s\"以验证签名(您安装了 gpgv 么？)"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "无法运行\"%s\"以验证签名(您安装了 gpgv 么？)"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "运行 gpgv 时发生未知错误"
 
 msgid "Unknown error executing gpgv"
 msgstr "运行 gpgv 时发生未知错误"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "下列签名无效：\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "下列签名无效：\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -1968,80 +1974,80 @@ msgstr "无法为 %s 开启管道"
 msgid "Read error from %s process"
 msgstr "从 %s 进程读取数据出错"
 
 msgid "Read error from %s process"
 msgstr "从 %s 进程读取数据出错"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "正在等待报头"
 
 msgid "Waiting for headers"
 msgstr "正在等待报头"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "受到了一行报头条目，它的长度超过了 %u 个字符"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "受到了一行报头条目，它的长度超过了 %u 个字符"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "错误的报头条目"
 
 msgid "Bad header line"
 msgstr "错误的报头条目"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "该 http 服务器发送了一个无效的应答报头"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "该 http 服务器发送了一个无效的应答报头"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "该 http 服务器发送了一个无效的 Content-Length 报头"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "该 http 服务器发送了一个无效的 Content-Length 报头"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "该 http 服务器发送了一个无效的 Content-Range 报头"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "该 http 服务器发送了一个无效的 Content-Range 报头"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "该 http 服务器的 range 支持不正常"
 
 msgid "This HTTP server has broken range support"
 msgstr "该 http 服务器的 range 支持不正常"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "无法识别的日期格式"
 
 msgid "Unknown date format"
 msgstr "无法识别的日期格式"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "select 调用出错"
 
 msgid "Select failed"
 msgstr "select 调用出错"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "连接服务器超时"
 
 msgid "Connection timed out"
 msgstr "连接服务器超时"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "写输出文件时出错"
 
 msgid "Error writing to output file"
 msgstr "写输出文件时出错"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "写文件时出错"
 
 msgid "Error writing to file"
 msgstr "写文件时出错"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "写文件时出错"
 
 msgid "Error writing to the file"
 msgstr "写文件时出错"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "从服务器读取数据时出错，对方关闭了连接"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "从服务器读取数据时出错，对方关闭了连接"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "从服务器读取数据出错"
 
 msgid "Error reading from server"
 msgstr "从服务器读取数据出错"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 msgid "Failed to truncate file"
 msgstr "截断文件失败"
 
 msgid "Failed to truncate file"
 msgstr "截断文件失败"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "错误的报头数据"
 
 msgid "Bad header data"
 msgstr "错误的报头数据"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "连接失败"
 
 msgid "Connection failed"
 msgstr "连接失败"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "内部错误"
 
 msgid "Internal error"
 msgstr "内部错误"
 


@@ -2061,7 +2067,31 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "没有发现您的所选 %s"
 #, c-format
 msgid "Selection %s not found"
 msgstr "没有发现您的所选 %s"


@@ -2488,7 +2518,7 @@ msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
 msgid "Method %s did not start correctly"
 msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
 
 msgid "Method %s did not start correctly"
 msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "请把标有 “%s” 的碟片插入驱动器“%s”再按回车键。"
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "请把标有 “%s” 的碟片插入驱动器“%s”再按回车键。"


@@ -2848,10 +2878,14 @@ msgstr "正在准备完全删除 %s"
 msgid "Completely removed %s"
 msgstr "完全删除了 %s"
 
 msgid "Completely removed %s"
 msgstr "完全删除了 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "无法写入日志。 openpty() 失败 (/dev/pts 没有 mount 上？)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "无法写入日志。 openpty() 失败 (/dev/pts 没有 mount 上？)\n"
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "无法打开补丁文件"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "无法打开补丁文件"

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 08d8b9980de8fb358fda02c37230d77d5b82367b..49d80ea3c4ab7cc15b9d1ac6d116ebf2db0a8d67 100644 (file)
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.5.4\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: 0.5.4\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"

 "PO-Revision-Date: 2009-01-28 10:41+0800\n"
 "Last-Translator: Tetralet <tetralet@gmail.com>\n"
 "Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
 "PO-Revision-Date: 2009-01-28 10:41+0800\n"
 "Last-Translator: Tetralet <tetralet@gmail.com>\n"
 "Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."


@@ -158,7 +158,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s 是用於 %s 並在 %s %s 上編譯的\n"
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s 是用於 %s 並在 %s %s 上編譯的\n"


@@ -650,7 +650,7 @@ msgstr "無法將 %s 更名為 %s"
 msgid "Y"
 msgstr "Y"
 
 msgid "Y"
 msgstr "Y"
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "編譯正規表示式時發生錯誤 - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "編譯正規表示式時發生錯誤 - %s"


@@ -811,11 +811,11 @@ msgstr "有套件需要被移除，但卻被禁止移除。"
 msgid "Internal error, Ordering didn't finish"
 msgstr "內部錯誤，排序未能完成"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "內部錯誤，排序未能完成"
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032

 msgid "Unable to lock the download directory"
 msgstr "無法鎖定下載目錄"
 
 msgid "Unable to lock the download directory"
 msgstr "無法鎖定下載目錄"
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "無法讀取來源列表。"
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "無法讀取來源列表。"


@@ -844,7 +844,7 @@ msgstr "此操作完成之後，會多佔用 %sB 的磁碟空間。\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "此操作完成之後，會空出 %sB 的磁碟空間。\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "此操作完成之後，會空出 %sB 的磁碟空間。\n"
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "無法確認 %s 的未使用空間"
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "無法確認 %s 的未使用空間"


@@ -881,7 +881,7 @@ msgstr "放棄執行。"
 msgid "Do you want to continue [Y/n]? "
 msgstr "是否繼續進行 [Y/n]？"
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "是否繼續進行 [Y/n]？"
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "無法取得 %s，%s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "無法取得 %s，%s\n"


@@ -890,7 +890,7 @@ msgstr "無法取得 %s，%s\n"
 msgid "Some files failed to download"
 msgstr "有部份檔案無法下載"
 
 msgid "Some files failed to download"
 msgstr "有部份檔案無法下載"
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232

 msgid "Download complete and in download only mode"
 msgstr "下載完成，且這是『僅下載』模式"
 
 msgid "Download complete and in download only mode"
 msgstr "下載完成，且這是『僅下載』模式"
 


@@ -986,29 +986,34 @@ msgstr "找不到 '%s' 版的 '%s'"
 msgid "Selected version %s (%s) for %s\n"
 msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n"
 
 msgid "Selected version %s (%s) for %s\n"
 msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n"
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345

 msgid "The update command takes no arguments"
 msgstr "update 指令不需任何參數"
 
 msgid "The update command takes no arguments"
 msgstr "update 指令不需任何參數"
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358

 msgid "Unable to lock the list directory"
 msgstr "無法鎖定列表目錄"
 
 msgid "Unable to lock the list directory"
 msgstr "無法鎖定列表目錄"
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "我們沒有計劃要刪除任何東西，無法啟動 AutoRemover"
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "我們沒有計劃要刪除任何東西，無法啟動 AutoRemover"
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "以下套件是被自動安裝進來的，且已不再會被用到了："
 
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "以下套件是被自動安裝進來的，且已不再會被用到了："
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "使用 'apt-get autoremove' 來將其移除。"
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "使用 'apt-get autoremove' 來將其移除。"
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1026,43 +1031,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742

 msgid "The following information may help to resolve the situation:"
 msgstr "以下的資訊或許有助於解決當前的情況："
 
 msgid "The following information may help to resolve the situation:"
 msgstr "以下的資訊或許有助於解決當前的情況："
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "內部錯誤，AutoRemover 處理失敗"
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "內部錯誤，AutoRemover 處理失敗"
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "內部錯誤，AllUpgrade 造成了損壞"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "內部錯誤，AllUpgrade 造成了損壞"
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530

 #, c-format
 msgid "Couldn't find task %s"
 msgstr "無法找到主題 %s"
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "無法找到主題 %s"
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "無法找到套件 %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "無法找到套件 %s"
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "注意，根據正規表示式 '%2$s' 而選擇了 %1$s\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "注意，根據正規表示式 '%2$s' 而選擇了 %1$s\n"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s 被設定為手動安裝。\n"
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s 被設定為手動安裝。\n"
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "您也許得執行 `apt-get -f install' 以修正這些問題："
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "您也許得執行 `apt-get -f install' 以修正這些問題："
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1070,7 +1075,7 @@ msgstr ""
 "未能滿足相依關係。請試著不指定套件來執行 'apt-get -f install'（或採取其它的解"
 "決方案）。"
 
 "未能滿足相依關係。請試著不指定套件來執行 'apt-get -f install'（或採取其它的解"
 "決方案）。"
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727

 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"
 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"


@@ -1080,122 +1085,122 @@ msgstr ""
 "有些套件無法安裝。這可能意謂著您的要求難以解決，或是若您使用的是\n"
 "unstable 發行版，可能有些必要的套件尚未建立，或是被移出 Incoming 了。"
 
 "有些套件無法安裝。這可能意謂著您的要求難以解決，或是若您使用的是\n"
 "unstable 發行版，可能有些必要的套件尚未建立，或是被移出 Incoming 了。"
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745

 msgid "Broken packages"
 msgstr "損毀的套件"
 
 msgid "Broken packages"
 msgstr "損毀的套件"
 

-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774

 msgid "The following extra packages will be installed:"
 msgstr "下列的額外套件將被安裝："
 
 msgid "The following extra packages will be installed:"
 msgstr "下列的額外套件將被安裝："
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863

 msgid "Suggested packages:"
 msgstr "建議套件："
 
 msgid "Suggested packages:"
 msgstr "建議套件："
 

-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864

 msgid "Recommended packages:"
 msgstr "推薦套件："
 
 msgid "Recommended packages:"
 msgstr "推薦套件："
 

-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892

 msgid "Calculating upgrade... "
 msgstr "籌備升級中... "
 
 msgid "Calculating upgrade... "
 msgstr "籌備升級中... "
 

-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr "失敗"
 
 msgid "Failed"
 msgstr "失敗"
 

-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900

 msgid "Done"
 msgstr "完成"
 
 msgid "Done"
 msgstr "完成"
 

-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975

 msgid "Internal error, problem resolver broke stuff"
 msgstr "內部錯誤，問題排除器造成了損壞"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "內部錯誤，問題排除器造成了損壞"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075

 msgid "Must specify at least one package to fetch source for"
 msgstr "在取得原始碼時必須至少指定一個套件"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "在取得原始碼時必須至少指定一個套件"
 

-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "無法找到 %s 的原始碼套件"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "無法找到 %s 的原始碼套件"
 

-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "略過已下載的檔案 '%s'\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "略過已下載的檔案 '%s'\n"
 

-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "在 %s 裡沒有足夠的的未使用空間"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "在 %s 裡沒有足夠的的未使用空間"
 

-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "需要下載 %sB/%sB 的原始套件檔。\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "需要下載 %sB/%sB 的原始套件檔。\n"
 

-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "需要下載 %sB 的原始套件檔。\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "需要下載 %sB 的原始套件檔。\n"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "取得原始碼 %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "取得原始碼 %s\n"
 

-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228

 msgid "Failed to fetch some archives."
 msgstr "無法取得某些套件檔。"
 
 msgid "Failed to fetch some archives."
 msgstr "無法取得某些套件檔。"
 

-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "不解開，因原始碼已解開至 %s\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "不解開，因原始碼已解開至 %s\n"
 

-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "解開指令 '%s' 失敗。\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "解開指令 '%s' 失敗。\n"
 

-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n"
 

-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "編譯指令 '%s' 失敗。\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "編譯指令 '%s' 失敗。\n"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305

 msgid "Child process failed"
 msgstr "子程序失敗"
 
 msgid "Child process failed"
 msgstr "子程序失敗"
 

-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321

 msgid "Must specify at least one package to check builddeps for"
 msgstr "在檢查編譯相依關係時必須至少指定一個套件"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr "在檢查編譯相依關係時必須至少指定一個套件"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "無法取得 %s 的編譯相依關係資訊"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "無法取得 %s 的編譯相依關係資訊"
 

-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s 沒有編譯相依關係。\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s 沒有編譯相依關係。\n"
 

-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s"
 
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s"
 

-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1203,30 +1208,31 @@ msgid ""
 msgstr ""
 "無法滿足 %2$s 所要求的 %1$s 相依關係，因為套件 %3$s 沒有版本符合其版本需求"
 
 msgstr ""
 "無法滿足 %2$s 所要求的 %1$s 相依關係，因為套件 %3$s 沒有版本符合其版本需求"
 

-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "無法滿足 %2$s 的相依關係 %1$s：已安裝的套件 %3$s 太新了"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "無法滿足 %2$s 的相依關係 %1$s：已安裝的套件 %3$s 太新了"
 

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "無法滿足 %2$s 的相依關係 %1$s：%3$s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "無法滿足 %2$s 的相依關係 %1$s：%3$s"
 

-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "無法滿足套件 %s 的編譯相依關係。"
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "無法滿足套件 %s 的編譯相依關係。"
 

-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555

 msgid "Failed to process build dependencies"
 msgstr "無法處理編譯相依關係"
 
 msgid "Failed to process build dependencies"
 msgstr "無法處理編譯相依關係"
 

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587

 msgid "Supported modules:"
 msgstr "已支援模組："
 
 msgid "Supported modules:"
 msgstr "已支援模組："
 

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1242,7 +1248,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1833,7 +1839,7 @@ msgstr "Data socket 連線逾時"
 msgid "Unable to accept connection"
 msgstr "無法接受連線"
 
 msgid "Unable to accept connection"
 msgstr "無法接受連線"
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "有問題的雜湊檔"
 
 msgid "Problem hashing file"
 msgstr "有問題的雜湊檔"
 


@@ -1917,38 +1923,38 @@ msgstr "在解析 '%s:%s' (%i) 時出了怪事"
 msgid "Unable to connect to %s %s:"
 msgstr "無法連線至 %s %s："
 
 msgid "Unable to connect to %s %s:"
 msgstr "無法連線至 %s %s："
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "無法存取鑰匙圈：'%s'"
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "無法存取鑰匙圈：'%s'"
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "錯誤：Acquire::gpgv::Options 的參數列表過長。結束執行。"
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "錯誤：Acquire::gpgv::Options 的參數列表過長。結束執行。"
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "內部錯誤：簽章無誤，但卻無法辨識密鑰的指紋碼？！"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "內部錯誤：簽章無誤，但卻無法辨識密鑰的指紋碼？！"
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr "至少發現一個無效的簽章。"
 
 msgid "At least one invalid signature was encountered."
 msgstr "至少發現一個無效的簽章。"
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "無法執行 '%s' 來驗證簽章（gpgv 是否安裝了？）"
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "無法執行 '%s' 來驗證簽章（gpgv 是否安裝了？）"
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr "在執行 gpgv 時發生未知的錯誤"
 
 msgid "Unknown error executing gpgv"
 msgstr "在執行 gpgv 時發生未知的錯誤"
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr "以下簽名無效：\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "以下簽名無效：\n"
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -1964,80 +1970,80 @@ msgstr "無法開啟管線給 %s 使用"
 msgid "Read error from %s process"
 msgstr "由 %s 程序讀取錯誤"
 
 msgid "Read error from %s process"
 msgstr "由 %s 程序讀取錯誤"
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr "等待標頭"
 
 msgid "Waiting for headers"
 msgstr "等待標頭"
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "取得一個單行超過 %u 字元的標頭"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "取得一個單行超過 %u 字元的標頭"
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr "標頭行錯誤"
 
 msgid "Bad header line"
 msgstr "標頭行錯誤"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP 伺服器傳送了一個無效的回覆標頭"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP 伺服器傳送了一個無效的回覆標頭"
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP 伺服器傳送了一個無效的 Content-Length 標頭"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP 伺服器傳送了一個無效的 Content-Length 標頭"
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP 伺服器傳送了一個無效的 Content-Range 標頭"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP 伺服器傳送了一個無效的 Content-Range 標頭"
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr "這個 HTTP 伺服器的範圍支援有問題"
 
 msgid "This HTTP server has broken range support"
 msgstr "這個 HTTP 伺服器的範圍支援有問題"
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr "未知的資料格式"
 
 msgid "Unknown date format"
 msgstr "未知的資料格式"
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr "選擇失敗"
 
 msgid "Select failed"
 msgstr "選擇失敗"
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr "連線逾時"
 
 msgid "Connection timed out"
 msgstr "連線逾時"
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr "在寫入輸出檔時發生錯誤"
 
 msgid "Error writing to output file"
 msgstr "在寫入輸出檔時發生錯誤"
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr "在寫入檔案時發生錯誤"
 
 msgid "Error writing to file"
 msgstr "在寫入檔案時發生錯誤"
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr "在寫入該檔時發生錯誤"
 
 msgid "Error writing to the file"
 msgstr "在寫入該檔時發生錯誤"
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr "在讀取伺服器時發生錯誤，遠端主機已關閉連線"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "在讀取伺服器時發生錯誤，遠端主機已關閉連線"
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr "在讀取伺服器時發生錯誤"
 
 msgid "Error reading from server"
 msgstr "在讀取伺服器時發生錯誤"
 

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196

 msgid "Failed to truncate file"
 msgstr "無法截短檔案"
 
 msgid "Failed to truncate file"
 msgstr "無法截短檔案"
 

-#: methods/http.cc:1105
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr "錯誤的標頭資料"
 
 msgid "Bad header data"
 msgstr "錯誤的標頭資料"
 

-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr "連線失敗"
 
 msgid "Connection failed"
 msgstr "連線失敗"
 

-#: methods/http.cc:1229
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr "內部錯誤"
 
 msgid "Internal error"
 msgstr "內部錯誤"
 


@@ -2059,7 +2065,31 @@ msgstr ""
 "動態 MMap 已用完所有空間。請增加 APT::Cache-Limit 的大小。目前大小為：%lu。"
 "(man 5 apt.conf)"
 
 "動態 MMap 已用完所有空間。請增加 APT::Cache-Limit 的大小。目前大小為：%lu。"
 "(man 5 apt.conf)"
 

-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018

 #, c-format
 msgid "Selection %s not found"
 msgstr "選項 %s 找不到"
 #, c-format
 msgid "Selection %s not found"
 msgstr "選項 %s 找不到"


@@ -2482,7 +2512,7 @@ msgstr "找不到安裝方式的驅動程式 %s。"
 msgid "Method %s did not start correctly"
 msgstr "安裝方式 %s 沒有正確啟動"
 
 msgid "Method %s did not start correctly"
 msgstr "安裝方式 %s 沒有正確啟動"
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "請把標籤為 '%s' 的光碟放入 '%s' 裝置中，然後按下 [Enter] 鍵。"
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "請把標籤為 '%s' 的光碟放入 '%s' 裝置中，然後按下 [Enter] 鍵。"


@@ -2839,10 +2869,14 @@ msgstr "正在準備完整移除 %s"
 msgid "Completely removed %s"
 msgstr "已完整移除 %s"
 
 msgid "Completely removed %s"
 msgstr "已完整移除 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "無法寫入記錄檔，openpty() 失敗（/dev/pts 未掛載？）\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "無法寫入記錄檔，openpty() 失敗（/dev/pts 未掛載？）\n"
 

+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+

 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "無法修補檔案"
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "無法修補檔案"