summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2014-06-18 20:23:53 +0200
committerMichael Vogt <mvo@ubuntu.com>2014-06-18 20:23:53 +0200
commitbc5095b7d708c7e376f98be6edc2ad7cceca57ed (patch)
tree8b45f6fc974330f964bad3684ac85550480fb66b /po
parent456821f91483f45b3ceb156f54ccc27983b71595 (diff)
parent51da0c3587c9d36a3c04b3e28b99d8331a29b230 (diff)
Merge remote-tracking branch 'upstream/debian/sid' into debian/sid
Diffstat (limited to 'po')
-rw-r--r--po/ar.po183
-rw-r--r--po/ast.po183
-rw-r--r--po/bg.po183
-rw-r--r--po/bs.po178
-rw-r--r--po/ca.po183
-rw-r--r--po/cs.po183
-rw-r--r--po/cy.po183
-rw-r--r--po/da.po181
-rw-r--r--po/de.po183
-rw-r--r--po/dz.po183
-rw-r--r--po/el.po183
-rw-r--r--po/es.po183
-rw-r--r--po/eu.po183
-rw-r--r--po/fi.po183
-rw-r--r--po/fr.po183
-rw-r--r--po/gl.po183
-rw-r--r--po/hu.po183
-rw-r--r--po/it.po181
-rw-r--r--po/ja.po181
-rw-r--r--po/km.po183
-rw-r--r--po/ko.po183
-rw-r--r--po/ku.po178
-rw-r--r--po/lt.po183
-rw-r--r--po/mr.po183
-rw-r--r--po/nb.po183
-rw-r--r--po/ne.po183
-rw-r--r--po/nl.po183
-rw-r--r--po/nn.po183
-rw-r--r--po/pl.po183
-rw-r--r--po/pt.po183
-rw-r--r--po/pt_BR.po183
-rw-r--r--po/ro.po183
-rw-r--r--po/ru.po183
-rw-r--r--po/sk.po183
-rw-r--r--po/sl.po183
-rw-r--r--po/sv.po183
-rw-r--r--po/th.po181
-rw-r--r--po/tl.po183
-rw-r--r--po/tr.po183
-rw-r--r--po/uk.po183
-rw-r--r--po/vi.po181
-rw-r--r--po/zh_CN.po183
-rw-r--r--po/zh_TW.po183
43 files changed, 3986 insertions, 3863 deletions
diff --git a/po/ar.po b/po/ar.po
index 50864ff75..e7c5ce7fe 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+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"
@@ -163,7 +163,7 @@ msgstr " جدول النسخ:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -283,7 +283,7 @@ msgid "Couldn't find package %s"
msgstr "تعذر العثور على الحزمة %s"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "إلا أنه سيتم تثبيت %s"
@@ -337,7 +337,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "تخطي الملف '%s' المنزل مسبقاً\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "تعذر حساب المساحة الحرة في %s"
@@ -370,7 +370,7 @@ msgstr "إحضار المصدر %s\n"
msgid "Failed to fetch some archives."
msgstr "فشل إحضار بعض الأرشيفات."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "اكتمل التنزيل وفي وضع التنزيل فقط"
@@ -763,7 +763,7 @@ msgstr ""
msgid "Could not connect data socket, connection timed out"
msgstr ""
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "فشل"
@@ -1009,12 +1009,7 @@ msgstr "خطأ داخلي"
msgid "Calculating upgrade... "
msgstr "حساب الترقية..."
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "تمّ"
@@ -1100,70 +1095,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr ""
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "إلا أن %s مثبت"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "إلا أنه سيتم تثبيت %s"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "إلا أنه غير قابل للتثبيت"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "إلا أنها حزمة وهمية"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "إلا أنها غير مثبتة"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "إلا أنه لن يتم تثبيتها"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " أو"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr ""
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "سيتم تثبيت الحزم الجديدة التالية:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "سيتم إزالة الحزم التالية:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "سيتم الإبقاء على الحزم التالية:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "ستتم ترقية الحزم التالية:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "سيتم تثبيط الحزم التالية:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "سيتم تغيير الحزم المبقاة التالية:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (بسبب %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1171,27 +1166,27 @@ msgstr ""
"تحذير: ستتم إزالة الحزم الأساسية التالية.\n"
"لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً، "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu أعيد تثبيتها، "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu مثبطة، "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu غير مثبتة بالكامل أو مزالة.\n"
@@ -1200,7 +1195,7 @@ msgstr "%lu غير مثبتة بالكامل أو مزالة.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr "[Y/n]"
@@ -1208,21 +1203,21 @@ msgstr "[Y/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr "[y/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "Y"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -1239,6 +1234,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1251,70 +1250,70 @@ msgstr[1] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "خطأ داخلي، تم طلب InstallPackages مع وجود حزم معطوبة!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "حزم بحاجة للإزالة لكن الإزالة مُعطّلة."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "خطأ داخلي، لم تنته عملية الترتيب"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr "يا للغرابة... لم تتطابق الأحجام، الرجاء مراسلة apt@packages.debian.org"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "بحاجة إلى جلب %sب/%sب من الأرشيف.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "بحاجة إلى جلب %sب من الأرشيف.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, fuzzy, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "بعد الاستخراج %sب من المساحة الإضافيّة سيتمّ استخدامها.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, fuzzy, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "ليس هناك مساحة كافية في %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "هناك مشاكل وتم استخدام -y دون --force-yes"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "نعم، افعل ما أقوله!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1325,19 +1324,19 @@ msgstr ""
"كي تستمر اكتب العبارة '%s'\n"
" ؟] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "إجهاض."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "هل تريد الاستمرار؟"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "فشل تنزيل بعض الملفات"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1345,19 +1344,19 @@ msgstr ""
"تعذر إحضار بعض الأرشيف، ربما يمكنك محاولة تنفيذ apt-get update أو إضافة --"
"fix-missing؟"
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing وتبديل الأوساط غير مدعومة حالياً"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "تعذر تصحيح الحزم المفقودة."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "إجهاض التثبيت."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1367,15 +1366,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr ""
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1391,16 +1390,16 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "قد تساعد المعلومات التالية في حل المشكلة:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
#, fuzzy
msgid ""
"The following package was automatically installed and is no longer required:"
@@ -1410,7 +1409,7 @@ msgid_plural ""
msgstr[0] "سيتم تثبيت الحزم الجديدة التالية:"
msgstr[1] "سيتم تثبيت الحزم الجديدة التالية:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, fuzzy, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1418,7 +1417,7 @@ msgid_plural ""
msgstr[0] "سيتم تثبيت الحزم الجديدة التالية:"
msgstr[1] "سيتم تثبيت الحزم الجديدة التالية:"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] ""
@@ -1435,7 +1434,7 @@ msgid ""
msgstr ""
"مُعتمدات غير مستوفاة. جرب 'apt-get -f install' بدون أسماء حزم (أو حدّد حلاً)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1443,59 +1442,59 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "حزم معطوبة"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "سيتم تثبيت الحزم الإضافيّة التالية:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "الحزم المقترحة:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "الحزم المستحسنة:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, fuzzy, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "إعادة تثبيت %s غير ممكنة، حيث أنّه لا يمكن تنزيلها.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s هي النسخة الأحدث.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n"
@@ -2066,23 +2065,23 @@ msgstr "تعذرت الكتابة إلى %s"
msgid "IO Error saving source cache"
msgstr ""
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr ""
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr ""
@@ -2718,7 +2717,7 @@ msgstr ""
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "تعذر العثور على التحديد %s"
@@ -3318,7 +3317,7 @@ msgstr ""
msgid "Problem unlinking %s"
msgstr ""
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -3350,6 +3349,10 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s ليس حزمة DEB صالحة."
diff --git a/po/ast.po b/po/ast.po
index 3fae4b970..1f568903d 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.18\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2010-10-02 23:35+0100\n"
"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n"
"Language-Team: Asturian (ast)\n"
@@ -156,7 +156,7 @@ msgstr " Tabla de versiones:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -326,7 +326,7 @@ msgid "Couldn't find package %s"
msgstr "Nun pudo alcontrase'l paquete %s"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s axustáu como instaláu manualmente.\n"
@@ -386,7 +386,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "Saltando'l ficheru yá descargáu '%s'\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nun pue determinase l'espaciu llibre de %s"
@@ -419,7 +419,7 @@ msgstr "Fonte descargada %s\n"
msgid "Failed to fetch some archives."
msgstr "Falló la descarga de dellos archivos."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "Descarga completa y en mou de sólo descarga"
@@ -869,7 +869,7 @@ msgstr "Nun se pudo crear un socket"
msgid "Could not connect data socket, connection timed out"
msgstr "Nun se pudo coneutar el zócalu de datos; gandió'l tiempu de conexón"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Falló"
@@ -1118,12 +1118,7 @@ msgstr "Fallu internu"
msgid "Calculating upgrade... "
msgstr "Calculando l'anovamientu... "
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Error internu, AllUpgrade rompió coses"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Fecho"
@@ -1209,70 +1204,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Los siguientes paquetes nun cumplen dependencies:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "pero %s ta instaláu"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "pero %s ta pa instalar"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "pero nun ye instalable"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "pero ye un paquete virtual"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "pero nun ta instaláu"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "pero nun va instalase"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " o"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "Los siguientes paquetes nun cumplen dependencies:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "Van instalase los siguientes paquetes NUEVOS:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "Los siguientes paquetes van DESANICIASE:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "Los siguientes paquetes tan reteníos:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "Los siguientes paquetes van actualizase:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "Los siguientes paquetes van DESACTUALIZASE:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "Van camudase los siguientes paquetes reteníos:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (por %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1280,27 +1275,27 @@ msgstr ""
"AVISU: Los siguientes paquetes esenciales van desaniciase.\n"
"¡Esto NUN hai que facelo si nun sabes esautamente lo que faes!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu actualizaos, %lu nuevos instalaos, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalaos, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu desactualizaos, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu para desaniciar y %lu nun actualizaos.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu nun instalaos dafechu o desaniciaos.\n"
@@ -1309,7 +1304,7 @@ msgstr "%lu nun instalaos dafechu o desaniciaos.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr "[S/n]"
@@ -1317,21 +1312,21 @@ msgstr "[S/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr "[s/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "S"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error de compilación d'espresión regular - %s"
@@ -1348,6 +1343,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1360,71 +1359,71 @@ msgstr[1] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Error internu, ¡InstallPackages llamose con paquetes frañaos!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "Fai falta desaniciar los paquetes pero desaniciar ta torgáu."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "Error internu, ordenar nun finó"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Que raro... Los tamaños nun concasen, escribe a apt@packages.debian.org"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Hai que descargar %sB/%sB d'archivos.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Hai que descargar %sB d'archivos.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "Tres d'esta operación, van usase %sB d'espaciu de discu adicional.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Tres d'esta operación, van lliberase %sB d'espaciu de discu.\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Nun tienes espaciu libre bastante en %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "Hai problemes y utilizose -y ensin --force-yes"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Conseñose Trivial Only pero ésta nun ye una operación trivial."
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Sí, ¡facer lo que digo!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1435,19 +1434,19 @@ msgstr ""
"Pa continuar escribe la frase '%s'\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Encaboxar."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "¿Quies continuar?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "Dellos ficheros nun pudieron descargase"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1455,19 +1454,19 @@ msgstr ""
"Nun pudieron algamase dellos archivos, ¿seique executando apt-get update o "
"tentando --fix-missing?"
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing y cambéu de mediu nun ta sofitao actualmente"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "Nun pudieron iguase los paquetes que falten."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "Encaboxando la instalación."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1481,15 +1480,15 @@ msgstr[1] ""
"Los siguientes paquetes desaparecieron del sistema como\n"
"tolos ficheros fueron sobroescritos por otros paquetes:"
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr "Nota: Esto faise automáticamente y baxo demanda por dpkg."
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Suponse que nun vamos esborrar coses; nun pue entamase AutoRemover"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1507,15 +1506,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "La siguiente información pue aidar a resolver la situación:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Error internu, AutoRemover rompió coses"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -1526,7 +1525,7 @@ msgstr[1] ""
"Los siguientes paquetes instaláronse de manera automática y ya nun se "
"necesiten:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1535,7 +1534,7 @@ msgstr[0] "El paquete %lu instalóse de mou automáticu y yá nun se necesita.\n
msgstr[1] ""
"Los paquetes %lu instaláronse de manera automática y ya nun se necesiten\n"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
#, fuzzy
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1554,7 +1553,7 @@ msgstr ""
"Dependencies ensin cubrir. Tenta 'apt-get -f install' ensin paquetes (o "
"conseña una solución)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1566,59 +1565,59 @@ msgstr ""
"inestable, que dellos paquetes necesarios nun se crearon o que\n"
"s'allugaron fuera d'Incoming."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Paquetes frañaos"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "Instalaránse los siguientes paquetes extra:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Paquetes afalaos:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Paquetes encamentaos"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Saltando %s, ya ta instalau y la actualización nun ta activada.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr "Saltando %s, nun ta instaláu y namái se requieren anovamientos.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "La reinstalación de %s nun ye dable, nun pue descargase.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s yá ta na versión más nueva.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Esbillada la versión %s (%s) pa %s\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Esbillada la versión %s (%s) pa %s\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr "El paquete %s nun ta instalau, nun va desaniciase\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "El paquete %s nun ta instalau, nun va desaniciase\n"
@@ -2202,23 +2201,23 @@ msgstr "Nun se pue escribir en %s"
msgid "IO Error saving source cache"
msgstr "Fallu de E/S al grabar caché d'oríxenes"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr ""
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr ""
@@ -2900,7 +2899,7 @@ msgstr "%limin %lis"
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "Escoyeta %s que nun s'atopa"
@@ -3557,7 +3556,7 @@ msgstr "Nun pudo lleese al computar MD5"
msgid "Problem unlinking %s"
msgstr "Problema al desenllazar %s"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -3612,6 +3611,10 @@ msgstr ""
"-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::\n"
"cache=/tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Error internu, AllUpgrade rompió coses"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s nun ye un paquete DEB válidu."
diff --git a/po/bg.po b/po/bg.po
index 00affd028..991a686f4 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.21\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2012-06-25 17:23+0300\n"
"Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -162,7 +162,7 @@ msgstr " Таблица с версиите:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -328,7 +328,7 @@ msgid "Couldn't find package %s"
msgstr "Неуспех при намирането на пакет %s"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s е отбелязан като ръчно инсталиран.\n"
@@ -391,7 +391,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "Пропускане на вече изтегления файл „%s“\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Неуспех при определянето на свободното пространство в %s"
@@ -424,7 +424,7 @@ msgstr "Изтегляне на изходен код %s\n"
msgid "Failed to fetch some archives."
msgstr "Неуспех при изтеглянето на някои архиви."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "Изтеглянето завърши в режим само на изтегляне"
@@ -898,7 +898,7 @@ msgstr ""
"Неуспех при свързването на гнездо за данни, допустимото време за свързване "
"изтече"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Неуспех"
@@ -1150,12 +1150,7 @@ msgstr "Вътрешна грешка"
msgid "Calculating upgrade... "
msgstr "Изчисляване на актуализацията..."
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Готово"
@@ -1243,70 +1238,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Следните пакети имат неудовлетворени зависимости:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "но е инсталиран %s"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "но ще бъде инсталиран %s"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "но той не може да бъде инсталиран"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "но той е виртуален пакет"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "но той не е инсталиран"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "но той няма да бъде инсталиран"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " или"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "Следните пакети имат неудовлетворени зависимости:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "Следните НОВИ пакети ще бъдат инсталирани:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "Следните пакети ще бъдат ПРЕМАХНАТИ:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "Следните пакети няма да бъдат променени:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "Следните пакети ще бъдат актуализирани:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "Следните пакети ще бъдат ВЪРНАТИ КЪМ ПО-СТАРА ВЕРСИЯ:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "Следните задържани пакети ще бъдат променени:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (поради %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1314,27 +1309,27 @@ msgstr ""
"ПРЕДУПРЕЖДЕНИЕ: Следните необходими пакети ще бъдат премахнати.\n"
"Това НЕ би трябвало да става освен ако знаете точно какво правите!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu актуализирани, %lu нови инсталирани, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu преинсталирани, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu върнати към по-стара версия, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu за премахване и %lu без промяна.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu не са напълно инсталирани или премахнати.\n"
@@ -1343,7 +1338,7 @@ msgstr "%lu не са напълно инсталирани или премах
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr "[Y/n]"
@@ -1351,21 +1346,21 @@ msgstr "[Y/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr "[y/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "Y"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "Грешка при компилирането на регулярния израз - %s"
@@ -1382,6 +1377,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1394,40 +1393,40 @@ msgstr[1] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Вътрешна грешка, „InstallPackages“ е предизвикано при счупени пакети!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "Трябва да бъдат премахнати пакети, но премахването е изключено."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "Вътрешна грешка, „Ordering“ не завърши"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Странно... Размерите не съвпадат, изпратете е-поща на apt@packages.debian.org"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Необходимо е да се изтеглят %sB/%sB архиви.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Необходимо е да се изтеглят %sB архиви.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr ""
@@ -1436,31 +1435,31 @@ msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "След тази операция ще бъде освободено %sB дисково пространство.\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Нямате достатъчно свободно пространство в %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "Има проблеми и „-y“ е използвано без „--force-yes“"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Указано е „Trivial Only“, но това не е тривиална операция."
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Да, прави каквото казвам!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1471,19 +1470,19 @@ msgstr ""
"За да продължите, въведете фразата „%s“\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Прекъсване."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Искате ли да продължите?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "Някои файлове не можаха да бъдат изтеглени"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1491,19 +1490,19 @@ msgstr ""
"Неуспех при изтеглянето на някои архиви, може да изпълните „apt-get update“ "
"или да опитате с „--fix-missing“?"
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "„--fix-missing“ и превключване на носители не се поддържа все още"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "Неуспех при коригирането на липсващите пакети."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "Прекъсване на инсталирането."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1517,15 +1516,15 @@ msgstr[1] ""
"Следните пакети са отстранени от системата поради препокриване на всичките "
"им файлове от други пакети:"
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr "Това се прави автоматично от dpkg."
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Не би трябвало да се изтрива. AutoRemover няма да бъде стартиран"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1543,16 +1542,16 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr ""
"Следната информация може да помогне за намиране на изход от ситуацията:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Вътрешна грешка, AutoRemover счупи нещо в системата"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -1562,7 +1561,7 @@ msgstr[0] "Следният пакет е бил инсталиран автом
msgstr[1] ""
"Следните пакети са били инсталирани автоматично и вече не са необходими:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1571,7 +1570,7 @@ msgstr[0] "%lu пакет е бил инсталиран автоматично
msgstr[1] ""
"%lu пакета са били инсталирани автоматично и вече не са необходими:\n"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] "Използвайте „apt-get autoremove“ за да го премахнете."
@@ -1589,7 +1588,7 @@ msgstr ""
"Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или "
"укажете разрешение)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1601,62 +1600,62 @@ msgstr ""
"дистрибуция, че някои необходими пакети още не са създадени или пък\n"
"са били преместени от Incoming."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Счупени пакети"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "Следните допълнителни пакети ще бъдат инсталирани:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Предложени пакети:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Препоръчвани пакети:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Пропускане на %s, вече е инсталиран и не е маркиран за актуализация.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
"Пропускане на %s, който не е инсталиран при заявени само обновявания.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Преинсталацията на %s не е възможна, не може да бъде изтеглен.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s вече е най-новата версия.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Избрана е версия %s (%s) за %s\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Избрана е версия „%s“ (%s) за „%s“ заради „%s“\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr ""
"Пакетът „%s“ не е инсталиран, така че не е премахнат. Може би имахте предвид "
"„%s“?\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Пакетът „%s“ не е инсталиран, така че не е премахнат\n"
@@ -2239,25 +2238,25 @@ msgstr "Неуспех при записа на %s"
msgid "IO Error saving source cache"
msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr "Изпращане на сценарий към програмата за удовлетворяване на зависимости"
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr "Изпращане на заявка към програмата за удовлетворяване на зависимости"
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr "Подготовка за приемане на решение"
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr ""
"Външната програма за удовлетворяване на зависимости се провали без да изведе "
"съобщение за грешка"
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr "Изпълняване на външна програма за удовлетворяване на зависимости"
@@ -2952,7 +2951,7 @@ msgstr "%liм %liс"
msgid "%lis"
msgstr "%liс"
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "Изборът %s не е намерен"
@@ -3619,7 +3618,7 @@ msgstr "Неуспех при четене докато се изчислява
msgid "Problem unlinking %s"
msgstr "Неуспех при премахването на връзка на %s"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -3672,6 +3671,10 @@ msgstr ""
" -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/"
"tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s не е валиден DEB пакет."
diff --git a/po/bs.po b/po/bs.po
index 59a733360..d561b86dd 100644
--- 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+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"
@@ -158,7 +158,7 @@ msgstr ""
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -289,7 +289,7 @@ msgid "Couldn't find package %s"
msgstr ""
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "ali se %s treba instalirati"
@@ -343,7 +343,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr ""
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
@@ -376,7 +376,7 @@ msgstr ""
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr ""
@@ -767,7 +767,7 @@ msgstr ""
msgid "Could not connect data socket, connection timed out"
msgstr ""
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Neuspješno"
@@ -1014,11 +1014,7 @@ msgstr "Unutrašnja greška"
msgid "Calculating upgrade... "
msgstr "Računam nadogradnju..."
-#: apt-private/private-upgrade.cc:30
-msgid "Internal error, Upgrade broke stuff"
-msgstr ""
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Urađeno"
@@ -1104,97 +1100,97 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr ""
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "ali je %s instaliran"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "ali se %s treba instalirati"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "ali se ne može instalirati"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "ali je virtuelni paket"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "ali nije instaliran"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "ali se neće instalirati"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " ili"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr ""
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "Slijedeći NOVI paketi će biti instalirani:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "Slijedeći paketi će biti UKLONJENI:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
#, fuzzy
msgid "The following packages have been kept back:"
msgstr "Slijedeći paketi su zadržani:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "Slijedeći paketi će biti nadograđeni:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr ""
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr ""
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr ""
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr ""
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr ""
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr ""
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr ""
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr ""
@@ -1203,7 +1199,7 @@ msgstr ""
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr ""
@@ -1211,21 +1207,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -1242,6 +1238,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1254,70 +1254,70 @@ msgstr[1] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr ""
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr ""
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr ""
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr ""
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Da, uradi kako kažem!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1325,37 +1325,37 @@ msgid ""
" ?] "
msgstr ""
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Odustani."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Da li želite nastaviti?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr ""
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr ""
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "Odustajem od instalacije."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1365,15 +1365,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr ""
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1389,15 +1389,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr ""
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
#, fuzzy
msgid ""
"The following package was automatically installed and is no longer required:"
@@ -1407,7 +1407,7 @@ msgid_plural ""
msgstr[0] "Slijedeći NOVI paketi će biti instalirani:"
msgstr[1] "Slijedeći NOVI paketi će biti instalirani:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, fuzzy, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1415,7 +1415,7 @@ msgid_plural ""
msgstr[0] "Slijedeći NOVI paketi će biti instalirani:"
msgstr[1] "Slijedeći NOVI paketi će biti instalirani:"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] ""
@@ -1431,7 +1431,7 @@ msgid ""
"solution)."
msgstr ""
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1439,59 +1439,59 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Oštećeni paketi"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "Slijedeći dodatni paketi će biti instalirani:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Predloženi paketi:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Preporučeni paketi:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr ""
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr ""
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr ""
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr ""
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr ""
@@ -2059,23 +2059,23 @@ msgstr "Ne mogu zapisati na %s"
msgid "IO Error saving source cache"
msgstr ""
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr ""
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr ""
@@ -2710,7 +2710,7 @@ msgstr ""
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr ""
@@ -3311,7 +3311,7 @@ msgstr ""
msgid "Problem unlinking %s"
msgstr ""
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
msgid ""
"Usage: apt-internal-solver\n"
"\n"
diff --git a/po/ca.po b/po/ca.po
index 9f7a9b7fc..1fa809561 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.6\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2012-10-19 13:30+0200\n"
"Last-Translator: Jordi Mallach <jordi@debian.org>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -160,7 +160,7 @@ msgstr " Taula de versió:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -328,7 +328,7 @@ msgid "Couldn't find package %s"
msgstr "No s'ha pogut trobar el paquet %s"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "S'ha marcat %s com instaŀlat manualment.\n"
@@ -392,7 +392,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "S'està ometent el fitxer ja baixat «%s»\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "No s'ha pogut determinar l'espai lliure en %s"
@@ -425,7 +425,7 @@ msgstr "Obtén el font %s\n"
msgid "Failed to fetch some archives."
msgstr "No s'ha pogut baixar alguns arxius."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "Baixada completa i en mode de només baixada"
@@ -880,7 +880,7 @@ msgstr "No s'ha pogut crear un sòcol"
msgid "Could not connect data socket, connection timed out"
msgstr "No s'ha pogut connectar amb el sòcol de dades, connexió finalitzada"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Ha fallat"
@@ -1134,12 +1134,7 @@ msgstr "Error intern"
msgid "Calculating upgrade... "
msgstr "S'està calculant l'actualització… "
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Error intern, AllUpgrade ha trencat coses"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Fet"
@@ -1225,70 +1220,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Els següents paquets tenen dependències sense satisfer:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "però està instaŀlat %s"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "però s'instaŀlarà %s"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "però no és instaŀlable"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "però és un paquet virtual"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "però no està instaŀlat"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "però no serà instaŀlat"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " o"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "Els següents paquets tenen dependències sense satisfer:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "S'instaŀlaran els paquets NOUS següents:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "Es SUPRIMIRAN els paquets següents:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "S'han mantingut els paquets següents:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "S'actualitzaran els paquets següents:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "Es DESACTUALITZARAN els paquets següents:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "Es canviaran els paquets retinguts següents:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (per %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1296,27 +1291,27 @@ msgstr ""
"AVÍS: Es suprimiran els paquets essencials següents.\n"
"Això NO s'ha de fer a menys que sapigueu exactament el que esteu fent!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu actualitzats, %lu nous a instaŀlar, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstaŀlats, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu desactualitzats, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu a suprimir i %lu no actualitzats.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu no instaŀlats o suprimits completament.\n"
@@ -1325,7 +1320,7 @@ msgstr "%lu no instaŀlats o suprimits completament.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr "[S/n]"
@@ -1333,21 +1328,21 @@ msgstr "[S/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr "[s/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "S"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "S'ha produït un error de compilació de l'expressió regular - %s"
@@ -1364,6 +1359,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1376,43 +1375,43 @@ msgstr[1] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
"S'ha produït un error intern, s'ha cridat a InstallPackages amb paquets "
"trencats!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr ""
"Els paquets necessiten ser suprimits però s'ha inhabilitat la supressió."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "S'ha produït un error intern, l'ordenació no ha acabat"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Què estrany… les mides no coincideixen, informeu a apt@packages.debian.org"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "S'ha d'obtenir %sB/%sB d'arxius.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "S'ha d'obtenir %sB d'arxius.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr ""
@@ -1420,31 +1419,31 @@ msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
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"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "No teniu prou espai lliure en %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "Hi ha problemes i s'ha emprat -y sense --force-yes"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "S'ha especificat «Trivial Only» però aquesta operació no és trivial."
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Sí, fes el que et dic!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1455,19 +1454,19 @@ msgstr ""
"Per continuar escriviu la frase «%s»\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Avortat."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Voleu continuar?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "Alguns fitxers no s'han pogut baixar"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1475,19 +1474,19 @@ msgstr ""
"No es poden baixar alguns arxius, proveu a executar apt-get update o "
"intenteu-ho amb --fix-missing."
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing i els medi intercanviables actualment no estan suportats"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "No es poden corregir els paquets que falten."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "S'està avortant la instaŀlació."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1501,17 +1500,17 @@ msgstr[1] ""
"Els següents paquets han desaparegut del vostre sistema ja\n"
"que tots els fitxers s'han sobreescrit per altres paquets:"
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr "Nota: Això ho fa el dpkg automàticament i a propòsit."
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
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"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1529,15 +1528,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "La informació següent pot ajudar-vos a resoldre la situació:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "S'ha produït un error intern, el supressor automàtic ha trencat coses"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -1548,7 +1547,7 @@ msgstr[0] ""
msgstr[1] ""
"Els paquets següents s'han instaŀlat automàticament i ja no són necessaris:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1558,7 +1557,7 @@ msgstr[0] ""
msgstr[1] ""
"Els paquets %lu es van s'instaŀlar automàticament i ja no són necessaris:\n"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] "Empreu «apt-get autoremove» per a suprimir-lo."
@@ -1576,7 +1575,7 @@ msgstr ""
"Dependències insatisfetes. Proveu amb «apt-get -f install» sense paquets (o "
"especifiqueu una solució)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1588,63 +1587,63 @@ msgstr ""
"«unstable» i alguns paquets requerits encara no han estat creats o bé\n"
"encara no els hi han introduït des d'«Incoming»."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Paquets trencats"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "S'instaŀlaran els següents paquets extres:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Paquets suggerits:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Paquets recomanats:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"S'està ometent %s, ja està instaŀlat i l'actualització no està establerta.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
"S'està ometent '%s', no està instaŀlat i només es demana l'actualització.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "No es possible la reinstaŀlació del paquet %s, no es pot baixar.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s ja es troba en la versió més recent.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Versió seleccionada «%s» (%s) per a «%s»\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Versió seleccionada «%s» (%s) per a «%s» degut a «%s»\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr ""
"El paquet «%s» no està instaŀlat, així doncs no es suprimirà. Volíeu dir "
"«%s»?\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "El paquet «%s» no està instaŀlat, així doncs no es suprimirà\n"
@@ -2233,23 +2232,23 @@ msgstr "No es pot escriure en %s"
msgid "IO Error saving source cache"
msgstr "Error d'E/S en desar la memòria cau de la font"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr "Envia l'escenari al resoledor"
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr "Envia la petició al resoledor"
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr "Prepara per a rebre una solució"
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr "El resoledor extern ha fallat sense un missatge d'error adient"
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr "Executa un resoledor extern"
@@ -2942,7 +2941,7 @@ msgstr "%limin %lis"
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "No s'ha trobat la selecció %s"
@@ -3603,7 +3602,7 @@ msgstr "No s'ha pogut llegir mentre es calculava la suma MD5"
msgid "Problem unlinking %s"
msgstr "S'ha trobat un problema treient l'enllaç %s"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -3656,6 +3655,10 @@ msgstr ""
" -c=? Llegeix aquest fitxer de configuració\n"
" -o=? Estableix una opció de configuració, p. ex: -o dir::cache=/tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Error intern, AllUpgrade ha trencat coses"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s no és un paquet DEB vàlid."
diff --git a/po/cs.po b/po/cs.po
index 670654a21..002ea6f39 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2012-07-08 13:46+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -157,7 +157,7 @@ msgstr " Tabulka verzí:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -320,7 +320,7 @@ msgid "Couldn't find package %s"
msgstr "Nelze najít balík %s"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s nastaven jako instalovaný ručně.\n"
@@ -381,7 +381,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "Přeskakuji dříve stažený soubor „%s“\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nelze určit volné místo v %s"
@@ -414,7 +414,7 @@ msgstr "Stažení zdroje %s\n"
msgid "Failed to fetch some archives."
msgstr "Stažení některých archivů selhalo."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "Stahování dokončeno v režimu pouze stáhnout"
@@ -878,7 +878,7 @@ msgstr "Nelze vytvořit socket"
msgid "Could not connect data socket, connection timed out"
msgstr "Nelze připojit datový socket, čas spojení vypršel"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Selhalo"
@@ -1126,12 +1126,7 @@ msgstr "Vnitřní chyba"
msgid "Calculating upgrade... "
msgstr "Propočítávám aktualizaci… "
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Vnitřní chyba, AllUpgrade pokazil věci"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Hotovo"
@@ -1218,70 +1213,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Následující balíky mají nesplněné závislosti:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "ale %s je nainstalován"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "ale %s se bude instalovat"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "ale nedá se nainstalovat"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "ale je to virtuální balík"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "ale není nainstalovaný"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "ale nebude se instalovat"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " nebo"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "Následující balíky mají nesplněné závislosti:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "Následující NOVÉ balíky budou nainstalovány:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "Následující balíky budou ODSTRANĚNY:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "Následující balíky jsou podrženy v aktuální verzi:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "Následující balíky budou aktualizovány:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "Následující balíky budou DEGRADOVÁNY:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "Následující podržené balíky budou změněny:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (kvůli %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1289,27 +1284,27 @@ msgstr ""
"VAROVÁNÍ: Následující nezbytné balíky budou odstraněny.\n"
"Pokud přesně nevíte, co děláte, NEDĚLEJTE to!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualizováno, %lu nově instalováno, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu přeinstalováno, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu degradováno, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu k odstranění a %lu neaktualizováno.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu instalováno nebo odstraněno pouze částečně.\n"
@@ -1318,7 +1313,7 @@ msgstr "%lu instalováno nebo odstraněno pouze částečně.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr "[Y/n]"
@@ -1326,21 +1321,21 @@ msgstr "[Y/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr "[y/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "Y"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "Chyba při kompilaci regulárního výrazu - %s"
@@ -1358,6 +1353,10 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1371,71 +1370,71 @@ msgstr[2] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Vnitřní chyba, InstallPackages byl zavolán s porušenými balíky!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "Vnitřní chyba, třídění nedoběhlo do konce"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Jak podivné… velikosti nesouhlasí, ohlaste to na apt@packages.debian.org"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Potřebuji stáhnout %sB/%sB archivů.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Potřebuji stáhnout %sB archivů.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "Po této operaci bude na disku použito dalších %sB.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Po této operaci bude na disku uvolněno %sB.\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "V %s nemáte dostatek volného místa."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "Vyskytly se problémy a -y bylo použito bez --force-yes"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Udáno „pouze triviální“, ovšem toto není triviální operace."
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Ano, udělej to tak, jak říkám!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1446,19 +1445,19 @@ msgstr ""
"Pro pokračování opište frázi „%s“\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Přerušeno."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Chcete pokračovat?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "Některé soubory nemohly být staženy"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1466,19 +1465,19 @@ msgstr ""
"Nelze stáhnout některé archivy. Možná spusťte apt-get update nebo zkuste --"
"fix-missing?"
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing a výměna média nejsou momentálně podporovány"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "Nelze opravit chybějící balíky."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "Přerušuji instalaci."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1495,15 +1494,15 @@ msgstr[2] ""
"Následující balíky z tohoto systému zmizely, protože\n"
"všechny jejich soubory byly přepsány jinými balíky:"
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr "Poznámka: Toto má svůj důvod a děje se automaticky v dpkg."
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Neměli bychom mazat věci, nemůžu spustit AutoRemover"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1521,15 +1520,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Vnitřní chyba, AutoRemover pokazil věci"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -1541,7 +1540,7 @@ msgstr[1] ""
msgstr[2] ""
"Následující balíky byly nainstalovány automaticky a již nejsou potřeba:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1550,7 +1549,7 @@ msgstr[0] "%lu balík byl nainstalován automaticky a již není potřeba.\n"
msgstr[1] "%lu balíky byly nainstalovány automaticky a již nejsou potřeba.\n"
msgstr[2] "%lu balíků bylo nainstalováno automaticky a již nejsou potřeba.\n"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] "Pro jeho odstranění použijte „apt-get autoremove“."
@@ -1569,7 +1568,7 @@ msgstr ""
"Nesplněné závislosti. Zkuste spustit „apt-get -f install“ bez balíků (nebo "
"navrhněte řešení)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1580,62 +1579,62 @@ 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."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Poškozené balíky"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "Následující extra balíky budou instalovány:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Navrhované balíky:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Doporučované balíky:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Přeskakuji %s, protože je již nainstalován.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
"Přeskakuji %s, protože není nainstalován a vyžadovány jsou pouze "
"aktualizace.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Přeinstalace %s není možná, protože nelze stáhnout.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s je již nejnovější verze.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Vybraná verze „%s“ (%s) pro „%s“\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Vybraná verze „%s“ (%s) pro „%s“ kvůli „%s“\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr ""
"Balík „%s“ není nainstalován, nelze tedy odstranit. Mysleli jste „%s“?\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Balík „%s“ není nainstalován, nelze tedy odstranit\n"
@@ -2209,23 +2208,23 @@ msgstr "Nelze zapsat do %s"
msgid "IO Error saving source cache"
msgstr "Chyba IO při ukládání zdrojové cache"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr "Scénář odeslán řešiteli"
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr "Požadavek odeslán řešiteli"
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr "Příprava na obdržení řešení"
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr "Externí řešitel selhal, aniž by zanechal rozumnou chybovou hlášku"
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr "Spuštění externího řešitele"
@@ -2897,7 +2896,7 @@ msgstr "%limin %lis"
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "Výběr %s nenalezen"
@@ -3550,7 +3549,7 @@ msgstr "Chyba čtení při výpočtu MD5"
msgid "Problem unlinking %s"
msgstr "Problém s odlinkováním %s"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -3602,6 +3601,10 @@ msgstr ""
" -c=? Načte tento konfigurační soubor\n"
" -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Vnitřní chyba, AllUpgrade pokazil věci"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s není platný DEB balík."
diff --git a/po/cy.po b/po/cy.po
index b15c61792..2eef86934 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: APT\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+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"
@@ -176,7 +176,7 @@ msgstr " Tabl Fersiynnau:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -348,7 +348,7 @@ msgid "Couldn't find package %s"
msgstr "Methwyd canfod pecyn %s"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
@@ -403,7 +403,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Does dim digon o le rhydd yn %s gennych"
@@ -436,7 +436,7 @@ msgstr "Cyrchu Ffynhonell %s\n"
msgid "Failed to fetch some archives."
msgstr "Methwyd cyrchu rhai archifau."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
@@ -888,7 +888,7 @@ msgstr "Methwyd creu soced"
msgid "Could not connect data socket, connection timed out"
msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Methwyd"
@@ -1145,12 +1145,7 @@ msgstr "Gwall mewnol"
msgid "Calculating upgrade... "
msgstr "Yn Cyfrifo'r Uwchraddiad... "
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Wedi Gorffen"
@@ -1236,73 +1231,73 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "ond mae %s wedi ei sefydlu"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "ond ni ellir ei sefydlu"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "ond mae'n becyn rhithwir"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "ond nid yw wedi ei sefydlu"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "ond nid yw'n mynd i gael ei sefydlu"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " neu"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "Caiff y pecynnau canlynol eu TYNNU:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
#, fuzzy
msgid "The following packages have been kept back:"
msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
#, fuzzy
msgid "The following packages will be upgraded:"
msgstr "Caiff y pecynnau canlynol eu uwchraddio"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
#, fuzzy
msgid "The following packages will be DOWNGRADED:"
msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (oherwydd %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -1312,27 +1307,27 @@ msgstr ""
"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
"ei wneud!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu wedi ailsefydlu, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu wedi eu israddio, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n"
@@ -1341,7 +1336,7 @@ msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr ""
@@ -1349,21 +1344,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "I"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "Gwall crynhoi patrwm - %s"
@@ -1380,6 +1375,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1392,72 +1391,72 @@ msgstr[1] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
#, fuzzy
msgid "Packages need to be removed but remove is disabled."
msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
#, fuzzy
msgid "Internal error, Ordering didn't finish"
msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Mae angen cyrchu %sB o archifau.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, fuzzy, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, fuzzy, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Does dim digon o le rhydd gennych yn %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml."
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Ie, gwna fel rydw i'n dweud!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1468,19 +1467,19 @@ msgstr ""
"Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
" ?]"
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Erthylu."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Ydych chi eisiau mynd ymlaen?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "Methodd rhai ffeiliau lawrlwytho"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1488,20 +1487,20 @@ msgstr ""
"Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
"geidio defnyddio --fix-missing?"
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "Ni ellir cywiro pecynnau ar goll."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
#, fuzzy
msgid "Aborting install."
msgstr "Yn Erthylu'r Sefydliad."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1511,15 +1510,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr ""
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1535,16 +1534,16 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
#, fuzzy
msgid ""
"The following package was automatically installed and is no longer required:"
@@ -1554,7 +1553,7 @@ msgid_plural ""
msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, fuzzy, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1562,7 +1561,7 @@ msgid_plural ""
msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] ""
@@ -1582,7 +1581,7 @@ msgstr ""
"pecyn (neu penodwch ddatrys)"
# FIXME: needs commas
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1594,59 +1593,59 @@ msgstr ""
"ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n"
"heb gael eu symud allan o Incoming."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Pecynnau wedi torri"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Pecynnau a awgrymmir:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Pecynnau a argymhellir:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, fuzzy, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
@@ -2238,23 +2237,23 @@ msgstr "Ni ellir ysgrifennu i %s"
msgid "IO Error saving source cache"
msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr ""
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr ""
@@ -2923,7 +2922,7 @@ msgstr ""
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "Ni chanfuwyd y dewis %s"
@@ -3587,7 +3586,7 @@ msgid "Problem unlinking %s"
msgstr "Gwall wrth datgysylltu %s"
# FIXME: "debian"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -3641,6 +3640,10 @@ msgstr ""
" -c=? Darllen y ffeil cyfluniad hwn\n"
" -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "Nid yw %s yn becyn DEB dilys."
diff --git a/po/da.po b/po/da.po
index f7af287a8..d876a864f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2013-12-14 23:51+0200\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -163,7 +163,7 @@ msgstr " Versionstabel:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -333,7 +333,7 @@ msgid "Couldn't find package %s"
msgstr "Kunne ikke finde pakken %s"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s sat til manuelt installeret.\n"
@@ -394,7 +394,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "Overspringer allerede hentet fil »%s«\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kunne ikke bestemme ledig plads i %s"
@@ -427,7 +427,7 @@ msgstr "Henter kildetekst %s\n"
msgid "Failed to fetch some archives."
msgstr "Nogle arkiver kunne ikke hentes."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "Nedhentning afsluttet i »hent-kun«-tilstand"
@@ -907,7 +907,7 @@ msgstr "Kunne ikke oprette sokkel"
msgid "Could not connect data socket, connection timed out"
msgstr "Kunne ikke forbinde datasokkel, tidsudløb på forbindelsen"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Mislykkedes"
@@ -1160,11 +1160,7 @@ msgstr "Intern fejl"
msgid "Calculating upgrade... "
msgstr "Beregner opgraderingen ... "
-#: apt-private/private-upgrade.cc:30
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Intern fejl, opgradering blev afbrudt"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Færdig"
@@ -1248,70 +1244,70 @@ msgstr "[kan opgraderes fra: "
msgid "[residual-config]"
msgstr "[residual-konfig]"
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Følgende pakker har uopfyldte afhængigheder:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "men %s er installeret"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "men %s forventes installeret"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "men den kan ikke installeres"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "men det er en virtuel pakke"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "men den er ikke installeret"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "men den bliver ikke installeret"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " eller"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "Følgende pakker har uopfyldte afhængigheder:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "Følgende NYE pakker vil blive installeret:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "Følgende pakker vil blive AFINSTALLERET:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "Følgende pakker er blevet holdt tilbage:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "Følgende pakker vil blive opgraderet:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "Følgende pakker vil blive NEDGRADERET:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "Følgende tilbageholdte pakker vil blive ændret:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (grundet %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1319,27 +1315,27 @@ msgstr ""
"ADVARSEL: Følgende essentielle pakker vil blive afinstalleret\n"
"Dette bør IKKE ske medmindre du er helt klar over, hvad du laver!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu opgraderes, %lu nyinstalleres, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu geninstalleres, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nedgraderes, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu afinstalleres og %lu opgraderes ikke.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n"
@@ -1348,7 +1344,7 @@ msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr "[J/n]"
@@ -1356,21 +1352,21 @@ msgstr "[J/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr "[j/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "J"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fejl ved tolkning af regulært udtryk - %s"
@@ -1387,6 +1383,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1399,71 +1399,71 @@ msgstr[1] ""
msgid "not a real package (virtual)"
msgstr "ikke en reel pakke (virtuel)"
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Intern fejl. InstallPackages blev kaldt med ødelagte pakker!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "Pakker skal afinstalleres, men Remove er deaktiveret."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "Intern fejl. Sortering blev ikke fuldført"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Mystisk... Størrelserne passede ikke, skriv til apt@packages.debian.org"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "%sB/%sB skal hentes fra arkiverne.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "%sB skal hentes fra arkiverne.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "Efter denne handling, vil %sB yderligere diskplads være brugt.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Efter denne handling, vil %sB diskplads blive frigjort.\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Du har ikke nok ledig plads i %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "Der er problemer og -y blev brugt uden --force-yes"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "»Trivial Only« angivet, men dette er ikke en triviel handling."
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Ja, gør som jeg siger!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1474,19 +1474,19 @@ msgstr ""
"For at fortsætte, skal du skrive »%s«\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Afbryder."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Vil du fortsætte?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "Nedhentningen af filer mislykkedes"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1494,19 +1494,19 @@ msgstr ""
"Kunne ikke hente nogle af arkiverne. Prøv evt. at køre »apt-get update« "
"eller prøv med --fix-missing."
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing og medieskift understøttes endnu ikke"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "Kunne ikke rette manglende pakker."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "Afbryder installationen."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1520,17 +1520,17 @@ msgstr[1] ""
"De følgende pakker forsvandt fra dit system, da\n"
"alle filer er blevet overskrevet af andre pakker:"
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr "Bemærk: Dette sker automatisk og med vilje af dpkg."
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
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"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1548,15 +1548,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "Følgende oplysninger kan hjælpe dig med at klare situationen:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Intern fejl. AutoRemover ødelagde noget"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -1567,7 +1567,7 @@ msgstr[0] ""
msgstr[1] ""
"Følgende pakker blev installeret automatisk, og behøves ikke længere:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1576,7 +1576,7 @@ msgstr[0] "Pakken %lu blev installeret automatisk, og behøves ikke længere.\n"
msgstr[1] ""
"Pakkerne %lu blev installeret automatisk, og behøves ikke længere.\n"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] "Brug »apt-get autoremove« til at fjerne den."
@@ -1594,7 +1594,7 @@ msgstr ""
"Uopfyldte afhængigheder. Prøv »apt-get -f install« uden pakker (eller angiv "
"en løsning)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1605,59 +1605,59 @@ msgstr ""
"en umulig situation eller bruger den ustabile distribution, hvor enkelte\n"
"pakker endnu ikke er lavet eller gjort tilgængelige."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Ødelagte pakker"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "Følgende yderligere pakker vil blive installeret:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Foreslåede pakker:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Anbefalede pakker:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, fuzzy, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, fuzzy, c-format
msgid "%s is already the newest version.\n"
msgstr "%s var allerede sat i bero.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr ""
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr ""
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr ""
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n"
@@ -2237,23 +2237,23 @@ msgstr "Kunne ikke skrive til %s"
msgid "IO Error saving source cache"
msgstr "IO-fejl ved gemning af kilde-mellemlageret"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr "Send scenarie til problemløser"
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr "Send forespørgsel til problemløser"
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr "Forbered for modtagelse af løsning"
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr "Ekstern problemløser fejlede uden en korrekt fejlbesked"
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr "Kør ekstern problemløser"
@@ -2926,7 +2926,7 @@ msgstr "%limin %lis"
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "Det valgte %s blev ikke fundet"
@@ -3580,7 +3580,7 @@ msgstr "Kunne ikke læse under beregning af MD5"
msgid "Problem unlinking %s"
msgstr "Problem under aflænkning af %s"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -3633,6 +3633,9 @@ msgstr ""
" -c=? Læs denne opsætningsfil\n"
" -o=? Angiv en opsætningsindstilling. F.eks. -o dir::cache=/tmp\n"
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Intern fejl, opgradering blev afbrudt"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s er ikke en gyldig DEB-pakke."
diff --git a/po/de.po b/po/de.po
index 855eab400..54516d690 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.2\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2012-06-27 10:55+0200\n"
"Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
"Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
@@ -164,7 +164,7 @@ msgstr " Versionstabelle:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -335,7 +335,7 @@ msgid "Couldn't find package %s"
msgstr "Paket %s konnte nicht gefunden werden"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s wurde als manuell installiert festgelegt.\n"
@@ -400,7 +400,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "Bereits heruntergeladene Datei »%s« wird übersprungen.\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Freier Platz in %s konnte nicht bestimmt werden."
@@ -433,7 +433,7 @@ msgstr "Quelle %s wird heruntergeladen.\n"
msgid "Failed to fetch some archives."
msgstr "Einige Archive konnten nicht heruntergeladen werden."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv"
@@ -918,7 +918,7 @@ msgstr "Socket konnte nicht erzeugt werden."
msgid "Could not connect data socket, connection timed out"
msgstr "Daten-Socket konnte wegen Zeitüberschreitung nicht verbunden werden."
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Fehlgeschlagen"
@@ -1180,12 +1180,7 @@ msgstr "Interner Fehler"
msgid "Calculating upgrade... "
msgstr "Paketaktualisierung (Upgrade) wird berechnet... "
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Interner Fehler, AllUpgrade hat etwas beschädigt."
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Fertig"
@@ -1271,71 +1266,71 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Die folgenden Pakete haben unerfüllte Abhängigkeiten:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "aber %s ist installiert"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "aber %s soll installiert werden"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "ist aber nicht installierbar"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "ist aber ein virtuelles Paket"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "ist aber nicht installiert"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "soll aber nicht installiert werden"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " oder"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "Die folgenden Pakete haben unerfüllte Abhängigkeiten:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "Die folgenden NEUEN Pakete werden installiert:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "Die folgenden Pakete werden ENTFERNT:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "Die folgenden Pakete sind zurückgehalten worden:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "Die folgenden Pakete werden aktualisiert (Upgrade):"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr ""
"Die folgenden Pakete werden durch eine ÄLTERE VERSION ERSETZT (Downgrade):"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "Die folgenden zurückgehaltenen Pakete werden verändert:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (wegen %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1343,27 +1338,27 @@ msgstr ""
"WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n"
"Dies sollte NICHT geschehen, außer Sie wissen genau, was Sie tun!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualisiert, %lu neu installiert, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu erneut installiert, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu durch eine ältere Version ersetzt, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu nicht vollständig installiert oder entfernt.\n"
@@ -1372,7 +1367,7 @@ msgstr "%lu nicht vollständig installiert oder entfernt.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr "[J/n]"
@@ -1380,21 +1375,21 @@ msgstr "[J/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr "[j/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "J"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s"
@@ -1411,6 +1406,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1423,19 +1422,19 @@ msgstr[1] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Interner Fehler, InstallPackages mit defekten Paketen aufgerufen!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "Interner Fehler, Anordnung beendete nicht"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Wie merkwürdig ... die Größen haben nicht übereingestimmt; schreiben Sie "
@@ -1443,52 +1442,52 @@ msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Es müssen noch %sB von %sB an Archiven heruntergeladen werden.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Es müssen %sB an Archiven heruntergeladen werden.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "Nach dieser Operation werden %sB Plattenplatz zusätzlich benutzt.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Nach dieser Operation werden %sB Plattenplatz freigegeben.\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Sie haben nicht genug Platz in %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet."
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "»Nur triviale« angegeben, aber dies ist keine triviale Operation."
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Ja, tue was ich sage!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1499,19 +1498,19 @@ msgstr ""
"Zum Fortfahren geben Sie bitte »%s« ein.\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Abbruch."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Möchten Sie fortfahren?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "Einige Dateien konnten nicht heruntergeladen werden."
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1519,19 +1518,19 @@ msgstr ""
"Einige Archive konnten nicht heruntergeladen werden; vielleicht »apt-get "
"update« ausführen oder mit »--fix-missing« probieren?"
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing und Wechselmedien werden derzeit nicht unterstützt."
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "Fehlende Pakete konnten nicht korrigiert werden."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "Installation abgebrochen."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1545,16 +1544,16 @@ msgstr[1] ""
"Die folgenden Pakete verschwanden von Ihrem System, da alle\n"
"Dateien von anderen Paketen überschrieben wurden:"
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr "Hinweis: Dies wird automatisch und absichtlich von dpkg durchgeführt."
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"Es soll nichts gelöscht werden, AutoRemover kann nicht gestartet werden."
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1573,16 +1572,16 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr ""
"Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Interner Fehler, AutoRemover hat etwas beschädigt."
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -1595,7 +1594,7 @@ msgstr[1] ""
"Die folgenden Pakete wurden automatisch installiert und werden nicht mehr "
"benötigt:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1605,7 +1604,7 @@ msgstr[0] ""
msgstr[1] ""
"%lu Pakete wurden automatisch installiert und werden nicht mehr benötigt.\n"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] "Verwenden Sie »apt-get autoremove«, um es zu entfernen."
@@ -1623,7 +1622,7 @@ msgstr ""
"Unerfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne Angabe "
"eines Pakets (oder geben Sie eine Lösung an)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1635,67 +1634,67 @@ msgstr ""
"Unstable-Distribution verwenden, dass einige erforderliche Pakete noch\n"
"nicht erstellt wurden oder Incoming noch nicht verlassen haben."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Beschädigte Pakete"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "Die folgenden zusätzlichen Pakete werden installiert:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Vorgeschlagene Pakete:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Empfohlene Pakete:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"%s wird übersprungen; es ist schon installiert und ein Upgrade ist nicht "
"angefordert.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
"%s wird übersprungen; es ist nicht installiert und lediglich Upgrades sind "
"angefordert.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"Erneute Installation von %s ist nicht möglich,\n"
"es kann nicht heruntergeladen werden.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s ist schon die neueste Version.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Version »%s« (%s) für »%s« gewählt.\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Version »%s« (%s) für »%s« gewählt aufgrund von »%s«.\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr ""
"Paket »%s« ist nicht installiert, wird also auch nicht entfernt. Meinten Sie "
"»%s«?\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Paket »%s« ist nicht installiert, wird also auch nicht entfernt.\n"
@@ -2290,24 +2289,24 @@ msgstr "Schreiben nach %s nicht möglich"
msgid "IO Error saving source cache"
msgstr "E/A-Fehler beim Speichern des Quell-Zwischenspeichers"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr "Szenario an Problemlöser senden"
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr "Anfrage an Problemlöser senden"
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr "Vorbereiten, eine Lösung zu erhalten"
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr ""
"Externer Problemlöser ist ohne ordnungsgemäße Fehlermeldung fehlgeschlagen."
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr "Externen Problemlöser ausführen"
@@ -3007,7 +3006,7 @@ msgstr "%li min %li s"
msgid "%lis"
msgstr "%li s"
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "Auswahl %s nicht gefunden"
@@ -3681,7 +3680,7 @@ msgstr "Lesevorgang während der MD5-Berechnung fehlgeschlagen"
msgid "Problem unlinking %s"
msgstr "Problem beim Entfernen (unlink) von %s"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -3735,6 +3734,10 @@ msgstr ""
" -c=? Diese Konfigurationsdatei lesen\n"
" -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Interner Fehler, AllUpgrade hat etwas beschädigt."
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s ist kein gültiges DEB-Paket."
diff --git a/po/dz.po b/po/dz.po
index a9df474fa..0f21c3ab6 100644
--- 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+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"
@@ -164,7 +164,7 @@ msgstr "ཐོན་རིམ་ཐིག་ཁྲམ།:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -334,7 +334,7 @@ msgid "Couldn't find package %s"
msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
@@ -388,7 +388,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s་ནང་བར་སྟོང་"
@@ -421,7 +421,7 @@ msgstr "%s་འབྱུང་ཁུངས་ལེན།\n"
msgid "Failed to fetch some archives."
msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "ཕབ་ལེན་ཐབས་ལམ་རྐྱངམ་གཅིག་ནང་མཇུག་བསྡུཝ་སྦེ་རང་ཕབ་ལེན་འབད།"
@@ -862,7 +862,7 @@ msgstr "སོ་ཀེཊི་ཅིག་གསར་བསྐྲུན་འ
msgid "Could not connect data socket, connection timed out"
msgstr "གནད་སྡུད་སོ་ཀེཊི་མཐུད་མ་ཚུགས་པར་ཡོདཔ་ཨིན་ མཐུད་ལམ་ངལ་མཚམས།"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
@@ -1113,12 +1113,7 @@ msgstr "ནང་འཁོད་འཛོལ་བ།"
msgid "Calculating upgrade... "
msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... "
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "ནང་འགོད་འཛོལ་བ་ ཡར་བསྐྱེད་ཀྱི་ཅ་ཆས་ཆ་མཉམ་མེདཔ་ཐལ་ཡོད།"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "འབད་ཚར་ཡི།"
@@ -1204,70 +1199,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཚུ་ལུ་རྟེན་འབྲེལ་མ་ཚང་པས:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "འདི་འབདཝ་ད་%s་འདི་གཞི་བཙུགས་འབད་ཡོད།"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "འདི་འབདཝ་ད་%s་འདི་གཟི་བཙུགས་འབད་མི་བཏུབ་པས།"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "འདི་འབདཝ་ད་ འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན་པས།"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མ་འབད་བས།"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མི་འབད་ནི་ཨིན་པས།"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr "ཡང་ན།"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཚུ་ལུ་རྟེན་འབྲེལ་མ་ཚང་པས:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་རྩ བསྐྲད་གཏང་འོང་:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ལོག་སྟེ་རང་བཞག་ནུག:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ཡར་བསྐྱེད་འབད་འོང་:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "འོག་གི་ཐུམ་སྒྲལ་འདི་ཚུ་མར་ཕབ་འབད་འོང་:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "འོག་གི་འཆང་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་བསྒྱུར་བཅོས་འབད་འོང་:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s( %s་གིས་སྦེ)"
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1275,27 +1270,27 @@ msgstr ""
"ཉེན་བརྡ:འོག་གི་ཉོ་མཁོ་བའི་ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་གཏང་འོང་།\n"
"ཁྱོད་ཀྱིས་ཁྱོད་རང་ག་ཅི་འབདཝ་ཨིན་ན་ངེས་སྦེ་མ་ཤེས་ཚུན་འདི་འབད་ནི་མི་འོང་།!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu་ཡར་བསྐྱེད་འབད་ཡོད་ %lu་འདི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད།"
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu་འདི་ལོག་གཞི་བཙུགས་འབད་ཡོད།"
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu་འདི་མར་ཕབ་འབད་ཡོད།"
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "རྩ་བསྐྲད་འབད་ནི་ལུ་%lu་དང་%lu་ཡར་བསྐྱེད་མ་འབད་བས།\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས་མ་འབད་ཡང་ན་རྩ་བསྐྲད་མ་གཏང་པས།\n"
@@ -1304,7 +1299,7 @@ msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr ""
@@ -1312,21 +1307,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "ཝའི།"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s"
@@ -1343,6 +1338,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1355,21 +1354,21 @@ msgstr[1] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
"ནང་འཁོད་ཀྱི་འཛོལ་བ་ གཞི་བཙུགས་ཐུམ་སྒྲིལ་ཚུ་ ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་དང་གཅིག་ཁར་བོད་བརྡ་འབད་འདི་"
"ཡོད!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་བཏང་དགོཔ་འདུག་འདི་འབདགཝ་ད་རྩ་བསྐྲད་གཏང་ནི་འདི་ལྕོགས་མིན་ཐལ་ཏེ་འདུག"
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "ནང་འཁོད་འཛོལ་བ་ གོ་རིམ་བཟོ་ནི་ཚུ་མཇུག་མ་བསྡུ་བས།"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"ག་ཅི་གི་ཡ་མཚན་ཆེ་མི་ཆེ་ ཚད་འདི་གིས་ email apt@packages.debian.org་ལུ་མཐུན་སྒྲིག་མི་འབད་"
@@ -1377,52 +1376,52 @@ msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "%sBལེན་ནི་ལུ་དགོཔ་པས། ཡིག་མཛོད་ཚི་གི་%sB་\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "ཡིག་མཛོད་ཀྱི་%sB་འདི་ལེན་དགོ་པས།\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, fuzzy, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "ཁ་སྐོང་གི་%sB་འདི་བཤུབ་པའི་ཤུལ་ལས་ཌིཀསི་གི་བར་སྟོང་དེ་ལག་ལེན་འཐབ་འོང་།\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, fuzzy, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "%sB་འདི་ཤུབ་པའི་ཤུལ་ལས་ཀྱི་བར་སྟོང་དེ་དལཝ་སྦེ་ལུས་འོང་།\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "%s ནང་ཁྱོད་ལུ་བར་སྟོང་དལཝ་ལངམ་སྦེ་མིན་འདུག"
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "དཀའ་ངལ་ཚུ་ཡོདཔ་ལས་-y ་འདི་ --force-yes་མེདཐོག་ལས་ལག་ལེན་འཐབ་སྟེ་ཡོད།"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "གལ་ཆུང་རྐྱངམ་ཅིག་ཁསལ་བཀོད་འབད་ནུག་ འདི་འབདཝ་ད་འ་ནི་འདི་གལ་ཆུང་གི་བཀོལ་སྤྱོད་མེན།"
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "ཨིན་ ང་གིས་སླབ་དོ་བཟུམ་སྦེ་རང་འབད!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1433,20 +1432,20 @@ msgstr ""
"འཕྲོ་མཐུད་འབད་ནིའི་དོན་ལུ་'%s'ཚིག་ཚན་ནང་ལུ་ཡིག་དཔར་རྐྱབས།\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "བར་བཤོལ་འབད།"
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
#, fuzzy
msgid "Do you want to continue?"
msgstr "ཁྱོན་ཀྱི་འཕྲོ་མཐུད་ནི་འབད་ནི་ཨིན་ན་"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1454,19 +1453,19 @@ msgstr ""
"ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་མི་ཚུགས་པས་ apt-get་དུས་མཐུན་བཟོ་ནི་གཡོག་བཀོལ་ནི་ཨིན་ན་ཡང་ན་--fix-"
"missing་དང་གཅིག་ཁར་འབད་རྩོལ་བསྐྱེད་ནི་ཨིན་ན་?"
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing་དང་བརྡ་ལམ་བརྗེ་སོར་འབད་ནི་འདི་ད་ལྟོ་ལས་རང་རྒྱབ་སྐྱོར་མི་འབད་བས།"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "བརླག་སྟོར་ཞུགས་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་ནོར་བཅོས་འབད་མི་ཚུགས་པས།"
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།"
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1476,15 +1475,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr ""
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1500,16 +1499,16 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "འོག་གི་བརྡ་དོན་དེ་གིས་དུས་སྐབས་འདི་མོས་མཐུན་བཟོ་ནི་ལུ་གྲོགས་རམ་འབད་འོང་:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
#, fuzzy
msgid ""
"The following package was automatically installed and is no longer required:"
@@ -1519,7 +1518,7 @@ msgid_plural ""
msgstr[0] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
msgstr[1] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, fuzzy, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1527,7 +1526,7 @@ msgid_plural ""
msgstr[0] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
msgstr[1] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] ""
@@ -1545,7 +1544,7 @@ msgstr ""
"མ་ཚང་བའི་རྟེན་འབྲེལ་ ཐུས་སྒྲིལ་མེད་མི་ཚུ་དང་གཅིག་ཁར་ 'apt-get -f install'དེ་འབཐ་རྩོལ་བསྐྱེདཔ།"
"(ཡང་ན་ཐབས་ཤེས་ཅིག་གསལ་བཀོད་འབད།)"
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1556,63 +1555,63 @@ msgstr ""
"འབད་འབདཝ་འོང་ནི་མས་ ཡང་ན་ད་ལྟོ་ཡང་གསར་བསྐྲུན་མ་འབད་བར་ཡོད་པའི་ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་ཡང་ན་ནང་"
"འབྱོར་གྱི་ཕྱི་ཁར་རྩ་བསྐྲད་བཏང་ཡོད་པའི་རྩ་བརྟན་མེད་པའི་བགོ་འགྲེམ་ཚུ་ལག་ལེན་འཐབ་དོ་ཡོདཔ་འོང་ནི་ཨིན་པས།"
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ།"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཐེབས་ཚུ་གཞི་བཙུགས་འབད་འོང་:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "བསམ་འཆར་བཀོད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "འོས་སྦྱོར་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"%s་གོམ་འགྱོ་འབད་དོ་ འདི་ཧེ་མ་ལས་རང་གཞི་བཙུགས་འབད་འོདཔ་དང་དུས་ཡར་བསྐྱེད་འབད་ནི་འདི་གཞི་སྒྲིག་མ་"
"འབད་བས།\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, fuzzy, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
"%s་གོམ་འགྱོ་འབད་དོ་ འདི་ཧེ་མ་ལས་རང་གཞི་བཙུགས་འབད་འོདཔ་དང་དུས་ཡར་བསྐྱེད་འབད་ནི་འདི་གཞི་སྒྲིག་མ་"
"འབད་བས།\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "%s ་ལོག་གཞི་བཙུགས་འབད་ནི་འདི་མི་སྲིད་པ་ཅིག་ཨིན་པས་ འདི་ཕབ་ལེན་འབད་མི་བཏུབ་པས།\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་ འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་ འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n"
@@ -2192,23 +2191,23 @@ msgstr " %sལུ་འབྲི་མ་ཚུགས།"
msgid "IO Error saving source cache"
msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མཛོད་སྲུང་བཞག་འབད་དོ།"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr ""
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr ""
@@ -2860,7 +2859,7 @@ msgstr ""
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "སེལ་འཐུ་%s ་མ་འཐོབ།"
@@ -3516,7 +3515,7 @@ msgstr "ཨེམ་ཌི་༥་གློག་རིག་རྐྱབ་པ
msgid "Problem unlinking %s"
msgstr "%s་འབྲེལ་འཐུད་མེདཔ་བཟོ་ནི་ལུ་དཀའ་ངལ།"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -3571,6 +3570,10 @@ msgstr ""
" -o=? འདི་གིས་ མཐུན་སྒྲིག་ རིམ་སྒྲིག་གི་གདམ་ཁ་ཚུ་ཁཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་-o dir::cache=/"
"tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "ནང་འགོད་འཛོལ་བ་ ཡར་བསྐྱེད་ཀྱི་ཅ་ཆས་ཆ་མཉམ་མེདཔ་ཐལ་ཡོད།"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s འདི་ནུས་ཅན་གྱི་ ཌི་ཨི་བི་ཅིག་མེན་པས།"
diff --git a/po/el.po b/po/el.po
index 9f42cf36f..4800e4133 100644
--- a/po/el.po
+++ b/po/el.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_el\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2008-08-26 18:25+0300\n"
"Last-Translator: Θανάσης Νάτσης <natsisthanasis@gmail.com>\n"
"Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -169,7 +169,7 @@ msgstr " Πίνακας Έκδοσης:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -340,7 +340,7 @@ msgid "Couldn't find package %s"
msgstr "Αδύνατη η εύρεση του πακέτου %s"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "το %s έχει εγκατασταθεί με το χέρι\n"
@@ -398,7 +398,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s"
@@ -431,7 +431,7 @@ msgstr "Μεταφόρτωση Κωδικα %s\n"
msgid "Failed to fetch some archives."
msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο"
@@ -875,7 +875,7 @@ msgstr "Αδύνατη η δημιουργία μιας υποδοχής (socket
msgid "Could not connect data socket, connection timed out"
msgstr "Αδύνατη η σύνδεση υποδοχής δεδομένων, λήξη χρόνου σύνδεσης"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Απέτυχε"
@@ -1129,12 +1129,7 @@ msgstr "Εσωτερικό Σφάλμα"
msgid "Calculating upgrade... "
msgstr "Υπολογισμός της αναβάθμισης... "
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Εσωτερικό Σφάλμα, η διαδικασία αναβάθμισης χάλασε"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Ετοιμο"
@@ -1222,70 +1217,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "αλλά το %s είναι εγκατεστημένο"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "αλλά το %s πρόκειται να εγκατασταθεί"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "αλλά δεν είναι εγκαταστάσημο"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "αλλά είναι ένα εικονικό πακέτο"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "αλλά δεν είναι εγκατεστημένο"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "αλλά δεν πρόκειται να εγκατασταθεί"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " η"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "Τα ακόλουθα κρατημένα πακέτα θα αλλαχθούν:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (λόγω του %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1293,27 +1288,27 @@ msgstr ""
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαραίτητα πακέτα θα αφαιρεθούν\n"
"Αυτό ΔΕΝ θα έπρεπε να συμβεί, εκτός αν ξέρετε τι ακριβώς κάνετε!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu επανεγκατεστημένα,"
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu υποβαθμισμένα, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζονται.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n"
@@ -1322,7 +1317,7 @@ msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκα
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr "[Ν/ο]"
@@ -1330,21 +1325,21 @@ msgstr "[Ν/ο]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr "[ν/Ο]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "σφάλμα μεταγλωτισμου - %s"
@@ -1361,6 +1356,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1373,20 +1372,20 @@ msgstr[1] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Εσωτερικό σφάλμα, έγινε κλήση του Install Packages με σπασμένα πακέτα!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr ""
"Μερικά πακέτα πρέπει να αφαιρεθούν αλλά η Αφαίρεση είναι απενεργοποιημένη."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "Εσωτερικό Σφάλμα, η Ταξινόμηση δεν ολοκληρώθηκε"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Πολύ περίεργο! Τα μεγέθη δεν ταιριάζουν, στείλτε μήνυμα στο apt@packages."
@@ -1394,21 +1393,21 @@ msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB από αρχεία.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Χρειάζεται να μεταφορτωθούν %sB από αρχεία.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr ""
@@ -1416,31 +1415,31 @@ msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Μετά από αυτή τη λειτουργία, θα ελευθερωθούν %sB χώρου από το δίσκο.\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "Υπάρχουν προβλήματα και δώσατε -y χωρίς το --force-yes"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Καθορίσατε συνηθισμένο, αλλά αυτή δεν είναι μια συνηθισμένη εργασία"
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Ναι, κανε ότι λέω!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1451,19 +1450,19 @@ msgstr ""
"Για να συνεχίσετε πληκτρολογήστε τη φράση '%s'\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Εγκατάλειψη."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Θέλετε να συνεχίσετε;"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1471,20 +1470,20 @@ msgstr ""
"Αδύνατη η μεταφόρτωση μερικών αρχείων, ίσως αν δοκιμάζατε με apt-get update "
"ή το --fix-missing;"
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
"ο συνδυασμός --fix-missing με εναλλαγή μέσων δεν υποστηρίζεται για την ώρα"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "Αδύνατη η επίλυση των χαμένων πακέτων."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "Εγκατάλειψη της εγκατάστασης."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1494,16 +1493,16 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr ""
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"Δεν επιτρέπεται οποιαδήποτε διαγραφή· αδυναμία εκκίνησης του AutoRemover"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1521,15 +1520,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Εσωτερικό Σφάλμα, το AutoRemover δημιούργησε κάποιο πρόβλημα"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -1539,7 +1538,7 @@ msgstr[0] "Το ακόλουθο πακέτο εγκαταστάθηκε αυτ
msgstr[1] ""
"Τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, fuzzy, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1549,7 +1548,7 @@ msgstr[0] ""
msgstr[1] ""
"%lu τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] "Χρησιμοποιήστε 'apt-get autoremove' για να το διαγράψετε."
@@ -1567,7 +1566,7 @@ msgstr ""
"Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε "
"πακέτο (ή καθορίστε μια λύση)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1579,64 +1578,64 @@ msgstr ""
"διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n"
"μετακινηθεί από τα εισερχόμενα."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Χαλασμένα πακέτα"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Προτεινόμενα πακέτα:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Συνιστώμενα πακέτα:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Παράκαμψη του %s, είναι εγκατεστημένο και η αναβάθμιση δεν έχει οριστεί.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
"Παράκαμψη του %s, είναι εγκατεστημένο και μόνο αναβαθμίσεις έχουν οριστεί.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"Η επανεγκατάσταση του %s δεν είναι εφικτή, δεν είναι δυνατή η μεταφόρτωσή "
"του\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Επιλέχθηκε η έκδοση %s (%s) για το %s\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Επιλέχθηκε η έκδοση %s (%s) για το %s λόγω του %s\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr ""
"Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί. Εννοείτε '%s'?\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί\n"
@@ -2220,23 +2219,23 @@ msgstr "Αδύνατη η εγγραφή στο %s"
msgid "IO Error saving source cache"
msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr ""
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr ""
@@ -2888,7 +2887,7 @@ msgstr ""
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "Η επιλογή %s δε βρέθηκε"
@@ -3549,7 +3548,7 @@ msgstr "Αποτυχία ανάγνωσης κατά τον υπολογισμό
msgid "Problem unlinking %s"
msgstr "Πρόβλημα κατά την αποσύνδεση του %s"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -3603,6 +3602,10 @@ msgstr ""
" -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n"
" -o=? Θέσε μια αυθαίρετη παράμετρο,πχ -o dir::cache=/tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Εσωτερικό Σφάλμα, η διαδικασία αναβάθμισης χάλασε"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "Το %s δεν είναι έγκυρο πακέτο DEB."
diff --git a/po/es.po b/po/es.po
index b091b3ceb..ffb43aeba 100644
--- a/po/es.po
+++ b/po/es.po
@@ -33,7 +33,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.10\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2011-01-24 11:47+0100\n"
"Last-Translator: Javier Fernández-Sanguino Peña <jfs@debian.org>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -214,7 +214,7 @@ msgstr " Tabla de versión:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -388,7 +388,7 @@ msgid "Couldn't find package %s"
msgstr "No se pudo encontrar el paquete %s"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "fijado %s como instalado manualmente.\n"
@@ -450,7 +450,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "Omitiendo el fichero ya descargado «%s»\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "No pude determinar el espacio libre en %s"
@@ -483,7 +483,7 @@ msgstr "Fuente obtenida %s\n"
msgid "Failed to fetch some archives."
msgstr "No se pudieron obtener algunos archivos."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "Descarga completa y en modo de sólo descarga"
@@ -933,7 +933,7 @@ msgstr "No pude crear un socket"
msgid "Could not connect data socket, connection timed out"
msgstr "No pude conectar el socket de datos, expiró el tiempo de conexión"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Falló"
@@ -1184,12 +1184,7 @@ msgstr "Error interno"
msgid "Calculating upgrade... "
msgstr "Calculando la actualización... "
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Error Interno, AllUpgrade rompió cosas"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Listo"
@@ -1275,70 +1270,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Los siguientes paquetes tienen dependencias incumplidas:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "pero %s está instalado"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "pero %s va a ser instalado"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "pero no es instalable"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "pero es un paquete virtual"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "pero no está instalado"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "pero no va a instalarse"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " o"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "Los siguientes paquetes tienen dependencias incumplidas:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "Se instalarán los siguientes paquetes NUEVOS:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "Los siguientes paquetes se ELIMINARÁN:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "Los siguientes paquetes se han retenido:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "Se actualizarán los siguientes paquetes:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "Se DESACTUALIZARÁN los siguientes paquetes:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "Se cambiarán los siguientes paquetes retenidos:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (por %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1346,27 +1341,27 @@ msgstr ""
"AVISO: Se van a eliminar los siguientes paquetes esenciales.\n"
"¡NO debe hacerse a menos que sepa exactamente lo que está haciendo!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu actualizados, %lu se instalarán, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu desactualizados, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu para eliminar y %lu no actualizados.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu no instalados del todo o eliminados.\n"
@@ -1375,7 +1370,7 @@ msgstr "%lu no instalados del todo o eliminados.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr "[S/n]"
@@ -1383,21 +1378,21 @@ msgstr "[S/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr "[s/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "S"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error de compilación de expresiones regulares - %s"
@@ -1414,6 +1409,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1426,21 +1425,21 @@ msgstr[1] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Error interno, ¡se llamó a «InstallPackages» con paquetes rotos!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr ""
"Los paquetes necesitan eliminarse pero está deshabilitado la posibilidad de "
"eliminar."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "Error interno, no terminó la ordenación"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Qué raro... Los tamaños no concuerdan, mande un correo a apt@packages.debian."
@@ -1448,21 +1447,21 @@ msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Se necesita descargar %sB/%sB de archivos.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Necesito descargar %sB de archivos.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr ""
@@ -1470,31 +1469,31 @@ msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Se liberarán %sB después de esta operación.\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "No tiene suficiente espacio libre en %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "Hay problemas y se utilizó -y sin --force-yes"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Se especificó Trivial Only pero ésta no es una operación trivial."
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Sí, ¡haga lo que le digo!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1505,19 +1504,19 @@ msgstr ""
"Para continuar escriba la frase «%s»\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Abortado."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "¿Desea continuar?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "No se pudieron descargar algunos archivos"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1525,19 +1524,19 @@ msgstr ""
"No se pudieron obtener algunos archivos, ¿quizás deba ejecutar «apt-get "
"update» o deba intentarlo de nuevo con --fix-missing?"
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "Actualmente no están soportados --fix-missing e intercambio de medio"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "No se pudieron corregir los paquetes que faltan."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "Abortando la instalación."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1551,16 +1550,16 @@ msgstr[1] ""
"Los paquetes mostrados a continuación han desaparecido de su sistema\n"
"dado que todos sus ficheros han sido sobreescritos por otros paquetes:"
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr "Nota: Dpkg realiza esto de forma automática y a propósito."
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
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»"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1578,15 +1577,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "La siguiente información puede ayudar a resolver la situación:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Error interno, «AutoRemover» rompió cosas"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -1599,7 +1598,7 @@ msgstr[1] ""
"Los paquetes indicados a continuación se instalaron de forma automática y ya "
"no son necesarios."
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1608,7 +1607,7 @@ msgstr[0] "Se instaló de forma automática %lu paquete y ya no es necesario.\n"
msgstr[1] ""
"Se instalaron de forma automática %lu paquetes y ya no son necesarios.\n"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
#, fuzzy
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1627,7 +1626,7 @@ msgstr ""
"Dependencias incumplidas. Intente «apt-get -f install» sin paquetes (o "
"especifique una solución)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1639,61 +1638,61 @@ msgstr ""
"inestable, que algunos paquetes necesarios no han sido creados o han\n"
"sido movidos fuera de Incoming."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Paquetes rotos"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "Se instalarán los siguientes paquetes extras:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Paquetes sugeridos:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Paquetes recomendados:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Ignorando %s, ya está instalado y no está activada la actualización.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
"Ignorando %s, no está instalado y sólo se están solicitando "
"actualizaciones.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "No es posible reinstalar el paquete %s, no se puede descargar.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s ya está en su versión más reciente.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Versión seleccionada «%s» (%s) para «%s»\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Versión seleccionada «%s» (%s) para «%s»\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr "El paquete %s no está instalado, no se eliminará\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "El paquete %s no está instalado, no se eliminará\n"
@@ -2282,23 +2281,23 @@ msgstr "No se puede escribir en %s"
msgid "IO Error saving source cache"
msgstr "Error de E/S guardando caché fuente"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr ""
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr ""
@@ -2995,7 +2994,7 @@ msgstr "%limin. %liseg."
msgid "%lis"
msgstr "%liseg."
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "Selección %s no encontrada"
@@ -3660,7 +3659,7 @@ msgstr "No se pudo leer mientras se computaba MD5"
msgid "Problem unlinking %s"
msgstr "Se produjo un problema al desligar %s"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -3715,6 +3714,10 @@ msgstr ""
" -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::\n"
"cache=/tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Error Interno, AllUpgrade rompió cosas"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s no es un paquete DEB válido."
diff --git a/po/eu.po b/po/eu.po
index 79ab65633..f3a5f93f6 100644
--- 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2009-05-17 00:41+0200\n"
"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
"Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
@@ -162,7 +162,7 @@ msgstr " Bertsio taula:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -330,7 +330,7 @@ msgid "Couldn't find package %s"
msgstr "Ezin izan da %s paketea aurkitu"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s eskuz instalatua bezala ezarri.\n"
@@ -384,7 +384,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Ezin da %s(e)n duzun leku librea atzeman."
@@ -417,7 +417,7 @@ msgstr "Eskuratu %s iturburua\n"
msgid "Failed to fetch some archives."
msgstr "Huts egin du zenbat artxibo lortzean."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "Deskarga amaituta eta deskarga soileko moduan"
@@ -864,7 +864,7 @@ msgid "Could not connect data socket, connection timed out"
msgstr ""
"Ezin izan da datu-socketa konektatu; konexioak denbora muga gainditu du"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Huts egin du"
@@ -1114,12 +1114,7 @@ msgstr "Barne errorea"
msgid "Calculating upgrade... "
msgstr "Berriketak kalkulatzen... "
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Eginda"
@@ -1205,70 +1200,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "baina %s instalatuta dago"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "baina %s instalatzeko dago"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "baina ez da instalagarria"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "baina pakete birtuala da"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "baina ez dago instalatuta"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "baina ez da instalatuko"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " edo"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "Ondorengo pakete BERRIAK instalatuko dira:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "Ondorengo paketeak KENDUKO dira:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "Ondorengo paketeak mantendu egin dira:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "Ondorengo paketeak bertsio-berrituko dira:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "Ondorengo pakete atxikiak aldatu egingo dira:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (arrazoia: %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1276,27 +1271,27 @@ msgstr ""
"KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n"
"EZ ezazu horrelakorik egin, ez badakizu ondo zertan ari zaren!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu bertsio berritua(k), %lu berriki instalatuta, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu berrinstalatuta, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu aurreko bertsiora itzulita, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ez erabat instalatuta edo kenduta.\n"
@@ -1305,7 +1300,7 @@ msgstr "%lu ez erabat instalatuta edo kenduta.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr "[B/e]"
@@ -1313,21 +1308,21 @@ msgstr "[B/e]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr "[b/E]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "Adierazpen erregularren konpilazio errorea - %s"
@@ -1344,6 +1339,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1356,19 +1355,19 @@ msgstr[1] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Barne errorea, InstallPackages apurturiko paketeez deitu da!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "Paketeak ezabatu beharra dute baina Ezabatzea ezgaiturik dago."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "Barne errorea, ez da ordenatzeaz amaitu"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Hau bitxia... Tamainak ez dira berdina, idatzi apt@packages.debian.org-ra "
@@ -1376,52 +1375,52 @@ msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Artxiboetako %sB/%sB eskuratu behar dira.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Artxiboetako %sB eskuratu behar dira.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "Ekintza honen ondoren, %sB gehiago erabiliko dira diskoan.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Ekintza honen ondoren, %sB libratuko dira diskoan.\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Ez daukazu nahikoa leku libre %s(e)n."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "Arazoak daude, eta -y erabili da --force-yes gabe"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "'Trivial Only' zehaztu da, baina hau ez da eragiketa tribial bat."
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Bai, egin esandakoa!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1432,19 +1431,19 @@ msgstr ""
"Jarraitzeko, idatzi '%s' esaldia\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Abortatu."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Aurrera jarraitu nahi al duzu?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "Fitxategi batzuk ezin izan dira deskargatu"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1452,19 +1451,19 @@ msgstr ""
"Ezin izan dira artxibo batzuk lortu; beharbada apt-get update exekutatu, edo "
"--fix-missing aukerarekin saiatu?"
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing eta euskarri aldaketa ez dira onartzen oraingoz"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "Falta diren paketeak ezin dira zuzendu."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "Abortatu instalazioa."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1474,15 +1473,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr ""
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Suposatu ez dugun zerbait ezabatuko da, ezin da AutoRemover abiarazi"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1500,15 +1499,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "Informazio honek arazoa konpontzen lagun dezake:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Barne Errorea, AutoRemover-ek zerbait apurtu du"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
#, fuzzy
msgid ""
"The following package was automatically installed and is no longer required:"
@@ -1522,7 +1521,7 @@ msgstr[1] ""
"Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago "
"behar."
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, fuzzy, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1534,7 +1533,7 @@ msgstr[1] ""
"Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago "
"behar."
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
#, fuzzy
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1553,7 +1552,7 @@ msgstr ""
"Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo "
"zehaztu konponbide bat)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1565,59 +1564,59 @@ msgstr ""
"beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n"
"Sarrerakoetan (Incoming) egoten jarraituko dute."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Hautsitako paketeak"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "Ondorengo pakete gehigarriak instalatuko dira:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Iradokitako paketeak:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Gomendatutako paketeak:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, fuzzy, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "%s berriro instalatzea ez da posible; ezin da deskargatu.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s bertsiorik berriena da jada.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n"
@@ -2192,23 +2191,23 @@ msgstr "%s : ezin da idatzi"
msgid "IO Error saving source cache"
msgstr "S/I errorea iturburu katxea gordetzean"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr ""
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr ""
@@ -2858,7 +2857,7 @@ msgstr ""
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "%s hautapena ez da aurkitu"
@@ -3513,7 +3512,7 @@ msgstr "Huts egin du MD5 konputatzean"
msgid "Problem unlinking %s"
msgstr "Arazoa %s desestekatzean"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -3566,6 +3565,10 @@ msgstr ""
" -c=? Irakurri konfigurazio fitxategi hau\n"
" -o=? Ezarri konfigurazio aukera arbitrario bat. Adib: -o dir::cache=/tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s ez da baliozko DEB pakete bat."
diff --git a/po/fi.po b/po/fi.po
index 43853e5f1..40dd7653a 100644
--- 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+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"
@@ -160,7 +160,7 @@ msgstr " Versiotaulukko:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -327,7 +327,7 @@ msgid "Couldn't find package %s"
msgstr "Pakettia %s ei löytynyt"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
@@ -381,7 +381,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kansion %s vapaan tilan määrä ei selvinnyt"
@@ -414,7 +414,7 @@ msgstr "Nouda lähdekoodi %s\n"
msgid "Failed to fetch some archives."
msgstr "Joidenkin arkistojen noutaminen ei onnistunut."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "Nouto on valmis ja määrätty vain nouto"
@@ -855,7 +855,7 @@ msgstr "Pistoketta ei voitu luoda"
msgid "Could not connect data socket, connection timed out"
msgstr "Pistoketta ei voitu kytkeä, yhteys aikakatkaistiin"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Ei onnistunut"
@@ -1106,12 +1106,7 @@ msgstr "Sisäinen virhe"
msgid "Calculating upgrade... "
msgstr "Käsitellään päivitystä ... "
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Valmis"
@@ -1197,70 +1192,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "mutta %s on asennettu"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "mutta %s on merkitty asennettavaksi"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "mutta ei ole asennuskelpoinen"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "mutta on näennäispaketti"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "mutta ei ole asennettu"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "mutta ei ole merkitty asennettavaksi"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " tai"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "Seuraavat UUDET paketit asennetaan:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "Seuraavat paketit POISTETAAN:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "Nämä paketit on jätetty odottamaan:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "Nämä paketit päivitetään:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "Nämä paketit VARHENNETAAN:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "Seuraavat pysytetyt paketit muutetaan:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (syynä %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1268,27 +1263,27 @@ msgstr ""
"VAROITUS: Seuraavat välttämättömät paketit poistetaan.\n"
"Näin EI PITÄISI tehdä jos ei aivan tarkkaan tiedä mitä tekee!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu päivitetty, %lu uutta asennusta, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu uudelleen asennettua, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu varhennettua, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ei asennettu kokonaan tai poistettiin.\n"
@@ -1297,7 +1292,7 @@ msgstr "%lu ei asennettu kokonaan tai poistettiin.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr "[K/e]"
@@ -1305,21 +1300,21 @@ msgstr "[K/e]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "K"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "Käännösvirhe lausekkeessa - %s"
@@ -1336,6 +1331,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1348,72 +1347,72 @@ msgstr[1] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Sisäinen virhe, InstallPackages kutsuttiin rikkinäisille paketeille!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "Tapahtui sisäinen virhe, järjestäminen keskeytyi"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"No jo on... Koot eivät täsmää, sähköpostita email apt@packages.debian.org"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Noudettavaa arkistoa %st/%st.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Noudettavaa arkistoa %st.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "Toiminnon jälkeen käytetään %s t lisää levytilaa.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Toiminnon jälkeen vapautuu %s t levytilaa.\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --force-yes"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"On määritetty Trivial Only mutta tämä ei ole itsestäänselvä toimenpide."
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Kyllä, tee kuten käsketään!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1424,19 +1423,19 @@ msgstr ""
"Jatka kirjoittamalla \"%s\"\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Keskeytä."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Haluatko jatkaa?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "Joidenkin tiedostojen nouto ei onnistunut"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1444,19 +1443,19 @@ msgstr ""
"Joidenkin arkistojen nouto ei onnistunut, ehkä \"apt-get update\" auttaa tai "
"kokeile --fix-missing?"
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing ja taltion vaihto ei ole nyt tuettu"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "Puuttuvia paketteja ei voi korjata."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "Asennus keskeytetään."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1466,16 +1465,16 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr ""
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
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ää"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1493,15 +1492,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Sisäinen virhe, AutoRemover rikkoi jotain"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
#, fuzzy
msgid ""
"The following package was automatically installed and is no longer required:"
@@ -1515,7 +1514,7 @@ msgstr[1] ""
"Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
"vaadittuja:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, fuzzy, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1527,7 +1526,7 @@ msgstr[1] ""
"Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
"vaadittuja:"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
#, fuzzy
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1546,7 +1545,7 @@ msgstr ""
"Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" "
"ilmanpaketteja (tai ratkaise itse)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1557,59 +1556,59 @@ msgstr ""
"jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n"
"vielä luotu tai siirretty Incoming-kansiosta."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Rikkinäiset paketit"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Ehdotetut paketit:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Suositellut paketit:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, fuzzy, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Paketin %s uudelleenasennus ei ole mahdollista, sitä ei voi noutaa.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s on jo uusin versio.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Valittiin versio %s (%s) paketille %s\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Valittiin versio %s (%s) paketille %s\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n"
@@ -2188,23 +2187,23 @@ msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
msgid "IO Error saving source cache"
msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr ""
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr ""
@@ -2852,7 +2851,7 @@ msgstr ""
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "Valintaa %s ei löydy"
@@ -3505,7 +3504,7 @@ msgstr "Lukeminen ei onnistunut laskettaessa MD5:ttä"
msgid "Problem unlinking %s"
msgstr "Ilmeni pulmia poistettaessa tiedosto %s"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -3558,6 +3557,10 @@ msgstr ""
" -c=? Lue tämä asetustiedosto\n"
" -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s ei kelpaa DEB-paketiksi."
diff --git a/po/fr.po b/po/fr.po
index 5d448334f..5a00a4805 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2013-08-17 07:57+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -159,7 +159,7 @@ msgstr " Table de version :"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -342,7 +342,7 @@ msgid "Couldn't find package %s"
msgstr "Impossible de trouver le paquet %s"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s passé en « installé manuellement ».\n"
@@ -407,7 +407,7 @@ 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:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Impossible de déterminer l'espace disponible sur %s"
@@ -440,7 +440,7 @@ msgstr "Récupération des sources %s\n"
msgid "Failed to fetch some archives."
msgstr "Échec lors de la récupération de quelques archives."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "Téléchargement achevé et dans le mode téléchargement uniquement"
@@ -922,7 +922,7 @@ msgid "Could not connect data socket, connection timed out"
msgstr ""
"Impossible de se connecter sur le port de données, délai de connexion dépassé"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Échec"
@@ -1178,12 +1178,7 @@ msgstr "Erreur interne"
msgid "Calculating upgrade... "
msgstr "Calcul de la mise à jour... "
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Erreur interne, AllUpgrade a cassé le boulot !"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Fait"
@@ -1269,70 +1264,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Les paquets suivants contiennent des dépendances non satisfaites :"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "mais %s est installé"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "mais %s devra être installé"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "mais il n'est pas installable"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "mais c'est un paquet virtuel"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "mais il n'est pas installé"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "mais ne sera pas installé"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " ou"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "Les paquets suivants contiennent des dépendances non satisfaites :"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "Les NOUVEAUX paquets suivants seront installés :"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "Les paquets suivants seront ENLEVÉS :"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "Les paquets suivants ont été conservés :"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "Les paquets suivants seront mis à jour :"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "Les paquets suivants seront mis à une VERSION INFÉRIEURE :"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "Les paquets retenus suivants seront changés :"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (en raison de %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1341,27 +1336,27 @@ msgstr ""
"Vous NE devez PAS faire ceci, à moins de savoir exactement ce\n"
"que vous êtes en train de faire."
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu mis à jour, %lu nouvellement installés, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu réinstallés, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu remis à une version inférieure, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu à enlever et %lu non mis à jour.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu partiellement installés ou enlevés.\n"
@@ -1370,7 +1365,7 @@ msgstr "%lu partiellement installés ou enlevés.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr "[O/n]"
@@ -1378,21 +1373,21 @@ msgstr "[O/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr "[o/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "O"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erreur de compilation de l'expression rationnelle - %s"
@@ -1409,6 +1404,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1421,20 +1420,20 @@ msgstr[1] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés."
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr ""
"Les paquets doivent être enlevés mais la désinstallation est désactivée."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "Erreur interne. Le tri a été interrompu."
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Étrangement, les tailles ne correspondent pas. Veuillez le signaler par "
@@ -1442,21 +1441,21 @@ msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Il est nécessaire de prendre %so/%so dans les archives.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Il est nécessaire de prendre %so dans les archives.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr ""
@@ -1464,21 +1463,21 @@ msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
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"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Pas assez d'espace disponible sur %s"
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "Il y a des problèmes et -y a été employé sans --force-yes"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"L'option --trivial-only a été indiquée mais il ne s'agit pas d'une opération "
@@ -1488,11 +1487,11 @@ msgstr ""
# sentence is supposed to be typed by a user who cannot see the difference.
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Oui, faites ce que je vous dis !"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1503,19 +1502,19 @@ msgstr ""
"Pour continuer, tapez la phrase « %s »\n"
" ?]"
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Annulation."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Souhaitez-vous continuer ?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "Certains fichiers n'ont pu être téléchargés."
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1523,20 +1522,20 @@ msgstr ""
"Impossible de récupérer quelques archives, peut-être devrez-vous lancer apt-"
"get update ou essayer avec --fix-missing ?"
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
"l'option --fix-missing et l'échange de support ne sont pas encore reconnus."
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "Impossible de corriger le fait que les paquets manquent."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "Annulation de l'installation."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1550,18 +1549,18 @@ msgstr[1] ""
"Les paquets suivants ont disparu du système car tous leurs fichiers\n"
"ont été remplacés par d'autres paquets :"
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr ""
"Note : cette opération volontaire (effectuée par dpkg) est automatique."
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"Aucune suppression n'est censée se produire : impossible de lancer "
"« Autoremover »"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1580,16 +1579,16 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "L'information suivante devrait vous aider à résoudre la situation : "
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr ""
"Erreur interne, l'outil de suppression automatique a cassé quelque chose."
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -1601,7 +1600,7 @@ msgstr[1] ""
"Les paquets suivants ont été installés automatiquement et ne sont plus "
"nécessaires :"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1611,7 +1610,7 @@ msgstr[0] ""
msgstr[1] ""
"%lu paquets ont été installés automatiquement et ne sont plus nécessaires.\n"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] "Veuillez utiliser « apt-get autoremove » pour le supprimer."
@@ -1630,7 +1629,7 @@ msgstr ""
"Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n"
"(ou indiquez une solution)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1642,64 +1641,64 @@ msgstr ""
"la distribution unstable, que certains paquets n'ont pas encore\n"
"été créés ou ne sont pas sortis d'Incoming."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Paquets défectueux"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "Les paquets supplémentaires suivants seront installés : "
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Paquets suggérés :"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Paquets recommandés :"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Passe %s, il est déjà installé et la mise à jour n'est pas prévue.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
"%s ignoré : il n'est pas installé et seules des mises à jour ont été "
"demandées.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s est déjà la plus récente version disponible.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Version choisie « %s » (%s) pour « %s »\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Version choisie « %s » (%s) pour « %s » à cause de « %s »\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr ""
"Le paquet « %s » n'est pas installé, et ne peut donc être supprimé. Peut-"
"être vouliez-vous écrire « %s » ?\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Le paquet « %s » n'est pas installé, et ne peut donc être supprimé\n"
@@ -2296,23 +2295,23 @@ msgid "IO Error saving source cache"
msgstr ""
"Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr "Envoi du scénario au solveur"
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr "Envoi d'une requête au solveur"
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr "Préparation à la réception de la solution"
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr "Échec du solveur externe sans message d'erreur adapté"
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr "Exécu tion du solveur externe"
@@ -3025,7 +3024,7 @@ msgstr "%limin %lis"
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "La sélection %s n'a pu être trouvée"
@@ -3696,7 +3695,7 @@ msgstr "Impossible de lire lors du calcul de la somme MD5"
msgid "Problem unlinking %s"
msgstr "Problème en déliant %s"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -3752,6 +3751,10 @@ msgstr ""
" -o=? Place une option de configuration arbitraire, p. ex. -o dir::cache=/"
"tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Erreur interne, AllUpgrade a cassé le boulot !"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s n'est pas un paquet Debian valide."
diff --git a/po/gl.po b/po/gl.po
index 1c5e35ecb..d1e35cf83 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_gl\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2011-05-12 15:28+0100\n"
"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
"Language-Team: galician <proxecto@trasno.net>\n"
@@ -164,7 +164,7 @@ msgstr " Táboa de versións:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -333,7 +333,7 @@ msgid "Couldn't find package %s"
msgstr "Non foi posíbel atopar o paquete %s"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s cambiado a instalado manualmente.\n"
@@ -393,7 +393,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "Omítese o ficheiro xa descargado «%s»\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Non foi posíbel determinar o espazo libre en %s"
@@ -426,7 +426,7 @@ msgstr "Obter fonte %s\n"
msgid "Failed to fetch some archives."
msgstr "Non se puideron obter algúns arquivos."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "Completouse a descarga no modo de só descargas"
@@ -879,7 +879,7 @@ msgid "Could not connect data socket, connection timed out"
msgstr ""
"Non é posíbel conectar o socket de datos, o tempo esgotouse para a conexión"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Fallou"
@@ -1133,12 +1133,7 @@ msgstr "Produciuse un erro interno"
msgid "Calculating upgrade... "
msgstr "Calculando a anovación... "
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Produciuse un erro interno, AllUpgrade estragou cousas"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Feito"
@@ -1224,70 +1219,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Os seguintes paquetes teñen dependencias sen cumprir:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "mais %s está instalado"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "mais vaise instalar %s"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "mais non é instalábel"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "mais é un paquete virtual"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "mais non está instalado"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "mais non se vai a instalar"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " ou"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "Os seguintes paquetes teñen dependencias sen cumprir:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "Os seguintes paquetes NOVOS hanse instalar:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "Vanse RETIRAR os paquetes seguintes:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "Consérvanse os seguintes paquetes:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "Vanse anovar os paquetes seguintes:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "Vanse REVERTER os seguintes paquetes :"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "Vanse modificar os paquetes retidos seguintes:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (por mor de %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1295,27 +1290,27 @@ msgstr ""
"AVISO: Retiraranse os seguintes paquetes esenciais.\n"
"Isto NON se debe facer a menos que saiba exactamente o que está a facer!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu anovados, %lu instalados, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu revertidos, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "Vanse retirar %lu e deixar %lu sen anovar.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu non instalados ou retirados de todo.\n"
@@ -1324,7 +1319,7 @@ msgstr "%lu non instalados ou retirados de todo.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr "[S/n]"
@@ -1332,21 +1327,21 @@ msgstr "[S/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr "[s/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "S"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "Produciuse un erro na compilación da expresión regular - %s"
@@ -1363,6 +1358,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1375,21 +1374,21 @@ msgstr[1] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
"Produciuse un erro interno, chamouse a InstallPackages con paquetes "
"estragados."
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "Hai que retirar paquetes mais o retirado está desactivado."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "Produciuse un erro interno; non rematou a ordenación"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Que estraño... Os tamaños non coinciden; envíe un correo-e a apt@packages."
@@ -1397,52 +1396,52 @@ msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Ten que recibir %sB/%sB de arquivos.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Ten que recibir %sB de arquivos.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "Despois desta operación ocuparanse %sB de disco adicionais.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Despois desta operación liberaranse %sB de espazo de disco.\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Non hai espazo libre abondo en %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "Xurdiron problemas e empregouse -y sen --force-yes"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Especificouse «Só triviais» mais esta non é unha operación trivial."
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Si, fai o que digo!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1453,19 +1452,19 @@ msgstr ""
"Para continuar escriba a frase «%s»\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Interromper."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Quere continuar?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "Non foi posíbel descargar algúns ficheiros"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1473,20 +1472,20 @@ msgstr ""
"Non foi posíbel obter algúns arquivos; probe con apt-get update ou --fix-"
"missing."
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
"O emprego conxunto de --fix-missing e intercambio de discos non está admitido"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "Non é posíbel corrixir os paquetes non dispoñíbeis."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "Interrompendo a instalación."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1500,17 +1499,17 @@ msgstr[1] ""
"Os seguintes paquetes desapareceron do seu sistema e todos os \n"
"ficheiros serán sobrescritos por outros paquetes:"
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr "Nota: Isto será feito automaticamente por dpkg."
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"Non se agarda que eliminemos cousas, non se pode iniciar o Retirado "
"automático"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1528,15 +1527,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "A seguinte información pode axudar a solucionar a situación:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Produciuse un erro interno, o Retirado automático estragou cousas"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -1548,7 +1547,7 @@ msgstr[1] ""
"Os seguintes paquetes foron instalados automaticamente e xa non son "
"necesarios:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1557,7 +1556,7 @@ msgstr[0] "%lu paquete foi instalado automaticamente e xa non é necesario.\n"
msgstr[1] ""
"%lu paquetes foron instalados automaticamente e xa non son necesarios.\n"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
#, fuzzy
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1576,7 +1575,7 @@ msgstr ""
"Dependencias incumpridas. Probe «apt-get -f install» sen paquetes (ou "
"especifique unha solución)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1589,59 +1588,59 @@ msgstr ""
"algúns paquetes solicitados aínda non se creasen ou que se movesen da "
"entrada."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Paquetes estragados"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "Instalaranse os seguintes paquetes extra:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Paquetes suxeridos:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Paquetes recomendados:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Omítese %s, xa está instalado e non se especificou a anovación.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr "Omitindo %s, non está instalado e só se solicitaron as anovacións.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "A reinstalación de %s non é posíbel, non se pode descargar.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s xa é a versión máis recente.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Versión seleccionada «%s» (%s) para «%s»\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Versión seleccionada «%s» (%s) para «%s» xa que «%s»\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr "O paquete %s non está instalado, así que non foi retirado\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "O paquete %s non está instalado, así que non foi retirado\n"
@@ -2226,23 +2225,23 @@ msgstr "Non é posíbel escribir en %s"
msgid "IO Error saving source cache"
msgstr "Produciuse un erro de E/S ao gravar a caché de fontes"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr ""
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr ""
@@ -2936,7 +2935,7 @@ msgstr "%limin %lis"
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "Non se atopou a selección %s"
@@ -3601,7 +3600,7 @@ msgstr "Non foi posíbel ler ao calcular o MD5"
msgid "Problem unlinking %s"
msgstr "Xurdiu un problema ao desligar %s"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -3656,6 +3655,10 @@ msgstr ""
" -o=? Estabelece unha opción de configuración; por exemplo, -o dir::cache=/"
"tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Produciuse un erro interno, AllUpgrade estragou cousas"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s non é un paquete DEB válido."
diff --git a/po/hu.po b/po/hu.po
index b5ce3f95f..9ee5c545b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt trunk\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2012-06-25 17:09+0200\n"
"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
"Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
@@ -162,7 +162,7 @@ msgstr " Verziótáblázat:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -327,7 +327,7 @@ msgid "Couldn't find package %s"
msgstr "Az alábbi csomag nem található: %s"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s kézi telepítésűre állítva.\n"
@@ -390,7 +390,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "A már letöltött „%s” fájl kihagyása\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nem határozható meg a szabad hely mennyisége itt: %s"
@@ -423,7 +423,7 @@ msgstr "Forrás letöltése: %s\n"
msgid "Failed to fetch some archives."
msgstr "Nem sikerült néhány archívumot letölteni."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "A letöltés befejeződött a „csak letöltés” módban"
@@ -899,7 +899,7 @@ msgid "Could not connect data socket, connection timed out"
msgstr ""
"Nem lehet kapcsolódni az adatfoglalathoz, a kapcsolat túllépte az időkorlátot"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Sikertelen"
@@ -1148,12 +1148,7 @@ msgstr "Belső hiba"
msgid "Calculating upgrade... "
msgstr "Frissítés kiszámítása... "
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Belső hiba, az AllUpgrade megsértett valamit"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Kész"
@@ -1239,70 +1234,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "de %s van telepítve"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "de csak %s telepíthető"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "de az nem telepíthető"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "de az egy virtuális csomag"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "de az nincs telepítve"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "de az nincs telepítésre megjelölve"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " vagy"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "Az alábbi ÚJ csomagok lesznek telepítve:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "Az alábbi csomagok el lesznek TÁVOLÍTVA:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "Az alábbi csomagok vissza lesznek tartva:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "Az alábbi csomagok frissítve lesznek:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "Az alábbi csomagok VISSZAFEJLESZTÉSRE kerülnek:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "Az alábbi visszafogott csomagokat cserélem:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (%s miatt) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1310,27 +1305,27 @@ msgstr ""
"FIGYELMEZTETÉS: Az alábbi alapvető csomagok el lesznek távolítva.\n"
"NE tegye ezt, hacsak nem tudja pontosan, mit csinál!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu frissített, %lu újonnan telepített, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu újratelepítendő, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu visszafejlesztendő, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu eltávolítandó és %lu nem frissített.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu nincs teljesen telepítve/eltávolítva.\n"
@@ -1339,7 +1334,7 @@ msgstr "%lu nincs teljesen telepítve/eltávolítva.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr "[I/n]"
@@ -1347,21 +1342,21 @@ msgstr "[I/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr "[i/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "I"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex fordítási hiba - %s"
@@ -1378,6 +1373,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1390,70 +1389,70 @@ msgstr[1] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Belső hiba, az InstallPackages törött csomagokkal lett meghívva!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "Csomagokat kellene eltávolítani, de az eltávolítás nem engedélyezett."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "Belső hiba, a rendezés nem fejeződött be"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr "A méretek nem egyeznek, írjon az apt@packages.debian.org címre"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Letöltendő adatmennyiség: %sB/%sB.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Letöltendő adatmennyiség: %sB.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "A művelet után %sB lemezterület kerül felhasználásra.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "A művelet után %sB lemezterület szabadul fel.\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Nincs elég szabad hely itt: %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "Problémák vannak, és a -y kapcsolót használta --force-yes nélkül"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "A „Trivial Only” meg van adva, de ez nem egy triviális művelet."
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Igen, tedd amit mondok!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1464,19 +1463,19 @@ msgstr ""
"A folytatáshoz írja be ezt a mondatot: „%s”\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Megszakítva."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Folytatni akarja?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "Néhány fájlt nem sikerült letölteni"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1484,19 +1483,19 @@ msgstr ""
"Nem lehet letölteni néhány archívumot. Próbálja futtatni az „apt-get update” "
"parancsot, vagy használja a --fix-missing kapcsolót."
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "A --fix-missing és az adathordozó-csere jelenleg nem támogatott"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "Nem lehet javítani a hiányzó csomagokat."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "Telepítés megszakítása."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1510,15 +1509,15 @@ msgstr[1] ""
"A következő csomagok eltűntek a rendszerből, mivel\n"
"az összes fájlt más csomagok fölülírták:"
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr "Megjegyzés: ezt a dpkg automatikusan és szándékosan hajtja végre."
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Nem kellene semmit törölni, az AutoRemover nem indítható"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1536,15 +1535,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "Az alábbi információk segíthetnek megoldani a problémát:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Belső hiba, az AutoRemover sérült"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -1556,7 +1555,7 @@ msgstr[1] ""
"A következő csomagok automatikusan lettek telepítve, és már nincs rájuk "
"szükség:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1565,7 +1564,7 @@ msgstr[0] "%lu csomag automatikusan lett telepítve, és már nincs rá szüksé
msgstr[1] ""
"%lu csomag automatikusan lett telepítve, és már nincs rájuk szükség.\n"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] "Ezt az „apt-get autoremove” paranccsal törölheti."
@@ -1584,7 +1583,7 @@ msgstr ""
"Teljesítetlen függőségek. Próbálja kiadni az „apt-get -f install” parancsot "
"csomagok nélkül (vagy telepítse a függőségeket is!)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1596,60 +1595,60 @@ msgstr ""
"használja, akkor néhány igényelt csomag még nem készült el vagy ki\n"
"lett mozdítva az Incoming-ból."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Törött csomagok"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "Az alábbi extra csomagok kerülnek telepítésre:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Javasolt csomagok:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Ajánlott csomagok:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "%s kihagyása, ez már telepítve van, és a frissítés nincs beállítva.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr "„%s” kihagyása, nincs telepítve, és csak frissítések lettek kérve.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "%s újratelepítése nem lehetséges, mert nem lehet letölteni.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s már a legújabb verzió.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "„%s” (%s) verzió lett kijelölve ehhez: „%s”\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "„%s” (%s) verzió lett kijelölve ehhez: „%s”, a(z) „%s” miatt\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr ""
"A(z) „%s” csomag nincs telepítve, így nem lett törölve. Erre gondolt: „%s”?\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "A(z) „%s” csomag nincs telepítve, így nem lett törölve\n"
@@ -2231,23 +2230,23 @@ msgstr "Nem lehet írni ebbe: %s"
msgid "IO Error saving source cache"
msgstr "IO hiba a forrás-gyorsítótár mentésekor"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr "A helyzet elküldése a solvernek"
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr "Kérés küldése a solvernek"
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr "Felkészülés megoldás fogadására"
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr "A külső solver megfelelő hibaüzenet nélkül hibázott"
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr "Külső solver végrehajtása"
@@ -2935,7 +2934,7 @@ msgstr "%lip %limp"
msgid "%lis"
msgstr "%limp"
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "%s kiválasztás nem található"
@@ -3599,7 +3598,7 @@ msgstr "Olvasási hiba az MD5 kiszámításakor"
msgid "Problem unlinking %s"
msgstr "Hiba %s törlésekor"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -3653,6 +3652,10 @@ msgstr ""
" -c=? Ezt a konfigurációs fájlt olvassa be\n"
" -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Belső hiba, az AllUpgrade megsértett valamit"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s nem egy érvényes DEB csomag."
diff --git a/po/it.po b/po/it.po
index a476d3c6c..77a878eed 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2014-05-31 17:04+0100\n"
"Last-Translator: Milo Casagrande <milo@milo.name>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -162,7 +162,7 @@ msgstr " Tabella versione:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -335,7 +335,7 @@ msgid "Couldn't find package %s"
msgstr "Impossibile trovare il pacchetto %s"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "È stato impostato %s per l'installazione manuale.\n"
@@ -399,7 +399,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "Il pacchetto \"%s\" già scaricato viene saltato\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Impossibile determinare lo spazio libero in %s"
@@ -432,7 +432,7 @@ msgstr "Recupero sorgente %s\n"
msgid "Failed to fetch some archives."
msgstr "Recupero di alcuni archivi non riuscito."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "Scaricamento completato e in modalità solo scaricamento"
@@ -938,7 +938,7 @@ msgid "Could not connect data socket, connection timed out"
msgstr ""
"Impossibile connettersi al socket dati, tempo esaurito per la connessione"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Non riuscito"
@@ -1193,11 +1193,7 @@ msgstr "Errore interno"
msgid "Calculating upgrade... "
msgstr "Calcolo dell'aggiornamento... "
-#: apt-private/private-upgrade.cc:30
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Errore interno, Upgrade ha rovinato qualche cosa"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Eseguito"
@@ -1280,70 +1276,70 @@ msgstr "[aggiornabile da: %s]"
msgid "[residual-config]"
msgstr "[configurazione residua]"
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "ma la versione %s è installata"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "ma la versione %s sta per essere installata"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "ma non è installabile"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "ma è un pacchetto virtuale"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "ma non è installato"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "ma non sta per essere installato"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " oppure"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "I seguenti pacchetti NUOVI saranno installati:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "I seguenti pacchetti saranno RIMOSSI:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "I seguenti pacchetti saranno aggiornati:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "I seguenti pacchetti saranno RETROCESSI:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "I seguenti pacchetti bloccati saranno cambiati:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (a causa di %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1352,27 +1348,27 @@ msgstr ""
"Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa "
"si sta facendo."
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aggiornati, %lu installati, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstallati, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu retrocessi, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu da rimuovere e %lu non aggiornati.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu non completamente installati o rimossi.\n"
@@ -1381,7 +1377,7 @@ msgstr "%lu non completamente installati o rimossi.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr "[S/n]"
@@ -1389,21 +1385,21 @@ msgstr "[S/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr "[s/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "S"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "Errore di compilazione dell'espressione regolare - %s"
@@ -1420,6 +1416,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1432,64 +1432,64 @@ msgstr[1] "Ci sono %i record aggiuntivi: usare \"-a\" per visualizzarli"
msgid "not a real package (virtual)"
msgstr "non un vero pacchetto (virtuale)"
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
"Errore interno, InstallPackages è stato chiamato con un pacchetto "
"danneggiato."
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr ""
"I pacchetti devono essere rimossi, ma l'azione di rimozione è disabilitata."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "Errore interno, l'ordinamento non è stato terminato"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Le dimensioni non corrispondono. Inviare un'email a: apt@packages.debian.org"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "È necessario scaricare %sB/%sB di archivi.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "È necessario scaricare %sB di archivi.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "Dopo quest'operazione, verranno occupati %sB di spazio su disco.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Dopo quest'operazione, verranno liberati %sB di spazio su disco.\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Spazio libero in %s insufficiente."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "Si sono verificati dei problemi ed è stata usata -y senza --force-yes"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"È stata specificata la modalità \"Trivial Only\", ma questa non è "
@@ -1497,11 +1497,11 @@ msgstr ""
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Sì, esegui come da richiesta."
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1512,19 +1512,19 @@ msgstr ""
"Per continuare scrivere la frase \"%s\"\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Interrotto."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Continuare?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "Scaricamento di alcuni file non riuscito"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1532,19 +1532,19 @@ msgstr ""
"Impossibile scaricare alcuni pacchetti. Potrebbe essere utile eseguire \"apt-"
"get update\" o provare l'opzione \"--fix-missing\"."
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing su supporti estraibili non è ancora supportato"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "Impossibile correggere i pacchetti mancanti."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "Interruzione dell'installazione."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1558,16 +1558,16 @@ msgstr[1] ""
"I seguenti pacchetti sono spariti dal sistema poiché\n"
"tutti i file sono stati sovrascritti da altri pacchetti:"
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr "Nota: questo viene svolto automaticamente e volutamente da dpkg."
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"Non si è autorizzati a rimuovere nulla, impossibile avviare AutoRemover"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1585,15 +1585,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Errore interno, AutoRemover ha rovinato qualche cosa"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -1606,7 +1606,7 @@ msgstr[1] ""
"I seguenti pacchetti sono stati installati automaticamente e non sono più "
"richiesti:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1617,7 +1617,7 @@ msgstr[1] ""
"%lu pacchetti sono stati installati automaticamente e non sono più "
"richiesti.\n"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] "Usare \"apt-get autoremove\" per rimuoverlo."
@@ -1636,7 +1636,7 @@ msgstr ""
"Dipendenze non soddisfatte. Provare \"apt-get -f install\" senza pacchetti "
"(o specificare una soluzione)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1648,64 +1648,64 @@ msgstr ""
"usando una distribuzione in sviluppo, che alcuni pacchetti richiesti\n"
"non sono ancora stati creati o sono stati rimossi da Incoming."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Pacchetti danneggiati"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "I seguenti pacchetti saranno inoltre installati:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Pacchetti suggeriti:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Pacchetti raccomandati:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Viene saltato %s poiché è già installato e l'aggiornamento non è impostato.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
"Viene saltato %s poiché non è installato e sono richiesti solo gli "
"aggiornamenti.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "La reinstallazione di %s non è possibile, non può essere scaricato.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s è già alla versione più recente.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Versione \"%s\" (%s) selezionata per \"%s\"\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Versione \"%s\" (%s) selezionata per \"%s\" per via di \"%s\"\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr ""
"Il pacchetto \"%s\" non è installato e quindi non è stato rimosso: si "
"intendeva \"%s\"?\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Il pacchetto \"%s\" non è installato e quindi non è stato rimosso\n"
@@ -2297,23 +2297,23 @@ msgstr "Impossibile scrivere in %s"
msgid "IO Error saving source cache"
msgstr "Errore di I/O nel salvare la cache sorgente"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr "Invia lo scenario al solver"
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr "Invia la richiesta al solver"
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr "Preparazione alla ricezione della soluzione"
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr "Il solver esterno è terminato senza un errore di messaggio"
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr "Esecuzione solver esterno"
@@ -3024,7 +3024,7 @@ msgstr "%limin %lis"
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "Selezione %s non trovata"
@@ -3695,7 +3695,7 @@ msgstr "Lettura durante l'elaborazione MD5 non riuscita"
msgid "Problem unlinking %s"
msgstr "Problema nell'unlink di %s"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -3747,6 +3747,9 @@ msgstr ""
" -c=? Legge come configurazione il file specificato\n"
" -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tmp\n"
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Errore interno, Upgrade ha rovinato qualche cosa"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s non è un pacchetto DEB valido."
diff --git a/po/ja.po b/po/ja.po
index f3b1866d2..c1f7a9ae9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.16.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2014-03-21 19:53+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -159,7 +159,7 @@ msgstr " バージョンテーブル:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -330,7 +330,7 @@ msgid "Couldn't find package %s"
msgstr "パッケージ %s が見つかりません"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s は手動でインストールしたと設定されました。\n"
@@ -394,7 +394,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "すでにダウンロードされたファイル '%s' をスキップします\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s の空き領域を測定できません"
@@ -427,7 +427,7 @@ msgstr "ソース %s を取得\n"
msgid "Failed to fetch some archives."
msgstr "いくつかのアーカイブの取得に失敗しました。"
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました"
@@ -932,7 +932,7 @@ msgstr "ソケットを作成できません"
msgid "Could not connect data socket, connection timed out"
msgstr "データソケットへ接続できませんでした。接続がタイムアウトしました"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "失敗"
@@ -1182,11 +1182,7 @@ msgstr "内部エラー"
msgid "Calculating upgrade... "
msgstr "アップグレードパッケージを検出しています ... "
-#: apt-private/private-upgrade.cc:30
-msgid "Internal error, Upgrade broke stuff"
-msgstr "内部エラー、アップグレードで何か壊れました"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "完了"
@@ -1271,70 +1267,70 @@ msgstr "[%s からアップグレード可]"
msgid "[residual-config]"
msgstr "[設定未完了]"
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "以下のパッケージには満たせない依存関係があります:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "しかし、%s はインストールされています"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "しかし、%s はインストールされようとしています"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "しかし、インストールすることができません"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "しかし、これは仮想パッケージです"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "しかし、インストールされていません"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "しかし、インストールされようとしていません"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " または"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "以下のパッケージには満たせない依存関係があります:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "以下のパッケージが新たにインストールされます:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "以下のパッケージは「削除」されます:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "以下のパッケージは保留されます:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "以下のパッケージはアップグレードされます:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "以下のパッケージは「ダウングレード」されます:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "以下の変更禁止パッケージは変更されます:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (%s のため) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1342,27 +1338,27 @@ msgstr ""
"警告: 以下の不可欠パッケージが削除されます。\n"
"何をしようとしているか本当にわかっていない場合は、実行してはいけません!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "アップグレード: %lu 個、新規インストール: %lu 個、"
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "再インストール: %lu 個、"
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "ダウングレード: %lu 個、"
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "削除: %lu 個、保留: %lu 個。\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n"
@@ -1371,7 +1367,7 @@ msgstr "%lu 個のパッケージが完全にインストールまたは削除
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr "[Y/n]"
@@ -1379,21 +1375,21 @@ msgstr "[Y/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr "[y/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "Y"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "正規表現の展開エラー - %s"
@@ -1409,6 +1405,10 @@ msgid_plural ""
"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
msgstr[0] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1421,71 +1421,71 @@ msgstr[0] ""
msgid "not a real package (virtual)"
msgstr "実際のパッケージではありません (仮想)"
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "内部エラー、InstallPackages が壊れたパッケージで呼び出されました!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "パッケージを削除しなければなりませんが、削除が無効になっています。"
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "内部エラー、調整が終わっていません"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"おっと、サイズがマッチしません。apt@packages.debian.org にメールしてください"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "%2$sB 中 %1$sB のアーカイブを取得する必要があります。\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "%sB のアーカイブを取得する必要があります。\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "この操作後に追加で %sB のディスク容量が消費されます。\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "この操作後に %sB のディスク容量が解放されます。\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "%s に充分な空きスペースがありません。"
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "問題が発生し、-y オプションが --force-yes なしで使用されました"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Trivial Only が指定されましたが、これは簡単な操作ではありません。"
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Yes, do as I say!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1496,19 +1496,19 @@ msgstr ""
"続行するには、'%s' というフレーズをタイプしてください。\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "中断しました。"
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "続行しますか?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "いくつかのファイルの取得に失敗しました"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1516,19 +1516,19 @@ msgstr ""
"いくつかのアーカイブを取得できません。apt-get update を実行するか --fix-"
"missing オプションを付けて試してみてください。"
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing とメディア交換は現在同時にはサポートされていません"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "足りないパッケージを直すことができません。"
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "インストールを中断します。"
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1539,16 +1539,16 @@ msgstr[0] ""
"以下のパッケージは、全ファイルが別のパッケージで上書きされたため、\n"
"システムから消えました:"
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr "注意: これは dpkg により自動でわざと行われれます。"
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"一連のものを削除するようになっていないので、AutoRemover を開始できません"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1566,15 +1566,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "以下の情報がこの問題を解決するために役立つかもしれません:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "内部エラー、AutoRemover が何かを破壊しました"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -1583,7 +1583,7 @@ msgid_plural ""
msgstr[0] ""
"以下のパッケージが自動でインストールされましたが、もう必要とされていません:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1592,7 +1592,7 @@ msgstr[0] ""
"%lu つのパッケージが自動でインストールされましたが、もう必要とされていませ"
"ん:\n"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] "これを削除するには 'apt-get autoremove' を利用してください。"
@@ -1611,7 +1611,7 @@ msgstr ""
"未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法"
"を明示してください)。"
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1623,59 +1623,59 @@ msgstr ""
"であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n"
"動されていないことが考えられます。"
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "壊れたパッケージ"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "以下の特別パッケージがインストールされます:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "提案パッケージ:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "推奨パッケージ:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, fuzzy, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, fuzzy, c-format
msgid "%s is already the newest version.\n"
msgstr "%s はすでに保留に設定されています。\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr ""
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr ""
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr ""
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n"
@@ -2258,23 +2258,23 @@ msgstr "%s に書き込めません"
msgid "IO Error saving source cache"
msgstr "ソースキャッシュの保存中に IO エラーが発生しました"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr "ソルバにシナリオを送信"
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr "ソルバにリクエストを送信"
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr "解決を受け取る準備"
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr "外部ソルバが適切なエラーメッセージなしに失敗しました"
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr "外部ソルバを実行"
@@ -2962,7 +2962,7 @@ msgstr "%li分 %li秒"
msgid "%lis"
msgstr "%li秒"
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "選択された %s が見つかりません"
@@ -3619,7 +3619,7 @@ msgstr "MD5 の計算中に読み込みに失敗しました"
msgid "Problem unlinking %s"
msgstr "%s のリンク解除で問題が発生しました"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -3670,3 +3670,6 @@ msgstr ""
" -s ソースファイルソートを使用する\n"
" -c=? 指定した設定ファイルを読み込む\n"
" -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
+
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "内部エラー、アップグレードで何か壊れました"
diff --git a/po/km.po b/po/km.po
index 90a4b0740..d55f32ef8 100644
--- 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+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"
@@ -164,7 +164,7 @@ msgstr " តារាង​កំណែ ៖"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -332,7 +332,7 @@ msgid "Couldn't find package %s"
msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
@@ -386,7 +386,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "កំពុង​រំលង​ឯកសារ​ដែល​បាន​ទាញយក​រួច​ '%s'\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "មិន​អាច​កំណត់​ទំហំ​ទំនេរ​ក្នុង​ %s បានឡើយ"
@@ -419,7 +419,7 @@ msgstr "ទៅប្រមូល​ប្រភព​ %s\n"
msgid "Failed to fetch some archives."
msgstr "បរាជ័យ​ក្នុងការទៅប្រមូលយក​ប័ណ្ណសារ​មួយចំនួន ។"
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "បានបញ្ចប់ការទាញ​យក​ ហើយ​តែ​ក្នុង​របៀប​​ទាញ​យក​ប៉ុណ្ណោះ"
@@ -852,7 +852,7 @@ msgstr "មិន​អាច​បង្កើត​រន្ធបានឡើ
msgid "Could not connect data socket, connection timed out"
msgstr "មិន​អាច​តភ្ជាប់​​រន្ធទិន្នន័យ​បានឡើយ អស់​ពេល​ក្នុងការតភ្ជាប់​"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "បាន​បរាជ័យ"
@@ -1099,12 +1099,7 @@ msgstr "កំហុស​ខាង​ក្នុង​"
msgid "Calculating upgrade... "
msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... "
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "កំហុស​ខាងក្នុង ការធ្វើឲ្យប្រសើរ​ទាំងអស់បានធ្វើឲ្យ​ឧបករណ៍​ខូច"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "ធ្វើរួច​"
@@ -1190,70 +1185,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "កញ្ចប់​ខាងក្រោម​មាន​ភាពអាស្រ័យ​ដែល​ខុស​គ្នា ៖"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "ប៉ុន្តែ​ %s ត្រូវ​បាន​ដំឡើង​"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "ប៉ុន្តែ​​វា​មិន​អាច​ដំឡើង​បាន​ទេ​"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "ប៉ុន្តែ​​វា​ជា​កញ្ចប់​និម្មិត​"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "ប៉ុន្តែ​វា​មិន​បាន​ដំឡើង​ទេ​"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "ប៉ុន្តែ វា​នឹង​មិន​ត្រូវ​បាន​ដំឡើង​ទេ"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " ឬ"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "កញ្ចប់​ខាងក្រោម​មាន​ភាពអាស្រ័យ​ដែល​ខុស​គ្នា ៖"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "កញ្ចប់​ខាងក្រោម​នឹងត្រូវ​បាន​យកចេញ ៖"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "​កញ្ចប់​ខាង​ក្រោម​ត្រូវ​បាន​យក​ត្រឡប់​មក​វិញ ៖"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​​ធ្វើ​ឲ្យប្រសើ​ឡើង ៖"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​បន្ទាប ៖"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "កញ្ចប់​រង់ចាំ​ខាងក្រោម​នឹង​ត្រូវ​​បានផ្លាស់​​ប្តូរ​ ៖"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (ដោយ​សារតែ​ %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1261,27 +1256,27 @@ msgstr ""
"ព្រមាន​ ៖ កញ្ចប់ដែល​ចាំបាច់​ខាងក្រោម​នឹង​ត្រូវ​បាន​យកចេញ ។\n"
"ការយកចេញ​នេះ​មិន​ត្រូវ​បានធ្វើ​ទេ​លុះត្រា​តែ​អ្នកដឹង​ថា​​អ្នក​កំពុង​ធ្វើ​អ្វីឲ្យប្រាកដ !"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu ត្រូវ​បាន​ធ្វើ​ឲ្យ​ប្រសើរ %lu ត្រូវ​បានដំឡើង​ថ្មី "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu ត្រូវ​បាន​ដំឡើង​ឡើង​វិញ "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu ​ត្រូវបានបន្ទាប់ "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu ដែលត្រូវ​យក​ចេញ​ ហើយ​ %lu មិន​​បាន​ធ្វើ​ឲ្យ​ប្រសើរឡើយ ។\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចេញបានគ្រប់ជ្រុងជ្រោយ​ឡើយ​ ។\n"
@@ -1290,7 +1285,7 @@ msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចេញប
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr ""
@@ -1298,21 +1293,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "Y"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex កំហុស​ការចងក្រង​ - %s"
@@ -1329,6 +1324,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1341,70 +1340,70 @@ msgstr[1] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "កំហុស​ខាងក្នុង កញ្ចប់​ដំឡើង​ត្រូវ​បាន​ហៅ​​ជាមួយ​កញ្ចប់​ដែល​ខូច !"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "កញ្ចប់ ​ត្រូវការឲ្យ​យក​ចេញ​​ ប៉ុន្តែមិនអនុញ្ញាត​ឲ្យយកចេញឡើយ ។"
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "កំហុស​ខាងក្នុង​ ការ​រៀប​តាម​លំដាប់​មិន​បាន​បញ្ចប់ឡើយ"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr "យី អី​ក៏​ចម្លែង​ម្លេះ.. ទំហំ​មិន​ដូច​គ្នា​ឡើយ ។ សូម​ផ្ញើ​អ៊ីមែល​ទៅ apt@packages.debian.org"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "ត្រូវការ​​យក​ %sB/%sB នៃ​ប័ណ្ណសារ ។​\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "ត្រូវ​ការយក​ %sB នៃ​ប័ណ្ណសារ ។\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, fuzzy, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "បន្ទាប់​ពី​ពន្លា​ %sB នៃ​ការ​បន្ថែម​​ទំហំ​ថាស​ត្រូវ​បាន​ប្រើ ។\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, fuzzy, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "បន្ទាប់​ពី​ពន្លា​ %sB ទំហំ​ថាសនឹង​​ទំនេរ ។ \n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "អ្នក​គ្មាន​ទំហំ​​ទំនេរ​គ្រប់គ្រាន់​ក្នុង​​ %s ឡើយ ។"
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "មាន​បញ្ហា​ ហើយ -y ត្រូវ​បាន​ប្រើ​ដោយគ្មាន​​ --force​-yes"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "បានបញ្ជាក់​តែប្រតិបត្តិការដែលមិនសំខាន់ប៉ុណ្ណោះ ប៉ុន្តែ​នេះមិនមែនជាប្រតិបត្តិការមិនសំខាន់នោះទេ ។"
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "បាទ/ចាស ធ្វើ​ដូច​ដែល​ខ្ញុំ​និយាយ !"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1415,20 +1414,20 @@ msgstr ""
"ដើម្បី​បន្ត ​​វាយ​ក្នុង​ឃ្លា​ '%s'\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "បោះបង់ ។"
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
#, fuzzy
msgid "Do you want to continue?"
msgstr "តើ​អ្នក​ចង់​បន្តឬ​ [បាទ ចាស/ទេ​] ? "
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "ឯកសារ​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​ទាញ​យក​"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1436,19 +1435,19 @@ msgstr ""
"អនុញ្ញាត​ឲ្យ​ទៅ​ប្រមូល​យក​ប័ណ្ណសារ​មួយ​ចំនួន​ ប្រហែល​ជា​រត់​ភាព​ទាន់​សម័យ apt-get ឬ ព្យាយាមប្រើ​ជាមួយ --"
"fix- ដែលបាត់ឬ់ ?"
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix- ដែលបាត់​ និង ​ស្វប​មេឌៀ​ដែល​មិនបាន​​គាំទ្រនៅពេល​បច្ចុប្បន្ន​"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "មិន​អាច​កែ​កញ្ចប់​ដែលបាត់បង់​បានឡើយ ។"
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។"
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1458,15 +1457,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr ""
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1482,16 +1481,16 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "ព័ត៌មាន​ដូចតទៅនេះ អាចជួយ​ដោះស្រាយ​ស្ថានភាព​បាន ៖"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
#, fuzzy
msgid ""
"The following package was automatically installed and is no longer required:"
@@ -1501,7 +1500,7 @@ msgid_plural ""
msgstr[0] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
msgstr[1] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, fuzzy, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1509,7 +1508,7 @@ msgid_plural ""
msgstr[0] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
msgstr[1] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] ""
@@ -1526,7 +1525,7 @@ msgid ""
msgstr ""
"ភាពអស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ 'apt-get -f install' ដោយ​គ្មាន​កញ្ចប់ (ឬ បញ្ជាក់​ដំណោះស្រាយ) ។"
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1538,59 +1537,59 @@ msgstr ""
"ដែលបាន​ទាមទារនឹងមិនទាន់បានបង្កើត​ឡើយ​\n"
" ឬ ​បានយក​ចេញ​ពីការមកដល់ ។"
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "កញ្ចប់​ដែល​បាន​ខូច​"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "កញ្ចប់​បន្ថែម​ដូចតទៅនេះ នឹងត្រូវបាន​ដំឡើង ៖"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​យោបល់ ៖"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​អនុសាសន៍ ៖"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "កំពុង​រំលង​ %s វា​បាន​ដំឡើង​រួចរាល់​ ហើយ​ភាព​ធ្វើឲ្យ​ប្រសើរ​​មិន​ទាន់​កំណត់​​ ។\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, fuzzy, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr "កំពុង​រំលង​ %s វា​បាន​ដំឡើង​រួចរាល់​ ហើយ​ភាព​ធ្វើឲ្យ​ប្រសើរ​​មិន​ទាន់​កំណត់​​ ។\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "មិនអាចធ្វើការដំឡើង %s ឡើងវិញបានទេ វា​មិនអាចត្រូវបាន​ទាញយកបានឡើយ ។\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s ទេ​ ដូច្នេះ មិន​បាន​យកចេញឡើយ \n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s ទេ​ ដូច្នេះ មិន​បាន​យកចេញឡើយ \n"
@@ -2164,23 +2163,23 @@ msgstr "មិន​អាច​សរសេរ​ទៅ %s"
msgid "IO Error saving source cache"
msgstr "IO កំហុសក្នុងការររក្សាទុក​ឃ្លាំង​សម្ងាត់​ប្រភព​"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr ""
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr ""
@@ -2826,7 +2825,7 @@ msgstr ""
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "ជម្រើស​ %s រក​មិន​ឃើញ​ឡើយ"
@@ -3478,7 +3477,7 @@ msgstr "បាន​បរាជ័យ​ក្នុង​ការអាន​
msgid "Problem unlinking %s"
msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ %s"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -3531,6 +3530,10 @@ msgstr ""
" -c=? អាន​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធនេះ​\n"
" -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. -o dir::cache=/tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "កំហុស​ខាងក្នុង ការធ្វើឲ្យប្រសើរ​ទាំងអស់បានធ្វើឲ្យ​ឧបករណ៍​ខូច"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s មិនមែន​ជា​កញ្ចប់​ DEB ត្រឹមត្រូវ​ទេ​ ។"
diff --git a/po/ko.po b/po/ko.po
index 5b6ee0c84..e82008eea 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2010-08-30 02:31+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -155,7 +155,7 @@ msgstr " 버전 테이블:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -323,7 +323,7 @@ msgid "Couldn't find package %s"
msgstr "%s 패키지를 찾을 수 없습니다"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s 패키지 수동설치로 지정합니다.\n"
@@ -382,7 +382,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다"
@@ -415,7 +415,7 @@ msgstr "%s 소스를 가져옵니다\n"
msgid "Failed to fetch some archives."
msgstr "일부 아카이브를 가져오는데 실패했습니다."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "다운로드를 마쳤고 다운로드 전용 모드입니다"
@@ -860,7 +860,7 @@ msgstr "소켓을 만들 수 없습니다"
msgid "Could not connect data socket, connection timed out"
msgstr "데이터 소켓을 연결할 수 없습니다. 연결 시간이 초과되었습니다"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "실패"
@@ -1107,12 +1107,7 @@ msgstr "내부 오류"
msgid "Calculating upgrade... "
msgstr "업그레이드를 계산하는 중입니다... "
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "내부 오류, AllUpgrade 프로그램이 무언가를 망가뜨렸습니다"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "완료"
@@ -1198,70 +1193,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "다음 패키지의 의존성이 맞지 않습니다:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "하지만 %s 패키지를 설치했습니다"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "하지만 %s 패키지를 설치할 것입니다"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "하지만 설치할 수 없습니다"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "하지만 가상 패키지입니다"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "하지만 설치하지 않았습니다"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "하지만 %s 패키지를 설치하지 않을 것입니다"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " 혹은"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "다음 패키지의 의존성이 맞지 않습니다:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "다음 새 패키지를 설치할 것입니다:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "다음 패키지를 지울 것입니다:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "다음 패키지를 과거 버전으로 유지합니다:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "다음 패키지를 업그레이드할 것입니다:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "다음 패키지를 다운그레이드할 것입니다:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "고정되었던 다음 패키지를 바꿀 것입니다:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (%s때문에) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1269,27 +1264,27 @@ msgstr ""
"경고: 꼭 필요한 다음 패키지를 지우게 됩니다.\n"
"무슨 일을 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu개 업그레이드, %lu개 새로 설치, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu개 다시 설치, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu개 업그레이드, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu개 제거 및 %lu개 업그레이드 안 함.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n"
@@ -1298,7 +1293,7 @@ msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr "[Y/n]"
@@ -1306,21 +1301,21 @@ msgstr "[Y/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr "[y/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "Y"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "정규식 컴파일 오류 - %s"
@@ -1336,6 +1331,10 @@ msgid_plural ""
"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
msgstr[0] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1347,19 +1346,19 @@ msgstr[0] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "내부 오류. 망가진 패키지에서 InstallPackages를 호출했습니다!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "패키지를 제거해야 하지만 제거가 금지되어 있습니다."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "내부 오류. 순서변경작업이 끝나지 않았습니다"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"이상하게도 크기가 서로 다릅니다. apt@packages.debian.org로 이메일을 보내주십"
@@ -1367,42 +1366,42 @@ msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "%s바이트/%s바이트 아카이브를 받아야 합니다.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "%s바이트 아카이브를 받아야 합니다.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "이 작업 후 %s바이트의 디스크 공간을 더 사용하게 됩니다.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "이 작업 후 %s바이트의 디스크 공간이 비워집니다.\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "%s 안에 충분한 여유 공간이 없습니다."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "문제가 발생했고 -y 옵션이 --force-yes 옵션 없이 사용되었습니다"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"사소한 작업만 가능하도록(Trivial Only) 지정되었지만 이 작업은 사소한 작업이 "
@@ -1411,11 +1410,11 @@ msgstr ""
# 입력을 받아야 한다. 한글 입력을 못 할 수 있으므로 원문 그대로 사용.
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Yes, do as I say!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1426,19 +1425,19 @@ msgstr ""
"계속하시려면 다음 문구를 입력하십시오: '%s'\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "중단."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "계속 하시겠습니까?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "일부 파일을 받는데 실패했습니다"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1446,19 +1445,19 @@ msgstr ""
"아카이브를 받을 수 없습니다. 아마도 apt-get update를 실행해야 하거나 --fix-"
"missing 옵션을 줘서 실행해야 할 것입니다."
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing 옵션과 동시에 미디어 바꾸기는 현재 지원하지 않습니다"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "빠진 패키지를 바로잡을 수 없습니다."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "설치를 중단합니다."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1469,15 +1468,15 @@ msgstr[0] ""
"다음 패키지는 패키지의 파일을 모두 다른 패키지가\n"
"덮어썼기 때문에 사라졌습니다:"
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr "주의: dpkg에서 자동으로 의도적으로 수행했습니다."
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "삭제를 할 수 없으므로 AutoRemover를 실행하지 못합니다"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1495,15 +1494,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "이 상황을 해결하는데 다음 정보가 도움이 될 수도 있습니다:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -1511,14 +1510,14 @@ msgid_plural ""
"required:"
msgstr[0] "다음 패키지가 자동으로 설치되었지만 더 이상 필요하지 않습니다:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
"%lu packages were automatically installed and are no longer required.\n"
msgstr[0] "패키지 %lu개가 자동으로 설치되었지만 더 이상 필요하지 않습니다.\n"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
#, fuzzy
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1537,7 +1536,7 @@ msgstr ""
"의존성이 맞지 않습니다. 패키지 없이 'apt-get -f install'을 시도해 보십시오 "
"(아니면 해결 방법을 지정하십시오)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1548,60 +1547,60 @@ msgstr ""
"불안정 배포판을 사용해서 일부 필요한 패키지를 아직 만들지 않았거나,\n"
"아직 Incoming에서 나오지 않은 경우일 수도 있습니다."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "망가진 패키지"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "다음 패키지를 더 설치할 것입니다:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "제안하는 패키지:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "추천하는 패키지:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"%s 패키지를 건너 뜁니다. 이미 설치되어 있고 업그레이드를 하지 않습니다.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr "%s 패키지를 건너 뜁니다. 설치되지 않았고 업그레이드만 요청합니다.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "%s 패키지를 다시 설치하는 건 불가능합니다. 다운로드할 수 없습니다.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s 패키지는 이미 최신 버전입니다.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "'%3$s' 패키지의 '%1$s' (%2$s) 버전을 선택합니다\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "'%3$s' 패키지의 '%1$s' (%2$s) 버전을 선택합니다\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n"
@@ -2177,23 +2176,23 @@ msgstr "%s에 쓸 수 없습니다"
msgid "IO Error saving source cache"
msgstr "소스 캐시를 저장하는데 입출력 오류가 발생했습니다"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr ""
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr ""
@@ -2857,7 +2856,7 @@ msgstr "%li분 %li초"
msgid "%lis"
msgstr "%li초"
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "선택한 %s이(가) 없습니다"
@@ -3510,7 +3509,7 @@ msgstr "MD5를 계산하는 동안 읽는데 실패했습니다"
msgid "Problem unlinking %s"
msgstr "%s의 링크를 해제하는데 문제가 있습니다"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -3564,6 +3563,10 @@ msgstr ""
" -c=? 이 설정 파일을 읽습니다\n"
" -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "내부 오류, AllUpgrade 프로그램이 무언가를 망가뜨렸습니다"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s은(는) 올바른 DEB 패키지가 아닙니다."
diff --git a/po/ku.po b/po/ku.po
index 66665ad04..ff0d70395 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-ku\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+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"
@@ -163,7 +163,7 @@ msgstr " Tabloya guhertoyan:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -295,7 +295,7 @@ msgid "Couldn't find package %s"
msgstr "Nikarî pakêta %s bibîne"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "lê %s dê were sazkirin"
@@ -349,7 +349,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr ""
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nikarî cihê vala li %s tesbît bike"
@@ -382,7 +382,7 @@ msgstr "Çavkanîna %s bîne\n"
msgid "Failed to fetch some archives."
msgstr "Anîna çend arşîvan biserneket."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr ""
@@ -771,7 +771,7 @@ msgstr ""
msgid "Could not connect data socket, connection timed out"
msgstr ""
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Serneket"
@@ -1020,11 +1020,7 @@ msgstr "Çewtiya hundirîn"
msgid "Calculating upgrade... "
msgstr "Bilindkirin tê hesibandin..."
-#: apt-private/private-upgrade.cc:30
-msgid "Internal error, Upgrade broke stuff"
-msgstr ""
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Temam"
@@ -1110,96 +1106,96 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr ""
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "lê %s sazkirî ye"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "lê %s dê were sazkirin"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "lê sazkirina wê ne gengaz e"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "lê paketeke farazî ye"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "lê ne sazkirî ye"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "lê dê neyê sazkirin"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " û"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr ""
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "Ev pakêtên NÛ dê werine sazkirin:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "Ev pakêt dê werine RAKIRIN:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr ""
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "Ev paket dê werine bilindkirin:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr ""
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr ""
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (ji ber %s)"
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu hatine bilindkirin, %lu nû hatine sazkirin."
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu ji nû ve sazkirî,"
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu hatine nizmkirin."
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu werin rakirin û %lu neyên bilindkirin. \n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr ""
@@ -1208,7 +1204,7 @@ msgstr ""
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
#, fuzzy
msgid "[Y/n]"
msgstr "[E/n]"
@@ -1217,21 +1213,21 @@ msgstr "[E/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "E"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -1248,6 +1244,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1260,70 +1260,70 @@ msgstr[1] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr ""
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Anîna %sB/%sB ji arşîvan pêwist e.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Anîna %sB ji arşîvan pêwist e.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr ""
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Cihê vala li %s têre nake."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr ""
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Erê, wusa bike!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1331,37 +1331,37 @@ msgid ""
" ?] "
msgstr ""
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Betal."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Dixwazî bidomînî?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "Daxistina çend pelan biserneket"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr ""
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "Sazkirin tê betalkirin."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1371,15 +1371,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr ""
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1395,15 +1395,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr ""
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
#, fuzzy
msgid ""
"The following package was automatically installed and is no longer required:"
@@ -1413,7 +1413,7 @@ msgid_plural ""
msgstr[0] "Ev pakêtên NÛ dê werine sazkirin:"
msgstr[1] "Ev pakêtên NÛ dê werine sazkirin:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, fuzzy, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1421,7 +1421,7 @@ msgid_plural ""
msgstr[0] "Ev pakêtên NÛ dê werine sazkirin:"
msgstr[1] "Ev pakêtên NÛ dê werine sazkirin:"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] ""
@@ -1437,7 +1437,7 @@ msgid ""
"solution)."
msgstr ""
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1445,59 +1445,59 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Paketên şikestî"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr ""
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Paketên tên pêşniyaz kirin:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Paketên tên tawsiyê kirin:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s jixwe guhertoya nûtirîn e.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr ""
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr ""
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr ""
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr ""
@@ -2066,23 +2066,23 @@ msgstr "Nivîsandin ji bo %s ne pêkane"
msgid "IO Error saving source cache"
msgstr ""
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr ""
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr ""
@@ -2715,7 +2715,7 @@ msgstr ""
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "Hilbijartina %s nehatiye dîtin"
@@ -3315,7 +3315,7 @@ msgstr ""
msgid "Problem unlinking %s"
msgstr ""
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
diff --git a/po/lt.po b/po/lt.po
index 75f67ece4..5fcfa7d65 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2008-08-02 01:47-0400\n"
"Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n"
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -161,7 +161,7 @@ msgstr " Versijų lentelė:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -292,7 +292,7 @@ msgid "Couldn't find package %s"
msgstr "Nepavyko rasti paketo %s"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
@@ -346,7 +346,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "Praleidžiama jau parsiųsta byla „%s“\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nepavyko nustatyti %s laisvos vietos"
@@ -379,7 +379,7 @@ msgstr "Parsiunčiamas archyvas %s\n"
msgid "Failed to fetch some archives."
msgstr "Nepavyko gauti kai kurių arhcyvų."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "Pavyko parsiųsti tik parsiuntimo režime"
@@ -775,7 +775,7 @@ msgstr ""
msgid "Could not connect data socket, connection timed out"
msgstr ""
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Nepavyko"
@@ -1021,12 +1021,7 @@ msgstr "Vidinė klaida"
msgid "Calculating upgrade... "
msgstr "Skaičiuojami atnaujinimai... "
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Vidinė klaida, problemos sprendimas kažką sugadino"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Įvykdyta"
@@ -1113,70 +1108,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Šie paketai turi neįdiegtų priklausomybių:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "bet %s yra įdiegtas"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "bet %s bus įdiegtas"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "tačiau jis negali būti įdiegtas"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "bet tai yra virtualus paketas"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "bet jis nėra įdiegtas"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "bet jis nebus įdiegtas"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " arba"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "Šie paketai turi neįdiegtų priklausomybių:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "Bus įdiegti šie NAUJI paketai:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "Bus PAŠALINTI šie paketai:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "Šių paketų atnaujinimas sulaikomas:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "Bus atnaujinti šie paketai:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "Bus PAKEISTI SENESNIAIS šie paketai:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "Bus pakeisti šie sulaikyti paketai:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (dėl %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1184,27 +1179,27 @@ msgstr ""
"Įspėjimas: Šie būtini paketai bus pašalinti.\n"
"Tai NETURĖTŲ būti daroma, kol tiksliai nežinote ką darote!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu atnaujinti, %lu naujai įdiegti, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu įdiegti iš naujo, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu pasendinti, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu bus pašalinta ir %lu neatnaujinta.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu nepilnai įdiegti ar pašalinti.\n"
@@ -1213,7 +1208,7 @@ msgstr "%lu nepilnai įdiegti ar pašalinti.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr "[T/n]"
@@ -1221,21 +1216,21 @@ msgstr "[T/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr "[t/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "T"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -1252,6 +1247,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1264,70 +1263,70 @@ msgstr[1] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "Reikia pašalinti paketus, tačiau šalinimas išjungtas."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr "Keista... Dydis neatitinka, Parašykite laišką apt@packages.debian.org"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Reikia parsiųsti %sB/%sB archyvų.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Reikia parsiųsti %sB archyvų.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "Po šios operacijos bus naudojama %sB papildomos disko vietos.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Po šios operacijos bus atlaisvinta %sB disko vietos.\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "%s nėra pakankamai laisvos vietos."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "Atsirado problemų ir -y buvo panaudotas be --force-yes"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Taip, daryk kaip liepiu!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1338,19 +1337,19 @@ msgstr ""
"Jei norite tęsti, įveskite frazę „%s“\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Nutraukti."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Ar norite tęsti?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "Nepavyko parsiųsti kai kurių failų"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1358,19 +1357,19 @@ msgstr ""
"Nepavyko parsiųsti kai kurių archyvų, pabandykite paleisti „apt-get update“ "
"arba pabandykite su parametru --fix-missing?"
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing bei laikmenų apkeitimas nepalaikomas"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "Nepavyko pataisyti dingusių paketų."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "Diegimas nutraukiamas."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1380,15 +1379,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr ""
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1404,15 +1403,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "Ši informacija gali padėti išspręsti šią situaciją:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr ""
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
#, fuzzy
msgid ""
"The following package was automatically installed and is no longer required:"
@@ -1422,7 +1421,7 @@ msgid_plural ""
msgstr[0] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
msgstr[1] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, fuzzy, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1430,7 +1429,7 @@ msgid_plural ""
msgstr[0] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
msgstr[1] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
#, fuzzy
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1449,7 +1448,7 @@ msgstr ""
"Nepatenkintos priklausomybės. Pabandykite įvykdyti 'apt-get -f install' be "
"nurodytų paketų (arba nurodykite išeitį)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1461,61 +1460,61 @@ msgstr ""
"leidimą, kuomet kai kurie paketai dar nebuvo sukurti arba buvo\n"
"pašalinti iš \"Incoming\" aplanko."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Sugadinti paketai"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "Bus įdiegti šie papildomi paketai:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Siūlomi paketai:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Rekomenduojami paketai:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Praleidžiamas %s, nes jis jau yra įdiegtas ir atnaujinimas nėra nurodytas.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, fuzzy, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
"Praleidžiamas %s, nes jis jau yra įdiegtas ir atnaujinimas nėra nurodytas.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Pakartotinas %s įdiegimas neįmanomas, jo nepavyksta parsiųsti.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s ir taip jau yra naujausias.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Pažymėta versija %s (%s) paketui %s\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Pažymėta versija %s (%s) paketui %s\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr "Paketas %s nėra įdiegtas, todėl nebuvo pašalintas\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Paketas %s nėra įdiegtas, todėl nebuvo pašalintas\n"
@@ -2092,23 +2091,23 @@ msgstr "Nepavyko įrašyti į %s"
msgid "IO Error saving source cache"
msgstr ""
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr ""
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr ""
@@ -2745,7 +2744,7 @@ msgstr ""
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr ""
@@ -3403,7 +3402,7 @@ msgstr "Skaitymo klaida skaičiuojant MD5"
msgid "Problem unlinking %s"
msgstr ""
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -3458,6 +3457,10 @@ msgstr ""
" -c=? Nuskaityti šią konfigūracijos bylą\n"
" -o=? Nurodyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Vidinė klaida, problemos sprendimas kažką sugadino"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s nėra tikras DEB paketas."
diff --git a/po/mr.po b/po/mr.po
index 82b3dd825..3b988946c 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+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 "
@@ -158,7 +158,7 @@ msgstr "आवृत्ती कोष्टक:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -326,7 +326,7 @@ msgid "Couldn't find package %s"
msgstr "%s पॅकेज सापडू शकले नाही"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s स्वहस्ते संस्थापित करायचे आहे.\n"
@@ -380,7 +380,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "आधीच डाऊनलोड केलेली '%s' फाईल सोडून द्या\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s मध्ये रिकामी जागा सांगू शकत नाही"
@@ -413,7 +413,7 @@ msgstr "%s उगम घ्या\n"
msgid "Failed to fetch some archives."
msgstr "काही अर्काईव्हज आणण्यास असमर्थ."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "डाऊनलोड संपूर्ण आणि डाऊनलोड मध्ये फक्त पद्धती"
@@ -849,7 +849,7 @@ msgstr "सॉकेट तयार करू शकत नाही"
msgid "Could not connect data socket, connection timed out"
msgstr "डेटा सॉकेट जोडू शकत नाही,जोडणी वेळेअभावी बंद केली"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "असमर्थ"
@@ -1097,12 +1097,7 @@ msgstr "अंतर्गत त्रुटी"
msgid "Calculating upgrade... "
msgstr "पुढिल आवृत्तीची गणती करीत आहे..."
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "अंतर्गत त्रुटी,ऑलअपग्रेडने स्टफला तोडले"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "झाले"
@@ -1188,70 +1183,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "खालील पॅकेजेस मध्ये नमिळणाऱ्या निर्भरता/ डिपेन्डन्सीज आहेत:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "पण %s संस्थापित झाले"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "पण %s संस्थापित करायचे आहे"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "पण ते संस्थापित करण्याजोगे नाही"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "पण ते आभासी पॅकेज आहे"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "पण ते संस्थापित केले नाही"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "पण ते संस्थापित होणार नाही"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr "किंवा"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "खालील पॅकेजेस मध्ये नमिळणाऱ्या निर्भरता/ डिपेन्डन्सीज आहेत:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "खालील नविन पॅकेजेस संस्थापित होतील:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "खालील नविन पॅकेजेस कायमची काढून टाकली जातील:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "खालील पॅकेजेस परत ठेवली गेली:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "खालील पॅकेजेस पुढिल आवृत्तीकृत होतील:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "खालील पॅकेजेस पुढच्या आवृत्तीकृत होणार नाहीत:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "पुढिल ठेवलेली पॅकेजेस बदलतील:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (च्या मुळे %s)"
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1259,27 +1254,27 @@ msgstr ""
"धोक्याची सूचना:खालील जरूरीची पॅकेजेस कायमची काढून टाकली जातील।\n"
"तुम्हाला तुम्ही काय करत आहात हे कळेपर्यंत असं करता येणार नाही!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu पुढे आवृत्तीकृत केले, %lu नव्याने संस्थापित केले,"
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu पुनर्संस्थापित केले,"
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu मागील आवृत्तीकृत केले,"
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu कायमचे काढून टाकण्यासाठी आणि %lu पुढच्या आवृत्तीकृत झालेली नाही.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu संपूर्ण संस्थापित किंवा कायमची काढून टाकलेली नाही.\n"
@@ -1288,7 +1283,7 @@ msgstr "%lu संपूर्ण संस्थापित किंवा
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr ""
@@ -1296,21 +1291,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "होय"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "रिजेक्स कंपायलेशन त्रुटी -%s "
@@ -1327,6 +1322,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1339,70 +1338,70 @@ msgstr[1] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "अंतर्गत त्रुटी, तुटलेल्या पॅकेजेस बरोबर संस्थापित पॅकेजला आवाहन केले गेले/बोलावले गेले!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "पॅकेजेस कायमची काढायची आहेत पण रिमूव्ह अकार्यक्षम केले आहे"
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "अंतर्गत त्रुटी,क्रम अजून संपला नाही"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr "किती विचित्र...आकार जुळत नाहीत, ईमेल apt@packages.debian.org"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "अर्काईव्हजच्या %sB/%sB घेण्याची गरज आहे\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "अर्काईव्हज%sB घेण्याची गरज आहे.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "या क्रियेनंतर, %sB एवढी अधिक डिस्क जागा वापरली जाईल.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "या क्रियेनंतर, %sB डिस्क जागा मोकळी होईल.\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "%s मध्ये तुमच्याकडे पुरेशी जागा नाही."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "काही अडचणी आहेत आणि --force-yes शिवाय -y वापरला गेला"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "क्षुल्लक फक्त निर्देशित केले आहे पण हे क्षुल्लक कृति/ऑपरेशन नाही."
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "हो, मी म्ह्टल्याप्रमाणे करा!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1413,20 +1412,20 @@ msgstr ""
"पुढे '%s' उक्ती मध्ये लिहिणार \n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "व्यत्यय/बंद करा."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
#, fuzzy
msgid "Do you want to continue?"
msgstr "तुम्हाला पुढे जायचे आहे [Y/n]? "
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "काही संचिका डाऊनलोड करण्यास असमर्थ"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1434,20 +1433,20 @@ msgstr ""
"काही आर्काइव्हज आणण्यास असमर्थ, कदाचित apt-get रन करुन अद्ययावत करा किंवा --fix- "
"बरोबर प्रयत्न कराहरवलेले/गहाळ?"
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
"--fix- सापडत नाही आणि माध्यम/मिडिया अदलाबदल हे सध्या तांत्रिक मदत देऊ शकत नाही"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "न सापडणारी पॅकेजेस नीट करण्यास असमर्थ."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "संस्थापन खंडित करत आहे."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1457,15 +1456,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr ""
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "आपण या गोष्टी काढून टाकता नये, ऑटोरिमूव्हर सुरू करता येत नाही"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1483,15 +1482,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "खालील माहिती परिस्थिती निवळण्यासाठी मदत ठरू शकेल:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "अंतर्गत त्रुटी, AutoRemoverने स्टफला तोडले"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
#, fuzzy
msgid ""
"The following package was automatically installed and is no longer required:"
@@ -1501,7 +1500,7 @@ msgid_plural ""
msgstr[0] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
msgstr[1] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, fuzzy, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1509,7 +1508,7 @@ msgid_plural ""
msgstr[0] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
msgstr[1] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
#, fuzzy
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1530,7 +1529,7 @@ msgstr ""
"अनमेट डिपेंडन्सीज.एपीटी-गेट -एफ संस्थापन ('apt-get -f install') पॅकेजशिवाय प्रयत्न करा "
"(किंवा पर्याय सांगा)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1542,59 +1541,59 @@ msgstr ""
"विभागणी असणारी पण हवी असणारी, तयार केली नसलेली पॅकेजेस वापरत असाल \n"
"किंवा ती येणाऱ्यांपैकी बाहेर हलविली असतील."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "तुटलेली पॅकेजेस"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "खालील अतिरिक्त पॅकेजेस संस्थापित होतील:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "सुचवलेली पॅकेजेस:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "शिफारस केलेली पॅकेजेस:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "%s सोडून देत आहे, ते आधिच संस्थापित केले आहे आणि पुढिल आवृत्ती निश्चित केलेली नाही.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, fuzzy, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr "%s सोडून देत आहे, ते आधिच संस्थापित केले आहे आणि पुढिल आवृत्ती निश्चित केलेली नाही.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "%s चे पुनर्संस्थापन शक्य नाही, हे डाऊनलोड करता येत नाही.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s ही आधीच नविन आवृत्ती आहे.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "%s साठी %s (%s) निवडलेली आवृत्ती.\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "%s साठी %s (%s) निवडलेली आवृत्ती.\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr "%s पॅकेज संस्थापित केलेले नाही,म्हणून काढले नाही\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "%s पॅकेज संस्थापित केलेले नाही,म्हणून काढले नाही\n"
@@ -2173,23 +2172,23 @@ msgstr "%s मध्ये लिहिण्यास असमर्थ "
msgid "IO Error saving source cache"
msgstr "IO त्रुटी उगम निवडक संचयस्थानात संग्रहित होत आहे"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr ""
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr ""
@@ -2838,7 +2837,7 @@ msgstr ""
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "%s निवडक भाग सापडत नाही"
@@ -3489,7 +3488,7 @@ msgstr "MD5 कामप्युटींग करतांना वाचण
msgid "Problem unlinking %s"
msgstr "%s दुवा मोकळा/सुटा करण्यास अडचण"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -3543,6 +3542,10 @@ msgstr ""
" -c=? ही संरचना फाईल वाचा\n"
" -o=?- अनियंत्रित संरचना पर्याय निश्चित करा,eg -o dir::cache=/tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "अंतर्गत त्रुटी,ऑलअपग्रेडने स्टफला तोडले"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s हे वैध डीईबी पॅकेज नाही "
diff --git a/po/nb.po b/po/nb.po
index d24372a14..e417d4821 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2010-09-01 21:10+0200\n"
"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -163,7 +163,7 @@ msgstr " Versjonstabell:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -332,7 +332,7 @@ msgid "Couldn't find package %s"
msgstr "Klarte ikke å finne pakken %s"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s satt til manuell installasjon.\n"
@@ -391,7 +391,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "Hopper over allerede nedlastet fil «%s»\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Klarte ikke bestemme ledig plass i %s"
@@ -424,7 +424,7 @@ msgstr "Skaffer kildekode %s\n"
msgid "Failed to fetch some archives."
msgstr "Klarte ikke å skaffe alle arkivene."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "Nedlasting fullført med innstillinga «bare nedlasting»"
@@ -866,7 +866,7 @@ msgstr "Klarte ikke å opprette en sokkel"
msgid "Could not connect data socket, connection timed out"
msgstr "Klarte ikke å kople til datasokkelen, tidsavbrudd på forbindelsen"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Mislyktes"
@@ -1115,12 +1115,7 @@ msgstr "Intern feil"
msgid "Calculating upgrade... "
msgstr "Beregner oppgradering... "
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Intern feil - «AllUpgrade» ødela noe"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Utført"
@@ -1206,70 +1201,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Følgende pakker har uinnfridde avhengighetsforhold:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "men %s er installert"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "men %s skal installeres"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "men lar seg ikke installere"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "men er en virtuell pakke"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "men er ikke installert"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "men skal ikke installeres"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " eller"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "Følgende pakker har uinnfridde avhengighetsforhold:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "Følgende NYE pakker vil bli installert:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "Følgende pakker vil bli FJERNET:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "Følgende pakker er holdt tilbake:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "Følgende pakker vil bli oppgradert:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "Følgende pakker vil bli NEDGRADERT:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "Følgende pakker vil bli endret:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (pga. %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1277,27 +1272,27 @@ msgstr ""
"ADVARSEL: Følgende essensielle pakker vil bli fjernet.\n"
"Dette bør IKKE gjøres, med mindre du vet nøyaktig hva du gjør!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu oppgraderte, %lu nylig installerte, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu installert på nytt, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nedgraderte, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu å fjerne og %lu ikke oppgradert.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu pakker ikke fullt installert eller fjernet.\n"
@@ -1306,7 +1301,7 @@ msgstr "%lu pakker ikke fullt installert eller fjernet.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr "[J/n]"
@@ -1314,21 +1309,21 @@ msgstr "[J/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr "[j/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "J"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "Kompileringsfeil i regulært uttrykk - %s"
@@ -1345,6 +1340,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1357,19 +1356,19 @@ msgstr[1] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Intern feil, InstallPackages ble kalt med ødelagte pakker!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "Pakker trenges å fjernes, men funksjonen er slått av."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "Intern feil, sortering fullførte ikke"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Så rart ... Størrelsene stemmer ikke overens, send en e-post til "
@@ -1377,53 +1376,53 @@ msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Må hente %sB/%sB med arkiver.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Må hente %sB med arkiver.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "Etter denne operasjonen vil %sB ekstra diskplass bli brukt.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Etter denne operasjonen vil %sB diskplass bli ledig.\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Dessverre, ikke nok ledig plass i %s"
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "Det oppsto problemer og «-y» ble brukt uten «--force-yes»"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"«Bare trivielle endringer» ble angitt, men dette er ikke en triviell endring."
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Ja, gjør som jeg sier!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1434,19 +1433,19 @@ msgstr ""
"For å fortsette skriv inn teksten «%s»\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Avbryter."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Vil du fortsette?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "Klarte ikke laste ned alle filene"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1454,19 +1453,19 @@ msgstr ""
"Klarte ikke å hente alle arkivene. Du kan prøve med «apt-get update» eller "
"«--fix-missing»."
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "«--fix-missing» og bytte av media støttes nå ikke"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "Klarer ikke å rette på manglende pakker."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "Avbryter installasjonen."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1480,15 +1479,15 @@ msgstr[1] ""
"De følgende pakkene forsvant fra systemet ditt siden\n"
"alle filene er overskrevet av andre pakker:"
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr "Merk: Dette er gjort automatisk og med hensikt av dpkg."
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Vi skal ikke slette ting, kan ikke starte auto-fjerner (AutoRemover)"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1506,15 +1505,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "Følgende informasjon kan være til hjelp med å løse problemet:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Intern feil, autofjerneren (AutoRemover) ødela noe"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -1525,7 +1524,7 @@ msgstr[0] ""
msgstr[1] ""
"Følgende pakker ble automatisk installert og er ikke lenger påkrevet:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1533,7 +1532,7 @@ msgid_plural ""
msgstr[0] "%lu pakke ble automatisk installert og er ikke lenger påkrevet.\n"
msgstr[1] "%lu pakker ble automatisk installert og er ikke lenger påkrevet.\n"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
#, fuzzy
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1552,7 +1551,7 @@ msgstr ""
"Uinnfridde avhengighetsforhold. Prøv «apt-get -f install» uten pakker (eller "
"angi en løsning)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1564,62 +1563,62 @@ msgstr ""
"at visse kjernepakker ennå ikke er laget eller flyttet ut av «Incoming» for\n"
"distribusjonen."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Ødelagte pakker"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "Følgende ekstra pakker vil bli installert."
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Foreslåtte pakker:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Anbefalte pakker"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Omgår %s - den er allerede installert eller ikke satt til oppgradering.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
"Hopper over %s siden den ikke er installert eller kun oppgraderinger er "
"ønsket.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Det er ikke mulig å installere %s på nytt - den kan ikke nedlastes.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s er allerede nyeste versjon.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Utvalgt versjon «%s» (%s) for «%s»\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Utvalgt versjon «%s» (%s) for «%s»\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
@@ -2197,23 +2196,23 @@ msgstr "Kan ikke skrive til %s"
msgid "IO Error saving source cache"
msgstr "IO-feil ved lagring av kildekode-lager"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr ""
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr ""
@@ -2886,7 +2885,7 @@ msgstr "%lim %lis"
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "Fant ikke utvalget %s"
@@ -3542,7 +3541,7 @@ msgstr "Klarte ikke å lese under utregning av MD5"
msgid "Problem unlinking %s"
msgstr "Problem ved oppheving av lenken til %s"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -3596,6 +3595,10 @@ msgstr ""
" -c=? Les denne innstillingsfila.\n"
" -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Intern feil - «AllUpgrade» ødela noe"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s er ikke en gyldig debianpakke."
diff --git a/po/ne.po b/po/ne.po
index b69db6abe..b25b702e1 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+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"
@@ -161,7 +161,7 @@ msgstr " संस्करण तालिका:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -330,7 +330,7 @@ msgid "Couldn't find package %s"
msgstr "प्याकेज फेला पार्न सकिएन %s"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "तर %s स्थापना हुनुपर्यो"
@@ -384,7 +384,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "पहिल्यै डाउनलोड भएका फाइलहरु फड्काइदैछ '%s'\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन"
@@ -417,7 +417,7 @@ msgstr "स्रोत फड्काउनुहोस् %s\n"
msgid "Failed to fetch some archives."
msgstr "केही संग्रह फड्काउन असफल भयो ।"
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "डाउनलोड समाप्त भयो र डाउनलोडमा मोड मात्रै छ"
@@ -851,7 +851,7 @@ msgstr "एउटा सकेट सिर्जना गर्न सके
msgid "Could not connect data socket, connection timed out"
msgstr "डेटा सकेट जडान गर्न सकिएन, जडान समय सकियो"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "असफल भयो"
@@ -1098,12 +1098,7 @@ msgstr "आन्तरिक त्रुटि"
msgid "Calculating upgrade... "
msgstr "स्तर वृद्धि गणना गरिदैछ..."
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "आन्तरिक त्रुटि,सबै स्तरवृद्धिले उत्तम गुण नष्ट गर्दछ"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "काम भयो"
@@ -1189,70 +1184,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "निम्न प्याकेजहरुले निर्भरताहरू भेटेनन्:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "तर %s स्थापना भयो"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "तर %s स्थापना हुनुपर्यो"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "तर यो स्थापनायोग्य छैन"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "तर यो अवास्तविक प्याकेज होइन"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "तर यो स्थापना भएन"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "तर यो स्थापना हुन गइरहेको छैन"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr "वा"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "निम्न प्याकेजहरुले निर्भरताहरू भेटेनन्:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "निम्न प्याकेजहरू हटाइनेछन्:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "निम्न प्याकेजहरू पछाडि राखिनेछन्:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "निम्न प्याकेजहरू स्तर वृद्धि हुनेछन्:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "निम्न प्याकेजहरू स्तरकम गरिनेछन्:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "निम्न भइरहेको प्याकेजहरू परिवर्तन हुनेछैन:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (%s कारणले) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1260,27 +1255,27 @@ msgstr ""
"चेतावनी: निम्न आवश्यक प्याकेजहरू हटाइनेछन् ।\n"
"तपाईँ के गरिरहेको यकिन नभएसम्म यो काम गरिने छैन!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu स्तर वृद्धि गरियो, %lu नयाँ स्थापना भयो, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu पुन: स्थापना गरियो, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu स्तर कम गरियो, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu हटाउन र %lu स्तर वृद्धि गरिएन ।\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu पूर्णरुपले स्थापना भएन र हटाइएन ।\n"
@@ -1289,7 +1284,7 @@ msgstr "%lu पूर्णरुपले स्थापना भएन र
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr ""
@@ -1297,21 +1292,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s"
@@ -1328,6 +1323,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1340,70 +1339,70 @@ msgstr[1] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "आन्तरिक त्रुटि, स्थापना प्याकेजहरुलाई भाँचिएको प्याकेज भनिन्थ्यो!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "प्याकेजहरू हट्न चाहदैछन् तर हटाई अक्षम भइरहेछ ।"
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "आन्तरिक त्रुटि, आदेश समाप्त भएको छैन"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr "कस्तो नमिलेको.. साइजहरू मेल खाएन, apt@packages.debian.org इमेल गर्नुहोस्"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "संग्रहहरुको %sB/%sB प्राप्त गर्न आवश्यक ।\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "संग्रहहरुको %sB प्राप्त गर्न आवश्यक ।\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, fuzzy, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "अनप्याक गरिसके पछि थप डिस्क खाली ठाउँको %sB प्रयोग हुनेछ ।\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, fuzzy, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "%sB अनप्याक गरिसके पछि डिस्क खाली ठाउँ खाली हुनेछ ।\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन ।"
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "त्यहाँ समस्याहरू छन् र हुन्छलाई जोड नगरिकन -y को प्रयोग भयो"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "त्रिभियल मात्र निर्दिष्ट गरिएको छ तर यो त्रिभियल सञ्चालन होइन ।"
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "हो,मैले भने जस्तै गर्नुहोस्!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1414,20 +1413,20 @@ msgstr ""
"निरन्तरता दिन '%s' वाक्यांशमा टाइप गर्नुहोस् \n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "परित्याग गर्नुहोस् ।"
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
#, fuzzy
msgid "Do you want to continue?"
msgstr "के तपाईँ निरन्तरता दिन चाहनुहुन्छ [Y/n]? "
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "केही फाइलहरू डाउनलोड गर्न असफल भयो"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1435,19 +1434,19 @@ msgstr ""
"केही संग्रहहरू तान्न असक्षम भयो,apt-get अद्यावधिक चलिरहेछ वा हराइरहेको --fix-संगै प्रयास "
"गर्नुहुन्छ ?"
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "हराइरहेको --fix-र स्वाप भइरहेको मेडिया हाल समर्थित भइरहेको छैन"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "हराइरहेको प्याकेजहरू सुधार्न असक्षम भयो ।"
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "स्थापना परित्याग गरिदैछ ।"
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1457,15 +1456,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr ""
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1481,16 +1480,16 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "निम्न सूचनाले अवस्थालाई हल गर्न मद्दत गर्नेछ: "
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो "
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
#, fuzzy
msgid ""
"The following package was automatically installed and is no longer required:"
@@ -1500,7 +1499,7 @@ msgid_plural ""
msgstr[0] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
msgstr[1] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, fuzzy, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1508,7 +1507,7 @@ msgid_plural ""
msgstr[0] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
msgstr[1] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] ""
@@ -1526,7 +1525,7 @@ msgstr ""
"नभेटिएका निर्भरताहरू । प्याकेजहरू बिना 'apt-get -f install' प्रयास गर्नुहोस् ( वा "
"समाधान निर्दिष्ट गर्नुहोस्) ।"
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1539,59 +1538,59 @@ msgstr ""
" वितरण अहिले सम्म सिर्जना\n"
" भएको छैन वा आवगमन विनानै सर्यो ।"
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "भाँचिएका प्याकेजहरू"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "निम्न अतिरिक्त प्याकेजहरू स्थापना हुनेछन्:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "सुझाव दिएका प्याकेजहरू:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "सिफारिस गरिएका प्याकेजहरू:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "%s फड्किदैछ, यो पहिल्यै स्थापना भयो र स्तरवृद्धि सेट भएको छैन ।\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, fuzzy, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr "%s फड्किदैछ, यो पहिल्यै स्थापना भयो र स्तरवृद्धि सेट भएको छैन ।\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr " %s को पुन: स्थापना सम्भव छैन, यो डाउनलोड हुन सक्दैन ।\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n"
@@ -2167,23 +2166,23 @@ msgstr " %s मा लेख्न असक्षम"
msgid "IO Error saving source cache"
msgstr "स्रोत क्यास बचत गर्दा IO त्रुटि"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr ""
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr ""
@@ -2830,7 +2829,7 @@ msgstr ""
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "चयन %s फेला पार्न सकिएन"
@@ -3481,7 +3480,7 @@ msgstr "MD5 गणना गर्दा पढ्न असफल भयो"
msgid "Problem unlinking %s"
msgstr "समस्या अनलिङ्क भइरहेछ %s"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -3534,6 +3533,10 @@ msgstr ""
" -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
" -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "आन्तरिक त्रुटि,सबै स्तरवृद्धिले उत्तम गुण नष्ट गर्दछ"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s वैध DEB प्याकेज होइन"
diff --git a/po/nl.po b/po/nl.po
index 0cad8e6c8..849ba3838 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.15.9\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2011-12-05 17:10+0100\n"
"Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n"
"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -161,7 +161,7 @@ msgstr " Versietabel:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -332,7 +332,7 @@ msgid "Couldn't find package %s"
msgstr "Kon pakket %s niet vinden"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s is ingesteld voor handmatige installatie.\n"
@@ -395,7 +395,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen"
@@ -428,7 +428,7 @@ msgstr "Ophalen bron %s\n"
msgid "Failed to fetch some archives."
msgstr "Ophalen van sommige archieven is mislukt."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "Ophalen klaar en alleen-ophalen-modus staat aan"
@@ -879,7 +879,7 @@ msgstr "Kon geen socket aanmaken"
msgid "Could not connect data socket, connection timed out"
msgstr "Kon de datasocket niet verbinden, de verbinding verliep"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Mislukt"
@@ -1134,12 +1134,7 @@ msgstr "Interne fout"
msgid "Calculating upgrade... "
msgstr "Opwaardering wordt doorgerekend... "
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Klaar"
@@ -1225,70 +1220,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "De volgende pakketten hebben niet-voldane vereisten:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "maar %s is geïnstalleerd"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "maar %s zal geïnstalleerd worden"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "maar het is niet installeerbaar"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "maar het is een virtueel pakket"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "maar het is niet geïnstalleerd"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "maar het zal niet geïnstalleerd worden"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " of"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "De volgende pakketten hebben niet-voldane vereisten:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "De volgende pakketten zullen VERWIJDERD worden:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "De volgende pakketten zijn achtergehouden:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "De volgende pakketten zullen opgewaardeerd worden:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "De volgende pakketten zullen GEDEGRADEERD worden:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (vanwege %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1296,27 +1291,27 @@ msgstr ""
"WAARSCHUWING: De volgende essentiële pakketten zullen verwijderd worden.\n"
"Dit dient NIET gedaan te worden tenzij u precies weet wat u doet!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu pakketten opgewaardeerd, %lu pakketten nieuw geïnstalleerd, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu opnieuw geïnstalleerd, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu gedegradeerd, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu te verwijderen en %lu niet opgewaardeerd.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n"
@@ -1325,7 +1320,7 @@ msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr "[J/n]"
@@ -1333,21 +1328,21 @@ msgstr "[J/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr "[j/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "J"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex-compilatiefout - %s"
@@ -1364,6 +1359,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1376,19 +1375,19 @@ msgstr[1] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Interne fout, InstallPackages is aangeroepen met defecte pakketten!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "Interne fout, rangschikken is niet voltooid"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Merkwaardig... De groottes kwamen niet overeen, gelieve apt@packages.debian."
@@ -1396,52 +1395,52 @@ msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Er moeten %sB/%sB aan archieven opgehaald worden.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Er moeten %sB aan archieven opgehaald worden.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "Door deze operatie zal er %sB extra schijfruimte gebruikt worden.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Door deze operatie zal er %sB schijfruimte vrijkomen.\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "U heeft onvoldoende vrije schijfruimte op %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "'Trivial Only' is opgegeven, dit is echter geen triviale bewerking."
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Ja, doe wat ik zeg!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1452,19 +1451,19 @@ msgstr ""
"Als u wilt doorgaan, dient u de zin '%s' in te typen.\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Afbreken."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Wilt u doorgaan?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "Ophalen van sommige bestanden is mislukt"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1472,19 +1471,19 @@ msgstr ""
"Kon sommige archieven niet ophalen, misschien kunt u 'apt-get update' of --"
"fix-missing proberen?"
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing en medium wisselen wordt op dit moment niet ondersteund"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "Geen oplossing voor de missende pakketten gevonden."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "Installatie wordt afgebroken."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1498,15 +1497,15 @@ msgstr[1] ""
"De volgende pakketten zijn van uw systeem verdwenen omdat\n"
"alle bestanden zijn overschreven door andere pakketten:"
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr "Let op: Dit wordt automatische en bewust door dpkg gedaan."
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "We mogen geen dingen verwijderen, kan AutoRemover niet starten"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1524,15 +1523,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "De volgende informatie helpt u mogelijk verder:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Interne fout, AutoRemover heeft dingen stukgemaakt"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -1544,7 +1543,7 @@ msgstr[1] ""
"De volgende pakketten zijn automatisch geïnstalleerd en zijn niet langer "
"nodig:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1553,7 +1552,7 @@ msgstr[0] "%lu pakket is automatisch geïnstalleerd en is niet langer nodig.\n"
msgstr[1] ""
"%lu pakketten zijn automatisch geïnstalleerd en zijn niet langer nodig.\n"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
#, fuzzy
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1574,7 +1573,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)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1585,64 +1584,64 @@ msgstr ""
"een onmogelijke situatie gevraagd hebt of dat u de 'unstable'-distributie \n"
"gebruikt en sommige benodigde pakketten nog vastzitten in 'incoming'."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Niet-werkende pakketten:"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "De volgende extra pakketten zullen geïnstalleerd worden:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Voorgestelde pakketten:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Aanbevolen pakketten:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"%s wordt overgeslagen, het is al geïnstalleerd en opwaardering is niet "
"gevraagd.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
"%s wordt overgeslagen, het is niet geïnstalleerd en alleen opwaardering is "
"gevraagd.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"Herinstallatie van %s is niet mogelijk daar het niet opgehaald kan worden.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s is reeds de nieuwste versie.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Versie '%s' (%s) geselecteerd voor '%s'\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Versie '%s' (%s) geselecteerd voor '%s'\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr "Pakket %s is niet geïnstalleerd, en wordt dus niet verwijderd\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Pakket %s is niet geïnstalleerd, en wordt dus niet verwijderd\n"
@@ -2235,23 +2234,23 @@ msgstr "Kan niet naar %s schrijven"
msgid "IO Error saving source cache"
msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakket-cache"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr ""
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr ""
@@ -2939,7 +2938,7 @@ msgstr "%limin %lis"
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "Selectie %s niet gevonden"
@@ -3605,7 +3604,7 @@ msgstr "Lezen tijdens het berekenen van de MD5 is mislukt"
msgid "Problem unlinking %s"
msgstr "Probleem bij het ontlinken van %s"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -3659,6 +3658,10 @@ msgstr ""
" -c=? Lees dit configuratiebestand\n"
" -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s is geen geldig DEB-pakket."
diff --git a/po/nn.po b/po/nn.po
index ba63e8836..68a930e9c 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_nn\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+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"
@@ -163,7 +163,7 @@ msgstr " Versjonstabell:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -334,7 +334,7 @@ msgid "Couldn't find package %s"
msgstr "Fann ikkje pakken %s"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "men %s skal installerast"
@@ -389,7 +389,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Du har ikkje nok ledig plass i %s"
@@ -422,7 +422,7 @@ msgstr "Hent kjeldekode %s\n"
msgid "Failed to fetch some archives."
msgstr "Klarte ikkje henta nokre av arkiva."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "Nedlastinga er ferdig i nedlastingsmodus"
@@ -860,7 +860,7 @@ msgstr "Klarte ikkje oppretta sokkel"
msgid "Could not connect data socket, connection timed out"
msgstr "Klarte ikkje kopla til datasokkel, tidsavbrot p sambandet"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Mislukkast"
@@ -1107,12 +1107,7 @@ msgstr "Intern feil"
msgid "Calculating upgrade... "
msgstr "Reknar ut oppgradering ... "
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Intern feil. AllUpgrade ydelagde noko"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Ferdig"
@@ -1199,70 +1194,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Flgjande pakkar har krav som ikkje er oppfylte:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "men %s er installert"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "men %s skal installerast"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "men lt seg ikkje installera"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "men er ein virtuell pakke"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "men er ikkje installert"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "men skal ikkje installerast"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " eller"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "Flgjande pakkar har krav som ikkje er oppfylte:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "Dei flgjande NYE pakkane vil verta installerte:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "Dei flgjande pakkane vil verta FJERNA:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "Dei flgjande pakkane er haldne tilbake:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "Dei flgjande pakkane vil verta oppgraderte:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "Dei flgjande pakkane vil verta NEDGRADERTE:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "Dei flgjande pakkane som er haldne tilbake vil verta endra:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (fordi %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -1271,27 +1266,27 @@ msgstr ""
"TVARING: Dei flgjande ndvendige pakkane vil verta fjerna.\n"
"Dette br IKKJE gjerast utan at du er fullstendig klar over kva du gjer!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu oppgraderte, %lu nyleg installerte, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu installerte p nytt, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nedgraderte, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ikkje fullstendig installerte eller fjerna.\n"
@@ -1300,7 +1295,7 @@ msgstr "%lu ikkje fullstendig installerte eller fjerna.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr "[J/n]"
@@ -1308,21 +1303,21 @@ msgstr "[J/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr "[j/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "J"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex-kompileringsfeil - %s"
@@ -1339,6 +1334,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1351,72 +1350,72 @@ msgstr[1] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "Nokre pakkar m fjernast, men fjerning er sltt av."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
#, fuzzy
msgid "Internal error, Ordering didn't finish"
msgstr "Intern feil ved tilleggjing av avleiing"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "M henta %sB/%sB med arkiv.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "M henta %sB med arkiv.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, fuzzy, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, fuzzy, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Du har ikkje nok ledig plass i %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "Det oppstod problem, og -y vart brukt utan --force-yes"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"Trivial Only var spesifisert, men dette er ikkje noka triviell handling."
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Ja, gjer som eg seier!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1427,19 +1426,19 @@ msgstr ""
"For halda fram, m du skriva nyaktig %s.\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Avbryt."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Vil du halda fram?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "Klarte ikkje henta nokre av filene"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1447,19 +1446,19 @@ msgstr ""
"Klarte ikkje henta nokre av arkiva. Du kan prva med apt-get update eller "
"--fix-missing."
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing og byte av medium er ikkje sttta for tida"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "Klarte ikkje retta opp manglande pakkar."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "Avbryt installasjon."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1469,15 +1468,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr ""
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1493,16 +1492,16 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "Flgjande informasjon kan hjelpa med lysa situasjonen:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Intern feil. AllUpgrade ydelagde noko"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
#, fuzzy
msgid ""
"The following package was automatically installed and is no longer required:"
@@ -1512,7 +1511,7 @@ msgid_plural ""
msgstr[0] "Dei flgjande NYE pakkane vil verta installerte:"
msgstr[1] "Dei flgjande NYE pakkane vil verta installerte:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, fuzzy, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1520,7 +1519,7 @@ msgid_plural ""
msgstr[0] "Dei flgjande NYE pakkane vil verta installerte:"
msgstr[1] "Dei flgjande NYE pakkane vil verta installerte:"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] ""
@@ -1539,7 +1538,7 @@ msgstr ""
"Nokre krav er ikkje oppfylte. Du kan prva apt-get -f install (eller velja "
"ei lysing)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1551,63 +1550,63 @@ msgstr ""
"distribusjonen, kan det g henda at nokre av pakkane som trengst ikkje\n"
"er laga enno eller at dei framleis ligg i Incoming."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "ydelagde pakkar"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "Dei flgjande tilleggspakkane vil verta installerte:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Fresltte pakkar:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Tilrdde pakkar"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Hoppar over %s, for den er installert fr fr og ikkje sett til "
"oppgradering.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, fuzzy, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
"Hoppar over %s, for den er installert fr fr og ikkje sett til "
"oppgradering.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "%s kan ikkje installerast p nytt, for pakken kan ikkje lastast ned.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "Den nyaste versjonen av %s er installert fr fr.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Vald versjon %s (%s) for %s\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Vald versjon %s (%s) for %s\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
@@ -2184,23 +2183,23 @@ msgstr "Klarte ikkje skriva til %s"
msgid "IO Error saving source cache"
msgstr "IU-feil ved lagring av kjeldelager"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr ""
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr ""
@@ -2849,7 +2848,7 @@ msgstr ""
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "Fann ikkje utvalet %s"
@@ -3497,7 +3496,7 @@ msgstr "Klarte ikkje lesa under utrekning av MD5"
msgid "Problem unlinking %s"
msgstr "Problem ved oppheving av lenkje til %s"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -3550,6 +3549,10 @@ msgstr ""
" -c=? Les denne oppsettsfila.\n"
" -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Intern feil. AllUpgrade ydelagde noko"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s er ingen gyldig DEB-pakke."
diff --git a/po/pl.po b/po/pl.po
index adec14493..022174b04 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2012-07-28 21:53+0200\n"
"Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
"Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -165,7 +165,7 @@ msgstr " Tabela wersji:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -333,7 +333,7 @@ msgid "Couldn't find package %s"
msgstr "Nie udało się odnaleźć pakietu %s"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s zaznaczony jako zainstalowany ręcznie.\n"
@@ -398,7 +398,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "Pomijanie już pobranego pliku \"%s\"\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nie udało się ustalić ilości wolnego miejsca w %s"
@@ -431,7 +431,7 @@ msgstr "Pobieranie źródeł %s\n"
msgid "Failed to fetch some archives."
msgstr "Nie udało się pobrać niektórych archiwów."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "Ukończono pobieranie w trybie samego pobierania"
@@ -908,7 +908,7 @@ msgstr "Nie udało się utworzyć gniazda"
msgid "Could not connect data socket, connection timed out"
msgstr "Nie udało się połączyć gniazda danych, przekroczenie czasu połączenia"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Nie udało się"
@@ -1159,12 +1159,7 @@ msgstr "Błąd wewnętrzny"
msgid "Calculating upgrade... "
msgstr "Obliczanie aktualizacji..."
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Błąd wewnętrzny spowodowany przez AllUpgrade"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Gotowe"
@@ -1251,70 +1246,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Następujące pakiety mają niespełnione zależności:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "ale %s jest zainstalowany"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "ale %s ma zostać zainstalowany"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "ale nie da się go zainstalować"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "ale jest pakietem wirtualnym"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "ale nie jest zainstalowany"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "ale nie zostanie zainstalowany"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " lub"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "Następujące pakiety mają niespełnione zależności:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "Zostaną zainstalowane następujące NOWE pakiety:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "Następujące pakiety zostaną USUNIĘTE:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "Następujące pakiety zostały zatrzymane:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "Następujące pakiety zostaną zaktualizowane:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "Zostaną zainstalowane STARE wersje następujących pakietów:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "Zostaną zmienione następujące zatrzymane pakiety:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (z powodu %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1322,27 +1317,27 @@ msgstr ""
"UWAGA: Zostaną usunięte następujące istotne pakiety.\n"
"NIE należy kontynuować, jeśli nie jest się pewnym tego co się robi!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualizowanych, %lu nowo instalowanych, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu ponownie instalowanych, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu cofniętych wersji, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu usuwanych i %lu nieaktualizowanych.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n"
@@ -1351,7 +1346,7 @@ msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr "[T/n]"
@@ -1359,21 +1354,21 @@ msgstr "[T/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr "[t/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "T"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "Błąd kompilacji wyrażenia regularnego - %s"
@@ -1391,6 +1386,10 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1404,19 +1403,19 @@ msgstr[2] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Błąd wewnętrzny, użyto InstallPackages z uszkodzonymi pakietami!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "Pakiety powinny zostać usunięte, ale Remove jest wyłączone."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "Błąd wewnętrzny, sortowanie niezakończone"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Wystąpił dziwny błąd - rozmiary się nie zgadzają. Proszę to zgłosić pod "
@@ -1424,53 +1423,53 @@ msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Konieczne pobranie %sB/%sB archiwów.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Konieczne pobranie %sB archiwów.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "Po tej operacji zostanie dodatkowo użyte %sB miejsca na dysku.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Po tej operacji zostanie zwolnione %sB miejsca na dysku.\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Niestety w %s nie ma wystarczającej ilości wolnego miejsca."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "Wystąpiły problemy, a użyto -y bez --force-yes"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Nakazano wykonywać tylko trywialne operacje, a ta do nich nie należy."
# Bezpieczniej jest nie używać tu polskich znaków.
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Tak, jestem pewien!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1481,19 +1480,19 @@ msgstr ""
"Aby kontynuować proszę napisać zdanie \"%s\"\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Przerwane."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Kontynuować?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "Nie udało się pobrać niektórych plików"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1501,19 +1500,19 @@ msgstr ""
"Nie udało się pobrać niektórych archiwów, proszę spróbować uruchomić apt-get "
"update lub użyć opcji --fix-missing."
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing i zamiana nośników nie są obecnie obsługiwane"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "Nie udało się poprawić brakujących pakietów."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "Przerywanie instalacji"
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1530,15 +1529,15 @@ msgstr[2] ""
"Następujące pakiety zniknęły z tego systemu, ponieważ wszystkie ich pliki "
"zostały nadpisane przez inne pakiety:"
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr "Uwaga: dpkg wykonał to automatycznie i celowo."
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Nic nie powinno być usuwane, AutoRemover nie zostanie uruchomiony"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1556,15 +1555,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "Następujące informacje mogą pomóc rozwiązać sytuację:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Błąd wewnętrzny spowodowany przez AutoRemover"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -1580,7 +1579,7 @@ msgstr[2] ""
"Następujące pakiety zostały zainstalowane automatycznie i nie są już więcej "
"wymagane:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1595,7 +1594,7 @@ msgstr[2] ""
"%lu pakietów zostało zainstalowanych automatycznie i nie są już więcej "
"wymagane.\n"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] "Aby go usunąć należy użyć \"apt-get autoremove\"."
@@ -1615,7 +1614,7 @@ msgstr ""
"Niespełnione zależności. Proszę spróbować wykonać \"apt-get -f install\" bez "
"pakietów (lub podać rozwiązanie)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1627,64 +1626,64 @@ msgstr ""
"w której niektóre pakiety nie zostały jeszcze utworzone lub przeniesione\n"
"z katalogu Incoming (\"Przychodzące\")."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Pakiety są uszkodzone"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "Zostaną zainstalowane następujące dodatkowe pakiety:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Sugerowane pakiety:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Polecane pakiety:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Pomijanie %s, jest już zainstalowane, a nie została wybrana aktualizacja.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
"Pomijanie %s, nie jest zainstalowane, a wybrano wyłącznie aktualizacje.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"Ponowna instalacja pakietu %s nie jest możliwa, nie może on zostać pobrany.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s jest już w najnowszej wersji.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Wybrano wersję \"%s\" (%s) pakietu \"%s\"\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Wybrano wersję \"%s\" (%s) pakietu \"%s\", z powodu \"%s\"\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr ""
"Pakiet %s nie jest zainstalowany, więc nie zostanie usunięty. Czy chodziło o "
"\"%s\"?\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Pakiet \"%s\" nie jest zainstalowany, więc nie zostanie usunięty\n"
@@ -2266,25 +2265,25 @@ msgstr "Nie udało się pisać do %s"
msgid "IO Error saving source cache"
msgstr "Błąd wejścia/wyjścia przy zapisywaniu podręcznego magazynu źródeł"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr "Wysyłanie scenariusza do mechanizmu rozwiązywania zależności"
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr "Wysyłanie żądania do mechanizmu rozwiązywania zależności"
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr "Przygotowywanie na otrzymanie rozwiązania"
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr ""
"Zewnętrzny mechanizm rozwiązywania zależności zawiódł, bez podania "
"prawidłowego komunikatu o błędzie"
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr "Wykonywanie zewnętrznego mechanizmu rozwiązywania zależności"
@@ -2977,7 +2976,7 @@ msgstr "%limin %lis"
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "Nie odnaleziono wyboru %s"
@@ -3640,7 +3639,7 @@ msgstr "Nie udało się czytanie w czasie liczenia skrótu MD5"
msgid "Problem unlinking %s"
msgstr "Problem przy usuwaniu %s"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -3693,6 +3692,10 @@ msgstr ""
" -c=? Czyta wskazany plik konfiguracyjny.\n"
" -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Błąd wewnętrzny spowodowany przez AllUpgrade"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s nie jest prawidłowym pakietem DEB."
diff --git a/po/pt.po b/po/pt.po
index 98555056b..5376bc3a7 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2012-06-29 15:45+0100\n"
"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -161,7 +161,7 @@ msgstr " Tabela de Versão:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -328,7 +328,7 @@ msgid "Couldn't find package %s"
msgstr "Impossível encontrar o pacote %s"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s está definido para ser instalado manualmente.\n"
@@ -390,7 +390,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "A saltar o ficheiro '%s', já tinha sido feito download'\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Não foi possível determinar o espaço livre em %s"
@@ -423,7 +423,7 @@ msgstr "Obter código fonte %s\n"
msgid "Failed to fetch some archives."
msgstr "Falhou obter alguns arquivos."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "Download completo e em modo de fazer apenas o download"
@@ -897,7 +897,7 @@ msgstr "Não foi possível criar um socket"
msgid "Could not connect data socket, connection timed out"
msgstr "Não foi possível ligar socket de dados, a ligação expirou"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Falhou"
@@ -1149,12 +1149,7 @@ msgstr "Erro interno"
msgid "Calculating upgrade... "
msgstr "A calcular a actualização... "
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Erro Interno, AllUpgrade estragou algo"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Pronto"
@@ -1240,70 +1235,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Os pacotes a seguir têm dependências não satisfeitas:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "mas %s está instalado"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "mas %s está para ser instalado"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "mas não é instalável"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "mas é um pacote virtual"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "mas não está instalado"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "mas não vai ser instalado"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " ou"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "Os pacotes a seguir têm dependências não satisfeitas:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "Serão instalados os seguintes NOVOS pacotes:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "Serão REMOVIDOS os seguintes pacotes:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "Serão mantidos em suas versões actuais os seguintes pacotes:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "Serão actualizados os seguintes pacotes:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "Será feito o DOWNGRADE aos seguintes pacotes:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "Os seguintes pacotes mantidos serão mudados:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (devido a %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1311,27 +1306,27 @@ msgstr ""
"AVISO: Os seguintes pacotes essenciais serão removidos.\n"
"Isso NÃO deverá ser feito a menos que saiba exactamente o que está a fazer!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu a que foi feito o downgrade, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu a remover e %lu não actualizados.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
@@ -1340,7 +1335,7 @@ msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr "[S/n]"
@@ -1348,21 +1343,21 @@ msgstr "[S/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr "s/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "S"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro de compilação de regex - %s"
@@ -1379,6 +1374,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1391,40 +1390,40 @@ msgstr[1] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "Erro Interno, Ordering não terminou"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Estranho... Os tamanhos não coincidiram, escreva para apt@packages.debian.org"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "É necessário obter %sB/%sB de arquivos.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "É necessário obter %sB de arquivos.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr ""
@@ -1432,31 +1431,31 @@ msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
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"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Você não possui espaço livre suficiente em %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "Há problemas e foi utilizado -y sem --force-yes"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Trivial Only especificado mas isto não é uma operação trivial."
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Sim, faça como eu digo!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1467,19 +1466,19 @@ msgstr ""
"Para continuar escreva a frase '%s'\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Abortado."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Deseja continuar?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "Falhou o download de alguns ficheiros"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1487,19 +1486,19 @@ msgstr ""
"Não foi possível obter alguns arquivos, tente talvez correr apt-get update "
"ou tente com --fix-missing?"
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing e troca de mídia não são suportados actualmente"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "Não foi possível corrigir os pacotes em falta."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "A abortar a instalação."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1513,15 +1512,15 @@ msgstr[1] ""
"Os seguintes pacotes desapareceram do seu sistema pois\n"
"todos os ficheiros foram por outros pacotes:"
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr "Nota: Isto foi feito automaticamente e intencionalmente pelo dpkg."
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
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"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1539,15 +1538,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "A seguinte informação pode ajudar a resolver a situação:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Erro Interno, o AutoRemover estragou coisas"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -1559,7 +1558,7 @@ msgstr[1] ""
"Os seguintes pacotes foram instalados automaticamente e já não são "
"necessários:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1568,7 +1567,7 @@ msgstr[0] "O pacote %lu foi instalado automaticamente e já não é necessário.
msgstr[1] ""
"Os pacotes %lu foram instalados automaticamente e já não são necessários.\n"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] "Utilize 'apt-get autoremove' para o remover."
@@ -1586,7 +1585,7 @@ msgstr ""
"Dependências não satisfeitas. Tente 'apt-get -f install' sem nenhum pacote "
"(ou especifique uma solução)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1598,63 +1597,63 @@ msgstr ""
"distribuição unstable em que alguns pacotes pedidos ainda não foram \n"
"criados ou foram movidos do Incoming."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Pacotes estragados"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "Os seguintes pacotes extra serão instalados:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Pacotes sugeridos:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Pacotes recomendados:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Saltando %s, já está instalado e a actualização não está definida.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr "Saltando %s, não está instalado e só são pedidas actualizações.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"A reinstalação de %s não é possível, o download do mesmo não pode ser "
"feito.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s já está na versão mais recente.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Versão seleccionada '%s' (%s) para '%s'\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Versão seleccionada '%s' (%s) para '%s' devido a '%s'\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr ""
"O pacote '%s' não está instalado, por isso não será removido. Queria dizer "
"'%s'?\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "O pacote '%s' não está instalado, por isso não será removido\n"
@@ -2245,23 +2244,23 @@ msgstr "Não conseguiu escrever para %s"
msgid "IO Error saving source cache"
msgstr "Erro de I/O ao gravar a cache de código fonte"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr "Enviar cenário a resolver"
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr "Enviar pedido para resolvedor"
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr "Preparar para receber solução"
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr "O resolvedor externo falhou sem uma mensagem de erro adequada"
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr "Executar resolvedor externo"
@@ -2958,7 +2957,7 @@ msgstr "%limin %lis"
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "A selecção %s não foi encontrada"
@@ -3624,7 +3623,7 @@ msgstr "Falhou ler durante o cálculo de MD5"
msgid "Problem unlinking %s"
msgstr "Problema ao executar unlinking %s"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -3677,6 +3676,10 @@ msgstr ""
" -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/"
"tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Erro Interno, AllUpgrade estragou algo"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s não é um pacote DEB válido."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8e6fc88d5..d258de162 100644
--- 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+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."
@@ -161,7 +161,7 @@ msgstr " Tabela de versão:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -334,7 +334,7 @@ msgid "Couldn't find package %s"
msgstr "Impossível achar pacote %s"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s configurado para instalar manualmente.\n"
@@ -388,7 +388,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "Pulando arquivo já baixado '%s'\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Não foi possível determinar o espaço livre em %s"
@@ -421,7 +421,7 @@ msgstr "Obter fonte %s\n"
msgid "Failed to fetch some archives."
msgstr "Falhou ao buscar alguns arquivos."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "Baixar completo e no modo somente baixar (\"download only\")"
@@ -868,7 +868,7 @@ msgstr "Não foi possível criar um socket"
msgid "Could not connect data socket, connection timed out"
msgstr "Não foi possível conectar um socket de dados, conexão expirou"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Falhou"
@@ -1121,12 +1121,7 @@ msgstr "Erro interno"
msgid "Calculating upgrade... "
msgstr "Calculando atualização... "
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Erro interno, AllUpgrade quebrou coisas"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Pronto"
@@ -1212,70 +1207,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Os pacotes a seguir têm dependências desencontradas:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "mas %s está instalado"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "mas %s está para ser instalado"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "mas não é instalável"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "mas é um pacote virtual"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "mas não está instalado"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "mas não será instalado"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " ou"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "Os pacotes a seguir têm dependências desencontradas:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "Os NOVOS pacotes a seguir serão instalados:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "Os pacotes a seguir serão REMOVIDOS:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "Os pacotes a seguir serão mantidos em suas versões atuais:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "Os pacotes a seguir serão atualizados:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "Os pacotes a seguir serão REVERTIDOS:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "Os seguintes pacotes mantidos serão mudados:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (por causa de %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1284,27 +1279,27 @@ msgstr ""
"Isso NÃO deveria ser feito a menos que você saiba exatamente o que você está "
"fazendo!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu pacotes atualizados, %lu pacotes novos instalados, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu revertidos, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu a serem removidos e %lu não atualizados.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
@@ -1313,7 +1308,7 @@ msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr "[S/n]"
@@ -1321,21 +1316,21 @@ msgstr "[S/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr "[s/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "S"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro de compilação de regex - %s"
@@ -1352,6 +1347,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1364,19 +1363,19 @@ msgstr[1] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Erro interno, InstallPackages foi chamado com pacotes quebrados!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "Pacotes precisam ser removidos mas a remoção está desabilitada."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "Erro interno, Ordenação não finalizou"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Que estranho... Os tamanhos não batem, mande e-mail para apt@packages.debian."
@@ -1384,21 +1383,21 @@ msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "É preciso baixar %sB/%sB de arquivos.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "É preciso baixar %sB de arquivos.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr ""
@@ -1406,31 +1405,31 @@ msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
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"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Você não possui espaço suficiente em %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "Há problemas e -y foi usado sem --force-yes"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "\"Trivial Only\" especificado mas esta não é uma operação trivial."
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Sim, faça o que eu digo!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1441,19 +1440,19 @@ msgstr ""
"Para continuar digite a frase '%s'\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Abortar."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Você quer continuar?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "Alguns arquivos falharam ao baixar"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1461,19 +1460,19 @@ msgstr ""
"Impossível buscar alguns arquivos, talvez executar apt-get update ou tentar "
"com --fix-missing?"
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing e troca de mídia não são suportados atualmente"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "Impossível corrigir pacotes faltantes."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "Abortando instalação."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1483,15 +1482,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr ""
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
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"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1509,15 +1508,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "A informação a seguir pode ajudar a resolver a situação:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Erro Interno, o AutoRemover quebrou coisas"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
#, fuzzy
msgid ""
"The following package was automatically installed and is no longer required:"
@@ -1531,7 +1530,7 @@ msgstr[1] ""
"Os seguintes pacotes foram automaticamente instalados e não são mais "
"requeridos:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, fuzzy, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1543,7 +1542,7 @@ msgstr[1] ""
"Os seguintes pacotes foram automaticamente instalados e não são mais "
"requeridos:"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
#, fuzzy
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1562,7 +1561,7 @@ msgstr ""
"Dependências desencontradas. Tente 'apt-get -f install' sem nenhum pacote "
"(ou especifique uma solução)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1574,59 +1573,59 @@ msgstr ""
"distribuição instável, que alguns pacotes requeridos não foram\n"
"criados ainda ou foram retirados da \"Incoming\"."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Pacotes quebrados"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "Os pacotes extra a seguir serão instalados:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Pacotes sugeridos:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Pacotes recomendados:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Pulando %s, já está instalado e a atualização não está configurada.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, fuzzy, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr "Pulando %s, já está instalado e a atualização não está configurada.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "A reinstalação de %s não é possível, não pode ser baixado.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s já é a versão mais nova.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Versão selecionada %s (%s) para %s\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Versão selecionada %s (%s) para %s\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr "O pacote %s não está instalado, então não será removido\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "O pacote %s não está instalado, então não será removido\n"
@@ -2215,23 +2214,23 @@ msgstr "Impossível escrever para %s"
msgid "IO Error saving source cache"
msgstr "Erro de E/S ao gravar cache fonte"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr ""
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr ""
@@ -2888,7 +2887,7 @@ msgstr ""
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "Seleção %s não encontrada"
@@ -3544,7 +3543,7 @@ msgstr "Falhou ao ler durante o cálculo MD5"
msgid "Problem unlinking %s"
msgstr "Problema removendo %s"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -3599,6 +3598,10 @@ msgstr ""
" -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
"tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Erro interno, AllUpgrade quebrou coisas"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s não é um pacote DEB válido."
diff --git a/po/ro.po b/po/ro.po
index 1ce07f594..3eb64a846 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ro\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+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"
@@ -162,7 +162,7 @@ msgstr " Tabela de versiuni:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -331,7 +331,7 @@ msgid "Couldn't find package %s"
msgstr "Nu pot găsi pachetul %s"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s este marcat ca fiind instalat manual.\n"
@@ -386,7 +386,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "Sar peste fișierul deja descărcat '%s'\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "N-am putut determina spațiul disponibil în %s"
@@ -419,7 +419,7 @@ msgstr "Aducere sursa %s\n"
msgid "Failed to fetch some archives."
msgstr "Eșec la aducerea unor arhive."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "Descărcare completă și în modul doar descărcare"
@@ -869,7 +869,7 @@ msgstr ""
"Nu s-a putut realiza conectarea la socket-ul de date, timpul de conectare a "
"expirat"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Eșec"
@@ -1123,12 +1123,7 @@ msgstr "Eroare internă"
msgid "Calculating upgrade... "
msgstr "Calculez înnoirea... "
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Terminat"
@@ -1215,70 +1210,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Următoarele pachete au dependențe neîndeplinite:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "dar %s este instalat"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "dar %s este pe cale de a fi instalat"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "dar nu este instalabil"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "dar este un pachet virtual"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "dar nu este instalat"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "dar nu este pe cale să fie instalat"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " sau"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "Următoarele pachete au dependențe neîndeplinite:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "Următoarele pachete NOI vor fi instalate:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "Următoarele pachete vor fi ȘTERSE:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "Următoarele pachete au fost reținute:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "Următoarele pachete vor fi ÎNNOITE:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "Următoarele pachete vor fi DE-GRADATE:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "Următoarele pachete ținute vor fi schimbate:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (datorită %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1286,27 +1281,27 @@ msgstr ""
"AVERTISMENT: Următoarele pachete esențiale vor fi șterse.\n"
"Aceasta NU ar trebui făcută decât dacă știți exact ce vreți!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu înnoite, %lu nou instalate, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalate, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu de-gradate, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu de șters și %lu neînnoite.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu instalate sau șterse incomplet.\n"
@@ -1315,7 +1310,7 @@ msgstr "%lu instalate sau șterse incomplet.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr ""
@@ -1323,21 +1318,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "Y"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "Eroare de compilare expresie regulată - %s"
@@ -1355,6 +1350,10 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1368,72 +1367,72 @@ msgstr[2] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Eroare internă, InstallPackages a fost apelat cu pachete deteriorate!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "Pachete trebuiesc șterse dar ștergerea este dezactivată."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "Eroare internă, Ordering nu s-a terminat"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Ce ciudat... Dimensiunile nu se potrivesc, scrieți la apt@packages.debian.org"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Este nevoie să descărcați %sB/%sB de arhive.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Este nevoie să descărcați %sB de arhive.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "După această operație vor fi folosiți din disc încă %sB.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
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"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Nu aveți suficient spațiu în %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "Sunt unele probleme și -y a fost folosit fără --force-yes"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"A fost specificat 'doar neimportant' dar nu este o operațiune neimportantă."
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Da, fă cum îți spun!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1444,19 +1443,19 @@ msgstr ""
"Pentru a continua tastați fraza '%s'\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Renunțare."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Vreți să continuați?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "Descărcarea unor fișiere a eșuat"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1464,19 +1463,19 @@ msgstr ""
"Nu s-au putut aduce unele arhive, poate ar fi o idee bună să rulați 'apt-get "
"update' sau încercați cu --fix-missing?"
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing și schimbul de mediu nu este deocamdată suportat"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "Nu pot corecta pachetele lipsă."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "Abandonez instalarea."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1487,16 +1486,16 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr ""
# XXX: orice sugestie este bine-venită
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
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"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1515,15 +1514,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "Următoarele informații ar putea să vă ajute la rezolvarea situației:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Eroare internă, AutoRemover a deteriorat diverse chestiuni"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
#, fuzzy
msgid ""
"The following package was automatically installed and is no longer required:"
@@ -1537,7 +1536,7 @@ msgstr[1] ""
msgstr[2] ""
"Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, fuzzy, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1549,7 +1548,7 @@ msgstr[1] ""
msgstr[2] ""
"Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
#, fuzzy
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1569,7 +1568,7 @@ msgstr ""
"Dependențe neîndeplinite. Încercați 'apt-get -f install' fără nici un pachet "
"(sau oferiți o altă soluție)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1582,59 +1581,59 @@ msgstr ""
"pachete\n"
"cerute n-au fost create încă sau au fost mutate din Incoming."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Pachete deteriorate"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "Următoarele extra pachete vor fi instalate:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Pachete sugerate:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Pachete recomandate:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Sar peste %s, este deja instalat și înnoirea nu este activată.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, fuzzy, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr "Sar peste %s, este deja instalat și înnoirea nu este activată.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Reinstalarea lui %s nu este posibilă, nu poate fi descărcat.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s este deja la cea mai nouă versiune.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Versiune selectată %s (%s) pentru %s\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Versiune selectată %s (%s) pentru %s\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr "Pachetul %s nu este instalat, așa încât nu este șters\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Pachetul %s nu este instalat, așa încât nu este șters\n"
@@ -2223,23 +2222,23 @@ msgstr "Nu s-a putut scrie în %s"
msgid "IO Error saving source cache"
msgstr "Eroare IO în timpul salvării sursei cache"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr ""
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr ""
@@ -2892,7 +2891,7 @@ msgstr ""
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "Selecția %s nu a fost găsită"
@@ -3553,7 +3552,7 @@ msgstr "Eșec la citire în timpul calculului sumei MD5"
msgid "Problem unlinking %s"
msgstr "Problemă la desfacerea %s"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -3607,6 +3606,10 @@ msgstr ""
" -o=? Ajustează o opțiune de configurare arbitrară, ex.: -o dir::cache=/"
"tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s nu este un pachet DEB valid."
diff --git a/po/ru.po b/po/ru.po
index 5aabe0610..9c1826b4c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt rev2227.1.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2012-06-30 08:47+0400\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -166,7 +166,7 @@ msgstr " Таблица версий:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -331,7 +331,7 @@ msgid "Couldn't find package %s"
msgstr "Не удалось найти пакет %s"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s установлен вручную.\n"
@@ -393,7 +393,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "Пропускаем уже скачанный файл «%s»\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Не удалось определить количество свободного места в %s"
@@ -426,7 +426,7 @@ msgstr "Получение исходного кода %s\n"
msgid "Failed to fetch some archives."
msgstr "Некоторые архивы не удалось получить."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "Указан режим «только скачивание», и скачивание завершено"
@@ -907,7 +907,7 @@ msgstr ""
"Не удалось присоединиться к сокету данных, время на установление соединения "
"истекло"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Неудачно"
@@ -1157,12 +1157,7 @@ msgstr "Внутренняя ошибка"
msgid "Calculating upgrade... "
msgstr "Расчёт обновлений…"
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Внутренняя ошибка, AllUpgrade всё поломал"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Готово"
@@ -1251,71 +1246,71 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Пакеты, имеющие неудовлетворённые зависимости:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "но %s уже установлен"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "но %s будет установлен"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "но он не может быть установлен"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "но это виртуальный пакет"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "но он не установлен"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "но он не будет установлен"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " или"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "Пакеты, имеющие неудовлетворённые зависимости:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "НОВЫЕ пакеты, которые будут установлены:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "Пакеты, которые будут УДАЛЕНЫ:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "Пакеты, которые будут оставлены в неизменном виде:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "Пакеты, которые будут обновлены:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "Пакеты, будут заменены на более СТАРЫЕ версии:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr ""
"Пакеты, которые должны были бы остаться без изменений, но будут заменены:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (вследствие %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1323,27 +1318,27 @@ msgstr ""
"ВНИМАНИЕ: Эти существенно важные пакеты будут удалены.\n"
"НЕ ДЕЛАЙТЕ этого, если вы НЕ представляете себе все возможные последствия!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "обновлено %lu, установлено %lu новых пакетов, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "переустановлено %lu переустановлено, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu пакетов заменены на старые версии, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "для удаления отмечено %lu пакетов, и %lu пакетов не обновлено.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "не установлено до конца или удалено %lu пакетов.\n"
@@ -1352,7 +1347,7 @@ msgstr "не установлено до конца или удалено %lu п
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr "[Д/н]"
@@ -1360,21 +1355,21 @@ msgstr "[Д/н]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "д"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr "н"
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "Ошибка компиляции регулярного выражения — %s"
@@ -1392,6 +1387,10 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1405,41 +1404,41 @@ msgstr[2] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
"Внутренняя ошибка, InstallPackages была вызвана с неработоспособными "
"пакетами!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "Пакеты необходимо удалить, но удаление запрещено."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "Внутренняя ошибка, Ordering не завершилась"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr "Странно. Несовпадение размеров, напишите на apt@packages.debian.org"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Необходимо скачать %sB/%sB архивов.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Необходимо скачать %sБ архивов.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr ""
@@ -1448,23 +1447,23 @@ msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr ""
"После данной операции, объём занятого дискового пространства уменьшится на "
"%sB.\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Недостаточно свободного места в %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "Существуют проблемы, а параметр -y указан без --force-yes"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"Запрошено выполнение только тривиальных операций, но это не тривиальная "
@@ -1472,11 +1471,11 @@ msgstr ""
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Да, делать, как я скажу!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1487,19 +1486,19 @@ msgstr ""
"Чтобы продолжить, введите фразу: «%s»\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Аварийное завершение."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Хотите продолжить?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "Некоторые файлы скачать не удалось"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1507,19 +1506,19 @@ msgstr ""
"Невозможно получить некоторые архивы, вероятно надо запустить apt-get update "
"или попытаться повторить запуск с ключом --fix-missing"
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing и смена носителя в данный момент не поддерживаются"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "Невозможно исправить ситуацию с пропущенными пакетами."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "Аварийное завершение установки."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1536,15 +1535,15 @@ msgstr[2] ""
"Следующие пакеты исчез из системы, так как все их файлы\n"
"теперь берутся из других пакетов:"
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr "Замечание: это сделано автоматически и специально программой dpkg."
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Не предполагалось удалять stuff, невозможно запустить AutoRemover"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1562,15 +1561,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "Следующая информация, возможно, поможет вам:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Внутренняя ошибка, AutoRemover всё поломал"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -1582,7 +1581,7 @@ msgstr[1] ""
msgstr[2] ""
"Следующие пакеты устанавливались автоматически и больше не требуются:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1591,7 +1590,7 @@ msgstr[0] "%lu пакет был установлен автоматически
msgstr[1] "%lu пакета было установлено автоматически и больше не требуется.\n"
msgstr[2] "%lu пакетов было установлены автоматически и больше не требуются.\n"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] "Для его удаления используйте «apt-get autoremove»."
@@ -1612,7 +1611,7 @@ msgstr ""
"Неудовлетворённые зависимости. Попытайтесь выполнить «apt-get -f install», "
"не указывая имени пакета, (или найдите другое решение)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1623,62 +1622,62 @@ msgstr ""
"или же используете нестабильную версию дистрибутива, где запрошенные вами\n"
"пакеты ещё не созданы или были удалены из Incoming."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Сломанные пакеты"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "Будут установлены следующие дополнительные пакеты:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Предлагаемые пакеты:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Рекомендуемые пакеты:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Пропускается %s — пакет уже установлен и нет команды upgrade.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
"Пропускается %s — пакет не установлен, а запрошено только обновление.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Переустановка %s невозможна, он не скачивается.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "Уже установлена самая новая версия %s.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Выбрана версия «%s» (%s) для «%s»\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Выбрана версия «%s» (%s) для «%s» из-за «%s»\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr ""
"Пакет «%s» не установлен, поэтому не может быть удалён. Возможно имелся в "
"виду «%s»?\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Пакет «%s» не установлен, поэтому не может быть удалён\n"
@@ -2263,23 +2262,23 @@ msgstr "Невозможно записать в %s"
msgid "IO Error saving source cache"
msgstr "Ошибка ввода/вывода при попытке сохранить кэш источников"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr "Отправка сценария решателю"
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr "Отправка запроса решателю"
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr "Подготовка к приёму решения"
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr "Внешний решатель завершился с ошибкой не передав сообщения об ошибке"
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr "Запустить внешний решатель"
@@ -2969,7 +2968,7 @@ msgstr "%liмин %liс"
msgid "%lis"
msgstr "%liс"
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "Не найдено: %s"
@@ -3640,7 +3639,7 @@ msgstr "Ошибка чтения во время вычисления MD5"
msgid "Problem unlinking %s"
msgstr "Не удалось удалить %s"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -3693,6 +3692,10 @@ msgstr ""
" -c=? читать указанный файл настройки\n"
" -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Внутренняя ошибка, AllUpgrade всё поломал"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s не является правильным DEB-пакетом."
diff --git a/po/sk.po b/po/sk.po
index 6e9f85197..bd20eb3cd 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2012-06-28 20:49+0100\n"
"Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -162,7 +162,7 @@ msgstr " Tabuľka verzií:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -327,7 +327,7 @@ msgid "Couldn't find package %s"
msgstr "Balík %s sa nedá nájsť"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s je označený ako manuálne nainštalovaný.\n"
@@ -390,7 +390,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "Preskakuje sa už stiahnutý súbor „%s“\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Na %s sa nedá zistiť veľkosť voľného miesta"
@@ -423,7 +423,7 @@ msgstr "Stiahnuť zdroj %s\n"
msgid "Failed to fetch some archives."
msgstr "Zlyhalo stiahnutie niektorých archívov."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "Sťahovanie ukončené v režime „iba stiahnuť“"
@@ -888,7 +888,7 @@ msgstr "Nedá sa vytvoriť socket"
msgid "Could not connect data socket, connection timed out"
msgstr "Nedá sa pripojiť dátový socket, uplynul čas spojenia"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Chyba"
@@ -1136,12 +1136,7 @@ msgstr "Vnútorná chyba"
msgid "Calculating upgrade... "
msgstr "Prepočítava sa aktualizácia... "
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Vnútorná chyba, AllUpgrade pokazil veci"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Hotovo"
@@ -1228,70 +1223,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Nasledovné balíky majú nesplnené závislosti:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "ale nainštalovaný je %s"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "ale inštalovať sa bude %s"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "ale sa nedá nainštalovať"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "ale je to virtuálny balík"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "ale nie je nainštalovaný"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "ale sa nebude inštalovať"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " alebo"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "Nasledovné balíky majú nesplnené závislosti:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "Nainštalujú sa nasledovné NOVÉ balíky:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "Nasledovné balíky sa ODSTRÁNIA:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "Nasledovné balíky sa ponechajú v súčasnej verzii:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "Nasledovné balíky sa aktualizujú:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "Nasledovné balíky sa DEGRADUJÚ:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "Nasledovné pridržané balíky sa zmenia:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (kvôli %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1299,27 +1294,27 @@ msgstr ""
"UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n"
"Ak presne neviete, čo robíte, tak to NEROBTE!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualizovaných, %lu nových nainštalovaných, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinštalovaných, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu degradovaných, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu na odstránenie a %lu neaktualizovaných.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n"
@@ -1328,7 +1323,7 @@ msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr ""
@@ -1336,21 +1331,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "Chyba pri preklade regulárneho výrazu - %s"
@@ -1368,6 +1363,10 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1381,19 +1380,19 @@ msgstr[2] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Vnútorná chyba, InstallPackages bolo volané s poškodenými balíkmi!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "Je potrebné odstránenie balíka, ale funkcia Odstrániť je vypnutá."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "Vnútorná chyba, Triedenie sa neukončilo"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Nezvyčajná udalosť... Veľkosti nesúhlasia, pošlite e-mail na apt@packages."
@@ -1401,52 +1400,52 @@ msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Je potrebné stiahnuť %sB/%sB archívov.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Je potrebné stiahnuť %sB archívov.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "Po tejto operácii sa na disku použije ďalších %sB.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Po tejto operácii sa na disku uvoľní %sB.\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Na %s nemáte dostatok voľného miesta."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "Nastali problémy a -y bolo použité bez --force-yes"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Zadané „iba triviálne“, ale toto nie je triviálna operácia."
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Áno, urob to, čo vravím!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1457,19 +1456,19 @@ msgstr ""
"Ak chcete pokračovať, opíšte frázu „%s“\n"
" ?]"
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Prerušené."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Chcete pokračovať?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "Niektoré súbory sa nedajú stiahnuť"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1477,19 +1476,19 @@ msgstr ""
"Niektoré archívy sa nedajú stiahnuť. Skúste spustiť apt-get update alebo --"
"fix-missing"
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing a výmena nosiča nie sú momentálne podporované"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "Chýbajúce balíky sa nedajú opraviť."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "Inštalácia sa prerušuje."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1506,15 +1505,15 @@ msgstr[2] ""
"Nasledovné balíky zmizli z vášho systému, pretože\n"
"všetky súbory boli prepísané inými balíkmi:"
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr "Pozn.: Toto robí dpkg automaticky a zámerne."
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Nemajú sa odstraňovať veci, nespustí sa AutoRemover"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1532,15 +1531,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
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:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Vnútorná chyba, AutoRemover niečo pokazil"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -1553,7 +1552,7 @@ msgstr[1] ""
msgstr[2] ""
"Nasledovné balíky boli nainštalované automaticky a už viac nie sú potrebné:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1565,7 +1564,7 @@ msgstr[1] ""
msgstr[2] ""
"%lu balíkov bolo nainštalovaných automaticky a už viac nie sú potrebné.\n"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] "Na jeho odstránenie použite „apt-get autoremove“."
@@ -1584,7 +1583,7 @@ msgstr ""
"Nesplnené závislosti. Skúste spustiť „apt-get -f install“ bez balíkov (alebo "
"navrhnite riešenie)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1596,62 +1595,62 @@ msgstr ""
"požadované balíky ešte neboli vytvorené alebo presunuté z fronty\n"
"Novoprichádzajúcich (Incoming) balíkov."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Poškodené balíky"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "Nainštalujú sa nasledovné extra balíky:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Navrhované balíky:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Odporúčané balíky:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Preskakuje sa %s, pretože je už nainštalovaný.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
"Preskakuje sa %s, nie je nainštalovaný a bola vy6iadan8 iba aktualizácia.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Nie je možná reinštalácia %s, pretože sa nedá stiahnuť.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s je už najnovšej verzie.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Vybraná verzia „%s“ (%s) pre „%s“\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Vybraná verzia „%s“ (%s) pre „%s“ kvôli „%s“\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr ""
"Balík „%s“ nie je nainštalovaný, nedá sa teda odstrániť. Mali ste na mysli "
"„%s“?\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Balík „%s“ nie je nainštalovaný, nedá sa teda odstrániť\n"
@@ -2228,23 +2227,23 @@ msgstr "Do %s sa nedá zapisovať"
msgid "IO Error saving source cache"
msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäti"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr "Poslať scénár riešiteľovi"
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr "Poslať požiadavku riešiteľovi"
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr "Pripraviť sa na prijatie riešenia"
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr "Externý riešiteľ zlyhal bez uvedenia chybovej správy"
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr "Spustiť externého riešiteľa"
@@ -2919,7 +2918,7 @@ msgstr "%li min %li s"
msgid "%lis"
msgstr "%li s"
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "Voľba %s nenájdená"
@@ -3574,7 +3573,7 @@ msgstr "Chyba čítania pri výpočte MD5"
msgid "Problem unlinking %s"
msgstr "Problém s odlinkovaním %s"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -3626,6 +3625,10 @@ msgstr ""
" -c=? Načíta tento konfiguračný súbor\n"
" -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Vnútorná chyba, AllUpgrade pokazil veci"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s nie je platný balík DEB."
diff --git a/po/sl.po b/po/sl.po
index eec59f42f..16b5499fc 100644
--- 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2012-06-27 21:29+0000\n"
"Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -160,7 +160,7 @@ msgstr " Preglednica različic:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -325,7 +325,7 @@ msgid "Couldn't find package %s"
msgstr "Ni mogoče najti paketa %s"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s je bil nastavljen na ročno nameščen.\n"
@@ -387,7 +387,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "Preskok že prejete datoteke '%s'\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Ni mogoče določiti prostega prostora v %s"
@@ -420,7 +420,7 @@ msgstr "Dobi vir %s\n"
msgid "Failed to fetch some archives."
msgstr "Nekaterih arhivov ni mogoče pridobiti."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "Prejem je dokončan in uporabljen je način samo prejema"
@@ -884,7 +884,7 @@ msgstr "Ni mogoče ustvariti vtiča"
msgid "Could not connect data socket, connection timed out"
msgstr "Ni mogoče povezati podatkovnega vtiča. Povezava je zakasnela."
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Spodletelo"
@@ -1132,12 +1132,7 @@ msgstr "Notranja napaka"
msgid "Calculating upgrade... "
msgstr "Preračunavanje nadgradnje ... "
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Notranja napaka zaradi AllUpgrade."
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Opravljeno"
@@ -1225,70 +1220,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Naslednji paketi imajo nerešene odvisnosti:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "vendar je paket %s nameščen"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "vendar bo paket %s nameščen"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "vendar se ga ne da namestiti"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "vendar je navidezen paket"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "vendar ni nameščen"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "vendar ne bo nameščen"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " ali"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "Naslednji paketi imajo nerešene odvisnosti:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "Naslednji NOVI paketi bodo nameščeni:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "Naslednji novi paketi bodo ODSTRANJENI:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "Naslednji paketi so bili zadržani:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "Naslednji paketi bodo nadgrajeni:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "Naslednji paketi bodo POSTARANI:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "Naslednji zadržani paketi bodo spremenjeni:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (zaradi %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1296,27 +1291,27 @@ msgstr ""
"OPOZORILO: Naslednji nujni paketi bodo odstranjeni.\n"
"Tega NE storite, razen če ne veste natanko kaj počenjate!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu nadgrajenih, %lu na novo nameščenih, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu posodobljenih, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu postaranih, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ne popolnoma nameščenih ali odstranjenih.\n"
@@ -1325,7 +1320,7 @@ msgstr "%lu ne popolnoma nameščenih ali odstranjenih.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr ""
@@ -1333,21 +1328,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "Napaka med prevajanjem logičnega izraza - %s"
@@ -1366,6 +1361,10 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1380,19 +1379,19 @@ msgstr[3] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Notranja napaka, NamestiPakete je bil klican z pokvarjenimi paketi!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "Odstraniti je treba pakete, a je odstranjevanje onemogočeno."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "Notranja napaka, Urejanje se ni končalo"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Kako čudno ... Velikosti se ne ujemata, pošljite sporočilo na apt@packages."
@@ -1400,52 +1399,52 @@ msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Potrebno je dobiti %sB/%sB arhivov.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Potrebno je dobiti %sB arhivov.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "Po tem opravilu bo porabljenega %sB dodatnega prostora.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Po tem opravilu bo sproščenega %sB prostora na disku.\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Na %s je premalo prostora."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "Prišlo je do težav in -y je bil uporabljen brez --force-yes"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Navedena je možnost Samo preprosto, a to opravilo ni preprosto."
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Da, naredi tako kot pravim!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1456,19 +1455,19 @@ msgstr ""
"Za nadaljevanje vtipkajte frazo '%s'\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Prekini."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Ali želite nadaljevati?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "Prejem nekaterih datotek ni uspel"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1476,19 +1475,19 @@ msgstr ""
"Nekaterih arhivov ni mogoče dobiti. Poskusite uporabiti apt-get update ali --"
"fix-missing."
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing in izmenjava medija trenutno nista podprta"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "Ni mogoče popraviti manjkajočih paketov."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "Prekinjanje namestitve."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1508,17 +1507,17 @@ msgstr[3] ""
"Naslednji paketi so izginili z vašega sistema, ker so vse\n"
"datoteke prepisali drugi paketi:"
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr "Opomba: To je dpkg storil samodejno in namenoma."
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"Program ne bi smel brisati stvari, ni mogoče zagnati "
"SamodejnegaOdstranjevalnika"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1537,15 +1536,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "Naslednji podatki vam bodo morda pomagali rešiti težavo:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Notranja napaka, SamodejniOdstranjevalnik je pokvaril stvari"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -1557,7 +1556,7 @@ msgstr[2] ""
"Naslednja paketa sta bila samodejno nameščena in nista več zahtevana:"
msgstr[3] "Naslednji paketi so bili samodejno nameščeni in niso več zahtevani:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1567,7 +1566,7 @@ msgstr[1] "%lu paket je bil samodejno nameščen in ni bil več zahtevan.\n"
msgstr[2] "%lu paketa sta bila samodejno nameščena in nista več zahtevana.\n"
msgstr[3] "%lu paketi so bili samodejno nameščeni in niso več zahtevani.\n"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] "Uporabite 'apt-get autoremove' za njihovo odstranitev."
@@ -1587,7 +1586,7 @@ msgstr ""
"Nerešene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali "
"navedite rešitev)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1599,60 +1598,60 @@ msgstr ""
", da nekateri zahtevani paketi še niso ustvarjeni ali premaknjeni\n"
" iz Prihajajočega."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Pokvarjeni paketi"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "Naslednji dodatni paketi bodo nameščeni:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Predlagani paketi:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Priporočeni paketi:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "%s je preskočen, ker je že nameščen in ne potrebuje nadgradnje.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr "Preskok %s, ni nameščen in zahtevane so le nadgradnje\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Ponovna namestitev %s ni možna, ker prejem ni možen.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "Najnovejša različica %s je že nameščena.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Izbrana različica '%s' (%s) za '%s'\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Izbrana različica '%s' (%s) za '%s' namesto '%s'\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr ""
"Paket '%s' ni nameščen, zato ni bil odstranjen. Ali ste mislili '%s'?\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Paket '%s' ni nameščen, zato ni bil odstranjen\n"
@@ -2230,23 +2229,23 @@ msgstr "Ni mogoče pisati na %s"
msgid "IO Error saving source cache"
msgstr "Napaka VI med shranjevanjem predpomnilnika virov"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr "Pošlji scenarij reševalniku"
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr "Pošlji zahtevo reševalniku"
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr "Priprava za rešitev prejemanja"
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr "Zunanji reševalnik je spodletel brez pravega sporočila o napakah"
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr "Izvedi zunanji reševalnik"
@@ -2927,7 +2926,7 @@ msgstr "%limin %lis"
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "Izbire %s ni mogoče najti"
@@ -3581,7 +3580,7 @@ msgstr "Med računanjem MD5 ni mogoče brati"
msgid "Problem unlinking %s"
msgstr "Napaka med odvezovanjem %s"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -3635,6 +3634,10 @@ msgstr ""
" -c=? Prebere podano datoteko z nastavitvami\n"
" -o=? Nastavi poljubno nastavitveno možnost, npr. -o dir::cache=/tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Notranja napaka zaradi AllUpgrade."
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s ni veljaven paket DEB."
diff --git a/po/sv.po b/po/sv.po
index a66c9ec08..55b56e645 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2010-08-24 21:18+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <debian-l10n-swedish@debian.org>\n"
@@ -160,7 +160,7 @@ msgstr " Versionstabell:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -328,7 +328,7 @@ msgid "Couldn't find package %s"
msgstr "Kunde inte hitta paketet %s"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s är satt till manuellt installerad.\n"
@@ -388,7 +388,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "Hoppar över redan hämtade filen \"%s\"\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kunde inte fastställa ledigt utrymme i %s"
@@ -421,7 +421,7 @@ msgstr "Hämtar källkoden %s\n"
msgid "Failed to fetch some archives."
msgstr "Misslyckades med att hämta vissa arkiv."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "Hämtningen färdig i \"endast-hämta\"-läge"
@@ -867,7 +867,7 @@ msgstr "Kunde inte skapa ett uttag (socket)"
msgid "Could not connect data socket, connection timed out"
msgstr "Kunde inte ansluta datauttaget (socket), inget svar inom tidsgräns"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Misslyckades"
@@ -1123,12 +1123,7 @@ msgstr "Internt fel"
msgid "Calculating upgrade... "
msgstr "Beräknar uppgradering... "
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Internt fel, AllUpgrade förstörde något"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Färdig"
@@ -1214,70 +1209,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Följande paket har beroenden som inte kan tillfredsställas:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "men %s är installerat"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "men %s kommer att installeras"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "men det kan inte installeras"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "men det är ett virtuellt paket"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "men det är inte installerat"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "men det kommer inte att installeras"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " eller"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "Följande paket har beroenden som inte kan tillfredsställas:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "Följande NYA paket kommer att installeras:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "Följande paket kommer att TAS BORT:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "Följande paket har hållits tillbaka:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "Följande paket kommer att uppgraderas:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "Följande paket kommer att NEDGRADERAS:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "Följande tillbakahållna paket kommer att ändras:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (på grund av %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1285,27 +1280,27 @@ msgstr ""
"VARNING: Följande systemkritiska paket kommer att tas bort.\n"
"Detta bör INTE genomföras såvida du inte vet exakt vad du gör!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu att uppgradera, %lu att nyinstallera, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu att installera om, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu att nedgradera, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu att ta bort och %lu att inte uppgradera.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu är inte helt installerade eller borttagna.\n"
@@ -1314,7 +1309,7 @@ msgstr "%lu är inte helt installerade eller borttagna.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr "[J/n]"
@@ -1322,21 +1317,21 @@ msgstr "[J/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr "[j/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "J"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fel vid kompilering av reguljärt uttryck - %s"
@@ -1353,6 +1348,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1365,19 +1364,19 @@ msgstr[1] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Internt fel. InstallPackages anropades med trasiga paket!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "Paketen måste tas bort men \"Remove\" är inaktiverat."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "Internt fel. Sorteringen färdigställdes inte"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Konstigt... storlekarna stämde inte överens, skicka e-post till apt@packages."
@@ -1385,21 +1384,21 @@ msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Behöver hämta %sB/%sB arkiv.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Behöver hämta %sB arkiv.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr ""
@@ -1407,31 +1406,31 @@ msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Efter denna åtgärd kommer %sB att frigöras på disken.\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s"
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "Problem har uppstått och -y användes utan --force-yes"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "\"Trivial Only\" angavs, men detta är inte en trivial handling."
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Ja, gör som jag säger!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1443,19 +1442,19 @@ msgstr ""
" ?] "
# Visas då man svarar nej
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Avbryter."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Vill du fortsätta?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "Misslyckades med att hämta vissa filer"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1463,19 +1462,19 @@ msgstr ""
"Vissa arkiv kunte inte hämtas. Prova att köra \"apt-get update\" eller med --"
"fix-missing."
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing och mediabyte stöds inte för tillfället"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "Kunde inte korrigera saknade paket."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "Avbryter installationen."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1489,16 +1488,16 @@ msgstr[1] ""
"Följande paket har försvunnit från ditt system eftersom\n"
"alla filer har skrivits över av andra paket:"
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr "Observera: Detta sker med automatik och vid behov av dpkg."
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
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"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1516,15 +1515,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
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:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Internt fel, AutoRemover förstörde något"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -1535,7 +1534,7 @@ msgstr[0] ""
msgstr[1] ""
"Följande paket har installerats automatiskt och är inte längre nödvändiga:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1545,7 +1544,7 @@ msgstr[0] ""
msgstr[1] ""
"%lu paket blev installerade automatiskt och är inte längre nödvändiga.\n"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
#, fuzzy
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1564,7 +1563,7 @@ msgstr ""
"Otillfredsställda beroenden. Prova med \"apt-get -f install\" utan paket "
"(eller ange en lösning)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1576,62 +1575,62 @@ msgstr ""
"att några nödvändiga paket ännu inte har skapats eller flyttats\n"
"ut från \"Incoming\"."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Trasiga paket"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "Följande ytterligare paket kommer att installeras:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Föreslagna paket:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Rekommenderade paket:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Hoppar över %s, det är redan installerat och uppgradering har inte valts.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
"Hoppar över %s, det är inte installerat och endast uppgraderingar har "
"begärts.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Ominstallation av %s är inte möjlig, det kan inte hämtas.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s är redan den senaste versionen.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Valde version \"%s\" (%s) för \"%s\"\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Valde version \"%s\" (%s) för \"%s\"\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr "Paketet %s är inte installerat, så det tas inte bort\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Paketet %s är inte installerat, så det tas inte bort\n"
@@ -2222,23 +2221,23 @@ msgstr "Kunde inte skriva till %s"
msgid "IO Error saving source cache"
msgstr "In-/utfel vid lagring av källcache"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr ""
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr ""
@@ -2916,7 +2915,7 @@ msgstr "%limin %lis"
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "Valet %s hittades inte"
@@ -3577,7 +3576,7 @@ msgstr "Misslyckades med att läsa vid beräkning av MD5"
msgid "Problem unlinking %s"
msgstr "Problem med att länka ut %s"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -3630,6 +3629,10 @@ msgstr ""
" -c=? Läs denna konfigurationsfil.\n"
" -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Internt fel, AllUpgrade förstörde något"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s är inte ett giltigt DEB-paket."
diff --git a/po/th.po b/po/th.po
index 7d86b0746..1fb63880f 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2014-04-20 09:38+0700\n"
"Last-Translator: Theppitak Karoonboonyanan <thep@debian.org>\n"
"Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -158,7 +158,7 @@ msgstr " ตารางรุ่น:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -325,7 +325,7 @@ msgid "Couldn't find package %s"
msgstr "ไม่พบแพกเกจ %s"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "กำหนด %s ให้เป็นการติดตั้งแบบเลือกเองแล้ว\n"
@@ -384,7 +384,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "จะข้ามแฟ้ม '%s' ที่ดาวน์โหลดไว้แล้ว\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "ไม่สามารถคำนวณพื้นที่ว่างใน %s"
@@ -417,7 +417,7 @@ msgstr "ดาวน์โหลดซอร์ส %s\n"
msgid "Failed to fetch some archives."
msgstr "ไม่สามารถดาวน์โหลดบางแฟ้ม"
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "ดาวน์โหลดสำเร็จแล้ว และอยู่ในโหมดดาวน์โหลดอย่างเดียว"
@@ -900,7 +900,7 @@ msgstr "ไม่สามารถสร้างซ็อกเก็ต"
msgid "Could not connect data socket, connection timed out"
msgstr "ไม่สามารถเชื่อมต่อซ็อกเก็ตข้อมูล เนื่องจากหมดเวลาคอย"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "ล้มเหลว"
@@ -1148,11 +1148,7 @@ msgstr "ข้อผิดพลาดภายใน"
msgid "Calculating upgrade... "
msgstr "กำลังคำนวณการปรับรุ่น... "
-#: apt-private/private-upgrade.cc:30
-msgid "Internal error, Upgrade broke stuff"
-msgstr "เกิดข้อผิดพลาดภายใน: การปรับรุ่นทำความเสียหาย"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "เสร็จแล้ว"
@@ -1234,70 +1230,70 @@ msgstr "[สามารถปรับรุ่นจาก: %s]"
msgid "[residual-config]"
msgstr "[ค่าตั้งตกค้าง]"
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "แพกเกจต่อไปนี้ขาดแพกเกจที่ต้องใช้:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "แต่รุ่นที่ติดตั้งไว้คือ %s"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "แต่รุ่นที่จะติดตั้งคือ %s"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "แต่ไม่สามารถติดตั้งได้"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "แต่แพกเกจนี้เป็นแพกเกจเสมือน"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "แต่ได้ติดตั้งไว้"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "แต่แพกเกจนี้จะไม่ถูกติดตั้ง"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " หรือ"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "แพกเกจต่อไปนี้ขาดแพกเกจที่ต้องใช้:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "จะติดตั้งแพกเกจ *ใหม่* ต่อไปนี้:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "จะ *ลบ* แพกเกจต่อไปนี้:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "จะคงรุ่นแพกเกจต่อไปนี้:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ขึ้น:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ *ลง*:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "จะเปลี่ยนแปลงรายการคงรุ่นแพกเกจต่อไปนี้:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (เนื่องจาก %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1305,27 +1301,27 @@ msgstr ""
"*คำเตือน*: แพกเกจที่จำเป็นต่อไปนี้จะถูกถอดถอน\n"
"คุณ *ไม่ควร* ทำเช่นนี้ นอกจากคุณเข้าใจสิ่งที่จะทำ!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "ปรับรุ่นขึ้น %lu, ติดตั้งใหม่ %lu, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "ติดตั้งซ้ำ %lu, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "ปรับรุ่นลง %lu, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "ถอดถอน %lu และไม่ปรับรุ่น %lu\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "ติดตั้งหรือถอดถอนไม่ครบ %lu\n"
@@ -1334,7 +1330,7 @@ msgstr "ติดตั้งหรือถอดถอนไม่ครบ %l
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr "[Y/n]"
@@ -1342,21 +1338,21 @@ msgstr "[Y/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr "[y/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "Y"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s"
@@ -1372,6 +1368,10 @@ msgid_plural ""
"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
msgstr[0] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1383,70 +1383,70 @@ msgstr[0] "มีอีก %i ระเบียน กรุณาใช้ต
msgid "not a real package (virtual)"
msgstr "ไม่ใช่แพกเกจจริง (เสมือน)"
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "เกิดข้อผิดพลาดภายใน: มีการเรียก InstallPackages ด้วยแพกเกจที่เสีย!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "มีแพกเกจที่จำเป็นต้องถอดถอน แต่ถูกห้ามการถอดถอนไว้"
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "ข้อผิดพลาดภายใน: การเรียงลำดับไม่เสร็จสิ้น"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr "แปลกประหลาด... ขนาดไม่ตรงกัน กรุณาอีเมลแจ้ง apt@packages.debian.org"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "ต้องดาวน์โหลดแพกเกจ %sB/%sB\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "ต้องดาวน์โหลดแพกเกจ %sB\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "หลังจากการกระทำนี้ ต้องใช้เนื้อที่บนดิสก์อีก %sB\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "หลังจากการกระทำนี้ เนื้อที่บนดิสก์จะว่างเพิ่มอีก %sB\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s"
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "มีปัญหาบางประการ และมีการใช้ -y โดยไม่ระบุ --force-yes"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Trivial Only ถูกกำหนดไว้ แต่คำสั่งนี้ไม่ใช่คำสั่งเล็กน้อย"
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Yes, do as I say!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1457,19 +1457,19 @@ msgstr ""
"หากต้องการดำเนินการต่อ ให้พิมพ์ประโยค '%s'\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "เลิกทำ"
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "คุณต้องการจะดำเนินการต่อไปหรือไม่?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "ดาวน์โหลดบางแฟ้มไม่สำเร็จ"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1477,19 +1477,19 @@ msgstr ""
"ดาวน์โหลดบางแพกเกจไม่สำเร็จ บางที การเรียก apt-get update หรือลองใช้ตัวเลือก --fix-"
"missing อาจช่วยได้"
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "ยังไม่รองรับ --fix-missing พร้อมกับการเปลี่ยนแผ่น"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "ไม่สามารถแก้ปัญหาแพกเกจที่ขาดหายได้"
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "จะล้มเลิกการติดตั้ง"
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1500,15 +1500,15 @@ msgstr[0] ""
"แพกเกจต่อไปนี้ได้หายไปจากระบบของคุณ เพราะแฟ้มทั้งหมดได้ถูกแทนที่\n"
"โดยแพกเกจอื่นแล้ว:"
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr "หมายเหตุ: นี่เป็นสิ่งที่ dpkg ทำโดยอัตโนมัติโดยเจตนา"
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "apt ถูกกำหนดไม่ให้มีการลบใดๆ จึงไม่สามารถดำเนินการถอดถอนอัตโนมัติได้"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1526,15 +1526,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "ข้อมูลต่อไปนี้อาจช่วยแก้ปัญหาได้:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "เกิดข้อผิดพลาดภายใน: AutoRemover ทำความเสียหาย"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -1542,14 +1542,14 @@ msgid_plural ""
"required:"
msgstr[0] "แพกเกจต่อไปนี้ถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
"%lu packages were automatically installed and are no longer required.\n"
msgstr[0] "มีแพกเกจ %lu แพกเกจถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว\n"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] "ใช้ 'apt-get autoremove' เพื่อถอดถอนแพกเกจดังกล่าวได้"
@@ -1566,7 +1566,7 @@ msgstr ""
"มีปัญหาความขึ้นต่อกันระหว่างแพกเกจ กรุณาลองใช้ 'apt-get -f install' โดยไม่ระบุแพกเกจ "
"(หรือจะระบุทางแก้ก็ได้)"
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1577,59 +1577,59 @@ msgstr ""
"หรือถ้าคุณกำลังใช้รุ่น unstable ก็เป็นไปได้ว่าแพกเกจที่จำเป็นบางรายการ\n"
"ยังไม่ถูกสร้างขึ้น หรือถูกย้ายออกจาก Incoming"
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "แพกเกจมีปัญหา"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "จะติดตั้งแพกเกจเพิ่มเติมต่อไปนี้:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "แพกเกจที่แนะนำ:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "แพกเกจที่ควรใช้ร่วมกัน:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "จะข้าม %s เนื่องจากแพกเกจติดตั้งไว้แล้ว และไม่มีการกำหนดให้ปรับรุ่น\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr "จะข้าม %s เนื่องจากแพกเกจไม่ได้ติดตั้งไว้ และคำสั่งมีเพียงการปรับรุ่นเท่านั้น\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "ไม่สามารถติดตั้ง %s ซ้ำได้ เนื่องจากไม่สามารถดาวน์โหลดได้\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s เป็นรุ่นใหม่ล่าสุดอยู่แล้ว\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "เลือกรุ่น '%s' (%s) สำหรับ '%s' แล้ว\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "เลือกรุ่น '%s' (%s) สำหรับ '%s' แล้ว อันเนื่องมาจาก '%s'\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr "แพกเกจ '%s' ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน คุณหมายถึง '%s' หรือเปล่า?\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "แพกเกจ '%s' ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน\n"
@@ -2202,23 +2202,23 @@ msgstr "ไม่สามารถเขียนลงแฟ้ม %s"
msgid "IO Error saving source cache"
msgstr "เกิดข้อผิดพลาด IO ขณะบันทึกแคชของซอร์ส"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr "ส่งสภาวการณ์ไปยังกลไกการแก้ปัญหา"
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr "ส่งคำสั่งไปยังกลไกการแก้ปัญหา"
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr "เตรียมรับคำตอบ"
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr "กลไกการแก้ปัญหาภายนอกทำงานล้มเหลวโดยไม่มีข้อความข้อผิดพลาดที่เหมาะสม"
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr "เรียกกลไกการแก้ปัญหาภายนอก"
@@ -2871,7 +2871,7 @@ msgstr "%liนาที %liวิ"
msgid "%lis"
msgstr "%liวิ"
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "ไม่พบรายการเลือก %s"
@@ -3515,7 +3515,7 @@ msgstr "อ่านแฟ้มไม่สำเร็จขณะคำนว
msgid "Problem unlinking %s"
msgstr "มีปัญหาขณะลบแฟ้ม %s"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -3568,6 +3568,9 @@ msgstr ""
" -c=? อ่านแฟ้มค่าตั้งนี้\n"
" -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "เกิดข้อผิดพลาดภายใน: การปรับรุ่นทำความเสียหาย"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s ไม่ใช่แพกเกจ DEB ที่ใช้การได้"
diff --git a/po/tl.po b/po/tl.po
index d3ffb6603..b19833dd5 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+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"
@@ -164,7 +164,7 @@ msgstr " Talaang Bersyon:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -335,7 +335,7 @@ msgid "Couldn't find package %s"
msgstr "Hindi mahanap ang paketeng %s"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "ngunit ang %s ay iluluklok"
@@ -389,7 +389,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "Linaktawan ang nakuha na na talaksan '%s'\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Hindi matantsa ang libreng puwang sa %s"
@@ -422,7 +422,7 @@ msgstr "Kunin ang Source %s\n"
msgid "Failed to fetch some archives."
msgstr "Bigo sa pagkuha ng ilang mga arkibo."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang"
@@ -864,7 +864,7 @@ msgstr "Hindi maka-likha ng socket"
msgid "Could not connect data socket, connection timed out"
msgstr "Hindi maka-konekta sa socket ng datos, nag-time-out ang koneksyon"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Bigo"
@@ -1116,12 +1116,7 @@ msgstr "Internal na error"
msgid "Calculating upgrade... "
msgstr "Sinusuri ang pag-upgrade... "
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Tapos"
@@ -1207,70 +1202,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "ngunit ang %s ay nakaluklok"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "ngunit ang %s ay iluluklok"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "ngunit hindi ito maaaring iluklok"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "ngunit ito ay birtwal na pakete"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "ngunit ito ay hindi nakaluklok"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "ngunit ito ay hindi iluluklok"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " o"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "Ang susunod na mga pakete ay iu-upgrade:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (dahil sa %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1278,27 +1273,27 @@ msgstr ""
"BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin.\n"
"HINDI ito dapat gawin kung hindi niyo alam ng husto ang inyong ginagawa!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu na nai-upgrade, %lu na bagong luklok, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu iniluklok muli, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nai-downgrade, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu na tatanggalin at %lu na hindi inupgrade\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n"
@@ -1307,7 +1302,7 @@ msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr "[O/h]"
@@ -1315,21 +1310,21 @@ msgstr "[O/h]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr "[o/H]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "O"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr "H"
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error sa pag-compile ng regex - %s"
@@ -1346,6 +1341,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1358,21 +1357,21 @@ msgstr[1] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
"Error na internal, tinawagan ang InstallPackages na may sirang mga pakete!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr ""
"May mga paketeng kailangang tanggalin ngunit naka-disable ang Tanggal/Remove."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Nakapagtataka... Hindi magkatugma ang laki, mag-email sa apt@packages.debian."
@@ -1380,21 +1379,21 @@ msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Kailangang kumuha ng %sB/%sB ng arkibo.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Kailangang kumuha ng %sB ng arkibo.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, fuzzy, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr ""
@@ -1402,31 +1401,31 @@ msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, fuzzy, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Kulang kayo ng libreng puwang sa %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "May mga problema at -y ay ginamit na walang --force-yes"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Tinakdang Trivial Only ngunit hindi ito operasyong trivial."
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Oo, gawin ang sinasabi ko!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1437,19 +1436,19 @@ msgstr ""
"Upang magpatuloy, ibigay ang pariralang '%s'\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Abort."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Nais niyo bang magpatuloy?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "May mga talaksang hindi nakuha"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1457,19 +1456,19 @@ msgstr ""
"Hindi nakuha ang ilang mga arkibo, maaaring patakbuhin ang apt-get update o "
"subukang may --fix-missing?"
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing at pagpalit ng media ay kasalukuyang hindi suportado"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "Hindi maayos ang mga kulang na pakete."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "Ina-abort ang pag-instol."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1479,15 +1478,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr ""
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1503,17 +1502,17 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr ""
"Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Error na internal, may nasira ang problem resolver"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
#, fuzzy
msgid ""
"The following package was automatically installed and is no longer required:"
@@ -1523,7 +1522,7 @@ msgid_plural ""
msgstr[0] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
msgstr[1] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, fuzzy, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1531,7 +1530,7 @@ msgid_plural ""
msgstr[0] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
msgstr[1] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] ""
@@ -1550,7 +1549,7 @@ msgstr ""
"May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang "
"mga pakete (o magtakda ng solusyon)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1561,61 +1560,61 @@ 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."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Sirang mga pakete"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Mga paketeng mungkahi:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Mga paketeng rekomendado:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, fuzzy, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
"Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Ang pagluklok muli ng %s ay hindi maaari, hindi ito makuha.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s ay pinakabagong bersyon na.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Ang napiling bersyon %s (%s) para sa %s\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Ang napiling bersyon %s (%s) para sa %s\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n"
@@ -2201,23 +2200,23 @@ msgstr "Hindi makapagsulat sa %s"
msgid "IO Error saving source cache"
msgstr "IO Error sa pag-imbak ng source cache"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr ""
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr ""
@@ -2871,7 +2870,7 @@ msgstr ""
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "Piniling %s ay hindi nahanap"
@@ -3534,7 +3533,7 @@ msgstr "Bigo ang pagbasa habang tinutuos ang MD5"
msgid "Problem unlinking %s"
msgstr "Problema sa pag-unlink ng %s"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -3588,6 +3587,10 @@ msgstr ""
" -c=? Basahin ang talaksang pagkaayos na ito\n"
" -o=? Itakda ang isang option ng pagkaayos, hal. -o dir::cache=/tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s ay hindi balido na paketeng DEB."
diff --git a/po/tr.po b/po/tr.po
index 6c4f64593..265b5038e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2013-02-18 03:41+0200\n"
"Last-Translator: Mert Dirik <mertdirik@gmail.com>\n"
"Language-Team: Debian l10n Turkish\n"
@@ -162,7 +162,7 @@ msgstr " Sürüm çizelgesi:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -329,7 +329,7 @@ msgid "Couldn't find package %s"
msgstr "%s paketi bulunamadı"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s elle kurulmuş olarak ayarlı.\n"
@@ -392,7 +392,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "Zaten indirilmiş olan '%s' dosyası atlanıyor\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s içindeki boş alan miktarı belirlenemedi"
@@ -425,7 +425,7 @@ msgstr "%s kaynağını al\n"
msgid "Failed to fetch some archives."
msgstr "Bazı arşivler alınamadı."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "İndirme işlemi tamamlandı ve sadece indirme kipinde"
@@ -890,7 +890,7 @@ msgstr "Bir soket oluşturulamadı"
msgid "Could not connect data socket, connection timed out"
msgstr "Veri soketine bağlanılamadı, bağlantı zaman aşımına uğradı"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Başarısız"
@@ -1136,12 +1136,7 @@ msgstr "İç hata"
msgid "Calculating upgrade... "
msgstr "Yükseltme hesaplanıyor... "
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "İç hata, AllUpgrade bazı şeyleri bozdu"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Bitti"
@@ -1229,70 +1224,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Aşağıdaki paketler karşılanmamış bağımlılıklara sahip:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "ama %s kurulu"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "ama %s kurulacak"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "ama kurulabilir değil"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "ama o bir sanal paket"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "ama kurulu değil"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "ama kurulmayacak"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " ya da"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "Aşağıdaki paketler karşılanmamış bağımlılıklara sahip:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "Aşağıdaki YENİ paketler kurulacak:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "Aşağıdaki paketler KALDIRILACAK:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "Aşağıdaki paketlerin mevcut durumları korunacak:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "Aşağıdaki paketler yükseltilecek:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "Aşağıdaki paketlerin SÜRÜMLERİ DÜŞÜRÜLECEK:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "Aşağıdaki eski sürümlerinde tutulan paketler değiştirilecek:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (%s nedeniyle) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1300,27 +1295,27 @@ msgstr ""
"UYARI: Aşağıdaki temel paketler kaldırılacak.\n"
"Bu işlem ne yaptığınızı tam olarak bilmediğiniz takdirde YAPILMAMALIDIR!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu paket yükseltilecek, %lu yeni paket kurulacak, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu paket yeniden kurulacak, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu paketin sürümü düşürülecek, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu paket kaldırılacak ve %lu paket yükseltilmeyecek.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n"
@@ -1329,7 +1324,7 @@ msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr "[E/h]"
@@ -1337,21 +1332,21 @@ msgstr "[E/h]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr "[e/H]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "E"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr "H"
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex derleme hatası - %s"
@@ -1368,6 +1363,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1380,21 +1379,21 @@ msgstr[1] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "İç hata, InstallPackages bozuk paketler ile çağrıldı!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr ""
"Paketlerin kaldırılması gerekiyor ancak kaldırma işlemi devre dışı "
"bırakılmış."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "İç hata, Sıralama tamamlanamadı"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Ne kadar ilginç... Boyutlar eşleşmedi, apt@packages.debian.org adresine "
@@ -1402,53 +1401,53 @@ msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "%sB/%sB arşiv dosyası indirilecek.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "%sB arşiv dosyası indirilecek.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "Bu işlem tamamlandıktan sonra %sB ek disk alanı kullanılacak.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Bu işlem tamamlandıktan sonra %sB disk alanı boşalacak.\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "%s içinde yeterli boş alanınız yok."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "Bazı sorunlar çıktı ve -y seçeneği, --force-yes olmadan kullanıldı"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"Yalnızca Önemsiz seçeneği ayarlandı, fakat bu önemsiz bir işlem bir değil."
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Evet, söylediğim şekilde yap!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1459,19 +1458,19 @@ msgstr ""
"Devam etmek için '%s' ifadesini yazınız\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Vazgeç."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Devam etmek istiyor musunuz?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "Bazı dosyalar indirilemedi"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1479,19 +1478,19 @@ msgstr ""
"Bazı arşivler alınamıyor, apt-get update'i çalıştırmayı ya da --fix-missing "
"seçeneğini ekleyerek düzeltmeyi deneyin."
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing seçeneği ve ortam takası şu an için desteklenmiyor"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "Eksik paketler düzeltilemedi."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "Kurulum iptal ediliyor."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1505,15 +1504,15 @@ msgstr[1] ""
"Tüm dosyalarının üzerine yazıldığı için aşağıdaki paketler\n"
"sisteminizden kayboldu:"
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr "Not: Bu eylem dpkg tarafından otomatik ve kasıtlı olarak yapılmıştır."
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Nesneleri silmemiz beklenemez, AutoRemover çalıştırılamıyor"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1531,15 +1530,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "Aşağıdaki bilgiler durumu çözmenize yardımcı olabilir:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "İç hata, AutoRemover bazı şeyleri bozdu"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -1551,7 +1550,7 @@ msgstr[1] ""
"Aşağıdaki paketler otomatik olarak kurulmuş ve artık bu paketlere gerek "
"duyulmuyor:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1559,7 +1558,7 @@ msgid_plural ""
msgstr[0] "%lu paket otomatik olarak kurulmuş ve artık gerekli değil.\n"
msgstr[1] "%lu paket otomatik olarak kurulmuş ve artık gerekli değil.\n"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] "Bu paketi kaldırmak için 'apt-get autoremove' komutunu kullanın."
@@ -1579,7 +1578,7 @@ msgstr ""
"Karşılanmamış bağımlılıklar. 'apt-get -f install' komutunu paket seçeneği "
"vermeden deneyin (ya da bir çözüm belirtin)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1591,64 +1590,64 @@ msgstr ""
"bazı paketlerin henüz oluşturulamamış ya da oluşturulmakta\n"
"olduğunu gösterir."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Bozuk paketler"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "Aşağıdaki ek paketler de kurulacak:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Önerilen paketler:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Tavsiye edilen paketler:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "%s atlanıyor, bu paket zaten kurulu ve yükseltme seçilmemiş.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
"%s atlanıyor, bu paket kurulu değil ve sadece yükseltmeler isteniyor.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"%s paketinin yeniden kurulumu mümkün değil, çünkü paket internetten "
"indirilemedi.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s zaten en yeni sürümde.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "'%3$s' paketinin '%1$s' (%2$s) sürümü seçildi\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "'%4$s' nedeniyle '%3$s' paketinin '%1$s' (%2$s) sürümü seçildi\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr ""
"'%s' kurulu değildi, dolayısıyla kaldırılmadı. Bunu mu demek istediniz: "
"'%s'?\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "'%s' kurulu değildi, dolayısıyla kaldırılmadı.\n"
@@ -2229,23 +2228,23 @@ msgstr "%s dosyasına yazılamıyor"
msgid "IO Error saving source cache"
msgstr "Kaynak önbelleği kaydedilirken GÇ Hatası"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr "Çözücüye senaryo gönder"
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr "Çözücüye istek gönder"
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr "Çözüm almak için hazırlan"
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr "Harici çözücü düzgün bir hata iletisi göstermeden başarısız oldu"
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr "Harici çözücüyü çalıştır"
@@ -2933,7 +2932,7 @@ msgstr "%li dk. %li sn."
msgid "%lis"
msgstr "%li sn."
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "%s seçimi bulunamadı"
@@ -3596,7 +3595,7 @@ msgstr "MD5 hesaplanırken okunamadı"
msgid "Problem unlinking %s"
msgstr "%s bağı koparılırken sorun çıktı"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -3650,6 +3649,10 @@ msgstr ""
" -o=? Herhangi bir yapılandırma seçeneği ayarla, örneğin -o dir::cache=/"
"tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "İç hata, AllUpgrade bazı şeyleri bozdu"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s geçerli bir DEB paketi değil."
diff --git a/po/uk.po b/po/uk.po
index 922da3120..1c3907254 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-all\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2012-09-25 20:19+0300\n"
"Last-Translator: A. Bondarenko <artem.brz@gmail.com>\n"
"Language-Team: Українська <uk@li.org>\n"
@@ -167,7 +167,7 @@ msgstr " Таблиця версій:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -331,7 +331,7 @@ msgid "Couldn't find package %s"
msgstr "Не можу знайти пакунок %s"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s позначений як встановлений вручну.\n"
@@ -394,7 +394,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "Пропускаємо вже завантажений файл '%s'\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Не вдалося визначити кількість вільного місця в %s"
@@ -427,7 +427,7 @@ msgstr "Завантаження вихідних текстів %s\n"
msgid "Failed to fetch some archives."
msgstr "Деякі архіви не вдалося завантажити."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "Завантаження завершено в режимі \"тільки завантаження\""
@@ -904,7 +904,7 @@ msgstr "Неможливо створити сокет (socket)"
msgid "Could not connect data socket, connection timed out"
msgstr "Неможливо під'єднати сокет (socket) з даними, час з'єднання вичерпався"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Невдача"
@@ -1154,12 +1154,7 @@ msgstr "Внутрішня помилка"
msgid "Calculating upgrade... "
msgstr "Обчислення оновлень... "
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Внутрішня помилка, AllUpgrade щось поламав"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Виконано"
@@ -1247,70 +1242,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Пакунки, що мають незадоволені залежності:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "але %s вже встановлений"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "але %s буде встановлений"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "але він не може бути встановлений"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "але це віртуальний пакунок"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "але він не встановлений"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "але він не буде встановлений"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " чи"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "Пакунки, що мають незадоволені залежності:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "НОВІ пакунки, які будуть встановлені:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "Пакунки, які будуть ВИДАЛЕНІ:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "Пакунки, які залишені в незмінному стані:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "Пакунки, які будуть ОНОВЛЕНІ:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "Пакунки, які будуть замінені на СТАРІШІ версії:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "Пакунки, які мали б залишитися без змін, але будуть замінені:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (внаслідок %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1318,27 +1313,27 @@ msgstr ""
"УВАГА: Наступні важливі пакунки будуть вилучені.\n"
"НЕ РОБІТЬ цього, якщо ви НЕ уявляєте собі всі можливі наслідки!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "оновлено %lu, встановлено %lu нових, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu перевстановлено, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu замінено на старіші версії, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu відмічено для видалення і %lu не оновлено.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "не встановлено(видалено) до кінця %lu пакунків.\n"
@@ -1347,7 +1342,7 @@ msgstr "не встановлено(видалено) до кінця %lu пак
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr ""
@@ -1355,21 +1350,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "Помилка компіляції регулярного виразу - %s"
@@ -1387,6 +1382,10 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1400,41 +1399,41 @@ msgstr[2] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
"Внутрішня помилка, InstallPackages була викликана з непрацездатними "
"пакунками!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "Необхідно видалити пакунки, але видалення заборонене."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "Внутрішня помилка, Ordering не завершилася"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr "Дивно... Розбіжність розмірів, напишіть на apt@packages.debian.org"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Необхідно завантажити %sB/%sB архівів.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Необхідно завантажити %sB архівів.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr ""
@@ -1442,33 +1441,33 @@ msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr ""
"Після цієї операції об'єм зайнятого дискового простору зменшиться на %sB.\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Недостатньо вільного місця в %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "Виявлено проблеми, а опція -y була використана без --force-yes"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"Вказано виконання тільки тривіальних операцій, але це не тривіальна операція."
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Так, робити, як я скажу!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1479,19 +1478,19 @@ msgstr ""
"Щоб продовжити, введіть фразу: '%s'\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Перервано."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Бажаєте продовжити?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "Деякі файли не вдалося завантажити"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1499,19 +1498,19 @@ msgstr ""
"Неможливо завантажити деякі архіви, імовірно треба виконати apt-get update "
"або спробувати повторити запуск з ключем --fix-missing?"
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing і зміна носія в даний момент не підтримується"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "Неможливо виправити втрачені пакунки."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "Переривається встановлення."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1528,15 +1527,15 @@ msgstr[2] ""
"Вказані пакунки зникли з вашої системи, так як\n"
"усі файли були перезаписані іншими пакунками:"
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr "Увага: це зроблено автоматично і умисно dpkg'ем."
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Нам не дозволено видаляти, неможливо запустити AutoRemover"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1554,15 +1553,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "Наступна інформація можливо допоможе Вам виправити ситуацію:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Внутрішня Помилка, AutoRemover щось поламав"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -1573,7 +1572,7 @@ msgstr[0] ""
msgstr[1] "Наступні пакунки були встановлені автоматично і більше не потрібні:"
msgstr[2] "Наступні пакунки були встановлені автоматично і більше не потрібні:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1584,7 +1583,7 @@ msgstr[1] ""
msgstr[2] ""
"%lu пакунків було встановлено автоматично і вони більше не потрібні.\n"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] "Використовуйте 'apt-get autoremove' щоб видалити його."
@@ -1605,7 +1604,7 @@ msgstr ""
"Незадоволені залежності. Спробуйте виконати 'apt-get -f install', не "
"вказуючи назв пакунків (або вкажіть рішення)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1616,63 +1615,63 @@ msgstr ""
"або ж використовуєте нестабільний дистрибутив, і запитані Вами пакунки\n"
"ще не створені або були вилучені з Incoming."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Зламані пакунки"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "Будуть встановлені наступні додаткові пакунки:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Пропоновані пакунки:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Рекомендовані пакунки:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Пропускається %s, пакунок вже встановлений і опція ОНОВИТИ не встановлена.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
"Пропускається %s, пакунок не встановлений, а запитуються тільки оновлення.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Перевстановлення %s неможливе, бо він не може бути завантаженим.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "Вже встановлена найновіша версія %s.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Обрана версія '%s' (%s) для '%s'\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Обрана версія '%s' (%s) для '%s' через '%s'\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr ""
"Пакунок '%s' не встановлений, тому не видалений. Можливо ви мали на увазі "
"'%s'?\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Пакунок '%s' не встановлений, тому не видалений\n"
@@ -2256,28 +2255,28 @@ msgstr "Неможливо записати в %s"
msgid "IO Error saving source cache"
msgstr "Помилка IO під час збереження кешу вихідних текстів"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
#, fuzzy
msgid "Send scenario to solver"
msgstr "Відправити сценарій розв'язувачу"
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
#, fuzzy
msgid "Send request to solver"
msgstr "Відправити запит розв'язувачу"
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
#, fuzzy
msgid "Prepare for receiving solution"
msgstr "Пригодуватися до отримання розв'язку"
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr ""
"Зовнішній розв'язувач завершився невдало без відповідного повідомлення про "
"помилку"
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
#, fuzzy
msgid "Execute external solver"
msgstr "Виконати зовнішній розв'язувач"
@@ -2963,7 +2962,7 @@ msgstr "%liхв %liс"
msgid "%lis"
msgstr "%liс"
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "Вибір %s не знайдено"
@@ -3635,7 +3634,7 @@ msgstr "Помилка зчитування під час обчислення M
msgid "Problem unlinking %s"
msgstr "Не вдалося видалити %s"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -3690,6 +3689,10 @@ msgstr ""
" -c=? читати зазначений файл конфігурації\n"
" -o=? встановити довільну опцію, наприклад, -o dir::cache=/tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Внутрішня помилка, AllUpgrade щось поламав"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s не є правильним DEB пакунком."
diff --git a/po/vi.po b/po/vi.po
index a612bae4b..93c9f49b2 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.2\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2014-04-28 09:24+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -164,7 +164,7 @@ msgstr " Bảng phiên bản:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -339,7 +339,7 @@ msgid "Couldn't find package %s"
msgstr "Không tìm thấy gói %s"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s được đặt thành “được cài đặt bằng tay”.\n"
@@ -401,7 +401,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "Đang bỏ qua tập tin đã được tải về “%s”\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Không thể tìm được chỗ trống trong %s"
@@ -434,7 +434,7 @@ msgstr "Lấy mã nguồn %s\n"
msgid "Failed to fetch some archives."
msgstr "Gặp lỗi khi lấy một số kho."
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "Hoàn tất việc tải về và trong chế độ chỉ tải về"
@@ -940,7 +940,7 @@ msgstr "Không thể tạo ổ cắm"
msgid "Could not connect data socket, connection timed out"
msgstr "Không thể kết nối ổ cắm dữ liệu, kết nối đã quá giờ"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "Gặp lỗi"
@@ -1194,11 +1194,7 @@ msgstr "Gặp lỗi nội bộ"
msgid "Calculating upgrade... "
msgstr "Đang tính toán nâng cấp... "
-#: apt-private/private-upgrade.cc:30
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Lỗi nội bộ: Lệnh nâng cấp đã làm hỏng thứ gì đó"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "Xong"
@@ -1280,70 +1276,70 @@ msgstr "[có thể nâng cấp từ: %s]"
msgid "[residual-config]"
msgstr "[residual-config]"
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Những gói theo đây chưa thỏa mãn quan hệ phụ thuộc:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "nhưng mà %s đã được cài đặt"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "nhưng mà %s sẽ được cài đặt"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "nhưng mà nó không có khả năng cài đặt"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "nhưng mà nó là gói ảo"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "nhưng mà nó không được cài đặt"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "nhưng mà nó sẽ không được cài đặt"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " hay"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "Những gói theo đây chưa thỏa mãn quan hệ phụ thuộc:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "Những gói MỚI sau sẽ được CÀI ĐẶT:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "Những gói sau sẽ bị GỠ BỎ:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "Những gói sau đây được giữ lại:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "Những gói sau đây sẽ được NÂNG CẤP:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "Những gói sau đây sẽ bị HẠ CẤP:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "Những gói giữ lại sau đây sẽ bị THAY ĐỔI:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (bởi vì %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1351,27 +1347,27 @@ msgstr ""
"CẢNH BÁO: Có những gói chủ yếu sau đây sẽ bị gỡ bỏ.\n"
"ĐỪNG làm như thế trừ khi bạn biết chính xác mình đang làm gì!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu nâng cấp, %lu được cài đặt mới, "
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu được cài đặt lại, "
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "%lu bị hạ cấp, "
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu cần gỡ bỏ, và %lu chưa được nâng cấp.\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu chưa được cài đặt toàn bộ hay được gỡ bỏ.\n"
@@ -1380,7 +1376,7 @@ msgstr "%lu chưa được cài đặt toàn bộ hay được gỡ bỏ.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr "[C/k]"
@@ -1388,21 +1384,21 @@ msgstr "[C/k]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr "[c/K]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr "C"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr "K"
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "Lỗi biên dịch biểu thức chính quy - %s"
@@ -1418,6 +1414,10 @@ msgid_plural ""
"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
msgstr[0] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1429,62 +1429,62 @@ msgstr[0] "Ở đây có %i bản ghi phụ thêm. Hãy dùng tùy chọn “-a
msgid "not a real package (virtual)"
msgstr "không là gói thật (ảo)"
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Lỗi nội bộ: InstallPackages (cài đặt gói) được gọi với gói bị hỏng!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr ""
"Cần phải gỡ bỏ một số gói, nhưng mà tính năng Gỡ bỏ (Remove) đã bị tắt."
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
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"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Lạ nhỉ... Kích cỡ không khớp nhau. Hãy gửi thư cho <apt@packages.debian.org>"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Cần phải lấy %sB/%sB từ kho chứa.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Cần phải lấy %sB từ kho chứa.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "Sau thao tác này, %sB dung lượng đĩa sẽ bị chiếm dụng.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Sau thao tác này, %sB dung lượng đĩa sẽ được giải phóng.\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Bạn không có đủ dung lượng đĩa còn trống trong %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "Có lỗi và đã dùng tùy chọn “-y” mà không có “--force-yes”"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"Đã đưa ra “Chỉ không đáng kể” (Trivial Only) nhưng mà thao tác này là đáng "
@@ -1492,11 +1492,11 @@ msgstr ""
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Có, làm đi!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1507,19 +1507,19 @@ msgstr ""
"Nếu vẫn muốn tiếp tục thì hãy gõ cụm từ “%s”\n"
"?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Hủy bỏ."
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Bạn có muốn tiếp tục không?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "Một số tập tin không tải về được"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1528,20 +1528,20 @@ msgstr ""
"nhật)\n"
"hay dùng tùy chọn “--fix-missing” (sửa thiếu sót) không?"
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
"Chưa hỗ trợ tùy chọn “--fix-missing” (sửa khi thiếu) và trao đổi phương tiện."
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "Không thể sửa những gói còn thiếu."
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "Đang hủy bỏ tiến trình cài đặt."
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1552,15 +1552,15 @@ msgstr[0] ""
"Những gói theo đây không còn nằm trên hệ thống này vì mọi tập tin đều bị gói "
"khác ghi đè:"
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr "Ghi chú: Thay đổi này được tự động thực hiện bởi dpkg."
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
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"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1578,15 +1578,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ bạn giải quyết tình trạng này:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Lỗi nội bộ: Bộ Gỡ bỏ Tự động đã làm hỏng một thứ gì đó"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -1595,14 +1595,14 @@ msgid_plural ""
msgstr[0] ""
"(Các) gói sau đây đã được tự động cài đặt nên không còn cần yêu cầu lại:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
"%lu packages were automatically installed and are no longer required.\n"
msgstr[0] "%lu gói đã được tự động cài đặt nên không còn cần yêu cầu lại.\n"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] "Hãy dùng lệnh “apt-get autoremove” để gỡ bỏ chúng."
@@ -1619,7 +1619,7 @@ msgstr ""
"Thưa thỏa mãn quan hệ phụ thuộc. Hãy thử chạy lệnh “apt-get -f install” mà "
"không có gói nào (hoặc chỉ định cách thức giải quyết)."
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1631,60 +1631,60 @@ msgstr ""
"chưa ổn định cái mà yêu cầu các gói mà nó còn chưa được tạo ra\n"
"hay chưa được chuyển ra khỏi phần Incoming (Đến)."
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Gói bị hỏng"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "Những gói thêm theo đây sẽ được cài đặt:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Các gói đề nghị:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Gói khuyến khích:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Đang bỏ qua %s vì nó đã được cài đặt và chưa đặt tùy chọn Nâng cấp.\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
"Đang bỏ qua %s vì nó chưa được cài đặt và chỉ Nâng cấp là được yêu cầu.\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Không thể cài đặt lại %s vì không thể tải nó về.\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s là phiên bản mới nhất.\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Đã chọn phiên bản “%s” (%s) cho “%s”\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Đã chọn phiên bản “%s” (%s) cho “%s” vì “%s”\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr "Chưa cài đặt gói %s nên không thể gỡ bỏ nó. Có phải ý bạn là “%s'?\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Gói %s chưa được cài đặt, thế nên không thể gỡ bỏ nó\n"
@@ -2263,23 +2263,23 @@ msgstr "Không thể ghi vào %s"
msgid "IO Error saving source cache"
msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr "Gửi kịch bản đến bộ phân giải"
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr "Gửi yêu cầu đến bộ phân giải"
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr "Chuẩn bị để lấy cách giải quyết"
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr "Bộ phân giải bên ngoài gặp lỗi mà không trả về thông tin lỗi thích hợp"
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr "Thi hành bộ phân giải từ bên ngoài"
@@ -2969,7 +2969,7 @@ msgstr "%li phút %li giây"
msgid "%lis"
msgstr "%li giây"
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "Không tìm thấy vùng chọn %s"
@@ -3647,7 +3647,7 @@ msgstr "Gặp lỗi khi đọc trong khi tính MD5"
msgid "Problem unlinking %s"
msgstr "Gặp lỗi khi bỏ liên kết %s"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -3702,6 +3702,9 @@ msgstr ""
" -c=? Đọc tập tin cấu hình này\n"
" -o=? Đặt tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n"
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Lỗi nội bộ: Lệnh nâng cấp đã làm hỏng thứ gì đó"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s không phải là một gói DEB hợp lệ."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4e6c51bd5..23a1e4c82 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.0~pre1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2010-08-26 14:42+0800\n"
"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -159,7 +159,7 @@ msgstr " 版本列表:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -327,7 +327,7 @@ msgid "Couldn't find package %s"
msgstr "无法找到软件包 %s"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s 被设置为手动安装。\n"
@@ -386,7 +386,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "忽略已下载过的文件“%s”\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "无法获知您在 %s 上的可用空间"
@@ -419,7 +419,7 @@ msgstr "下载源代码 %s\n"
msgid "Failed to fetch some archives."
msgstr "有一些包文件无法下载。"
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "下载完毕,目前是“仅下载”模式"
@@ -855,7 +855,7 @@ msgstr "无法创建套接字"
msgid "Could not connect data socket, connection timed out"
msgstr "无法连接上数据套接字,连接超时"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "失败"
@@ -1101,12 +1101,7 @@ msgstr "内部错误"
msgid "Calculating upgrade... "
msgstr "正在对升级进行计算... "
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "内部错误,全部升级工具坏事了"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "完成"
@@ -1191,70 +1186,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "下列软件包有未满足的依赖关系:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "但是 %s 已经安装"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "但是 %s 正要被安装"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "但无法安装它"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "但是它是虚拟软件包"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "但是它还没有被安装"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "但是它将不会被安装"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr " 或"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "下列软件包有未满足的依赖关系:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "下列【新】软件包将被安装:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "下列软件包将被【卸载】:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "下列软件包的版本将保持不变:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "下列软件包将被升级:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "下列软件包将被【降级】:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "下列被要求保持版本不变的软件包将被改变:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s (是由于 %s) "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1262,27 +1257,27 @@ msgstr ""
"【警告】:下列基础软件包将被卸载。\n"
"请勿尝试,除非您确实知道您在做什么!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "升级了 %lu 个软件包,新安装了 %lu 个软件包,"
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "重新安装了 %lu 个软件包,"
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "降级了 %lu 个软件包,"
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "要卸载 %lu 个软件包,有 %lu 个软件包未被升级。\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
@@ -1291,7 +1286,7 @@ msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr ""
@@ -1299,21 +1294,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "编译正则表达式时出错 - %s"
@@ -1329,6 +1324,10 @@ msgid_plural ""
"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
msgstr[0] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1340,70 +1339,70 @@ msgstr[0] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "内部错误,InstallPackages 被用在了无法安装的软件包上!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "有软件包需要被卸载,但是卸载动作被程序设置所禁止。"
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "内部错误,Ordering 未能完成"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr "怪了……文件大小不符,请发信给 apt@packages.debian.org 吧"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "需要下载 %sB/%sB 的软件包。\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "需要下载 %sB 的软件包。\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "解压缩后将会空出 %sB 的空间。\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "您在 %s 上没有足够的可用空间。"
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "碰到了一些问题,您使用了 -y 选项,但是没有用 --force-yes"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "虽然您指定了仅执行常规操作,但这不是个常规操作。"
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "是,按我说的做!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1414,19 +1413,19 @@ msgstr ""
"若还想继续的话,就输入下面的短句“%s”\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "中止执行。"
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "您希望继续执行吗?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "有一些文件无法下载"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1434,19 +1433,19 @@ msgstr ""
"有几个软件包无法下载,您可以运行 apt-get update 或者加上 --fix-missing 的选项"
"再试试?"
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "目前还不支持 --fix-missing 和介质交换"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "无法更正缺少的软件包。"
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "中止安装。"
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1455,15 +1454,15 @@ msgid_plural ""
"all files have been overwritten by other packages:"
msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失:"
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr "注意:这是自动被 dpkg 有意完成的。"
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "我们不应该进行删除,无法启动自动删除器"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1479,15 +1478,15 @@ msgstr "似乎自动卸载工具损坏了一些软件,这不应该发生。请
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "下列信息可能会对解决问题有所帮助:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "内部错误,自动卸载工具坏事了"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -1495,14 +1494,14 @@ msgid_plural ""
"required:"
msgstr[0] "下列软件包是自动安装的并且现在不需要了:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
"%lu packages were automatically installed and are no longer required.\n"
msgstr[0] "%lu 个自动安装的的软件包现在已不再需要了。\n"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
#, fuzzy
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1520,7 +1519,7 @@ msgstr ""
"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
"以指定一个解决办法)。"
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1531,59 +1530,59 @@ msgstr ""
"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
"包尚未被创建或是它们已被从新到(Incoming)目录移出。"
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "破损的软件包"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "将会安装下列额外的软件包:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "建议安装的软件包:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "推荐安装的软件包:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "忽略了 %s,它已经被安装而且没有指定要升级。\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr "忽略了 %s,它已经被安装而且仅请求了升级。\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "不能重新安装 %s,因为无法下载它。\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s 已经是最新的版本了。\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr "软件包 %s 还未安装,因而不会被卸载\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "软件包 %s 还未安装,因而不会被卸载\n"
@@ -2156,23 +2155,23 @@ msgstr "无法写入 %s"
msgid "IO Error saving source cache"
msgstr "无法读取或写入软件源缓存"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr ""
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr ""
@@ -2825,7 +2824,7 @@ msgstr "%li分 %li秒"
msgid "%lis"
msgstr "%li秒"
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "找不到您选则的 %s"
@@ -3473,7 +3472,7 @@ msgstr "在计算 MD5 校验和时无法读取数据"
msgid "Problem unlinking %s"
msgstr "在使用 unlink 删除 %s 时出错"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -3526,6 +3525,10 @@ msgstr ""
" -c=? 读取指定配置文件\n"
" -o=? 设置任意指定的配置选项,例如 -o dir::cache=/tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "内部错误,全部升级工具坏事了"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s 不是一个有效的 DEB 软件包。"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 68dbb1f48..2d5b08fc6 100644
--- 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+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."
@@ -160,7 +160,7 @@ msgstr " 版本列表:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -328,7 +328,7 @@ msgid "Couldn't find package %s"
msgstr "無法找到套件 %s"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:865
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s 被設定為手動安裝。\n"
@@ -382,7 +382,7 @@ msgid "Skipping already downloaded file '%s'\n"
msgstr "略過已下載的檔案 '%s'\n"
#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "無法確認 %s 的未使用空間"
@@ -415,7 +415,7 @@ msgstr "取得原始碼 %s\n"
msgid "Failed to fetch some archives."
msgstr "無法取得某些套件檔。"
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "下載完成,且這是『僅下載』模式"
@@ -847,7 +847,7 @@ msgstr "無法建立 Socket"
msgid "Could not connect data socket, connection timed out"
msgstr "無法和 data socket 連線,連線逾時"
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:716 methods/connect.cc:116
msgid "Failed"
msgstr "失敗"
@@ -1094,12 +1094,7 @@ msgstr "內部錯誤"
msgid "Calculating upgrade... "
msgstr "籌備升級中... "
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "內部錯誤,AllUpgrade 造成了損壞"
-
-#: apt-private/private-upgrade.cc:32
+#: apt-private/private-upgrade.cc:28
msgid "Done"
msgstr "完成"
@@ -1185,70 +1180,70 @@ msgstr ""
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "下列的套件有未滿足的相依關係:"
-
-#: apt-private/private-output.cc:442
+#: apt-private/private-output.cc:434
#, c-format
msgid "but %s is installed"
msgstr "但 %s 卻已安裝"
-#: apt-private/private-output.cc:444
+#: apt-private/private-output.cc:436
#, c-format
msgid "but %s is to be installed"
msgstr "但 %s 卻將被安裝"
-#: apt-private/private-output.cc:451
+#: apt-private/private-output.cc:443
msgid "but it is not installable"
msgstr "但它卻無法安裝"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:445
msgid "but it is a virtual package"
msgstr "但它是虛擬套件"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not installed"
msgstr "但它卻尚未安裝"
-#: apt-private/private-output.cc:456
+#: apt-private/private-output.cc:448
msgid "but it is not going to be installed"
msgstr "但它卻將不會被安裝"
-#: apt-private/private-output.cc:461
+#: apt-private/private-output.cc:453
msgid " or"
msgstr "或"
-#: apt-private/private-output.cc:490
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr "下列的套件有未滿足的相依關係:"
+
+#: apt-private/private-output.cc:502
msgid "The following NEW packages will be installed:"
msgstr "下列【新】套件將會被安裝:"
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:528
msgid "The following packages will be REMOVED:"
msgstr "下列套件將會被【移除】:"
-#: apt-private/private-output.cc:538
+#: apt-private/private-output.cc:550
msgid "The following packages have been kept back:"
msgstr "下列套件將會維持其原有版本:"
-#: apt-private/private-output.cc:559
+#: apt-private/private-output.cc:571
msgid "The following packages will be upgraded:"
msgstr "下列套件將會被升級:"
-#: apt-private/private-output.cc:580
+#: apt-private/private-output.cc:592
msgid "The following packages will be DOWNGRADED:"
msgstr "下列套件將會被【降級】:"
-#: apt-private/private-output.cc:600
+#: apt-private/private-output.cc:612
msgid "The following held packages will be changed:"
msgstr "下列被保留 (hold) 的套件將會被更改:"
-#: apt-private/private-output.cc:655
+#: apt-private/private-output.cc:667
#, c-format
msgid "%s (due to %s) "
msgstr "%s(因為 %s)"
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:675
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1256,27 +1251,27 @@ msgstr ""
"【警告】:下列的基本套件都將被移除。\n"
"除非您很清楚您在做什麼,否則請勿輕易嘗試!"
-#: apt-private/private-output.cc:694
+#: apt-private/private-output.cc:706
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "升級 %lu 個,新安裝 %lu 個,"
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:710
#, c-format
msgid "%lu reinstalled, "
msgstr "重新安裝 %lu 個,"
-#: apt-private/private-output.cc:700
+#: apt-private/private-output.cc:712
#, c-format
msgid "%lu downgraded, "
msgstr "降級 %lu 個,"
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:714
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "移除 %lu 個,有 %lu 個未被升級。\n"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:718
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu 個沒有完整得安裝或移除。\n"
@@ -1285,7 +1280,7 @@ msgstr "%lu 個沒有完整得安裝或移除。\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
+#: apt-private/private-output.cc:740
msgid "[Y/n]"
msgstr ""
@@ -1293,21 +1288,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
+#: apt-private/private-output.cc:746
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
+#: apt-private/private-output.cc:757
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
+#: apt-private/private-output.cc:763
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "編譯正規表示式時發生錯誤 - %s"
@@ -1324,6 +1319,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-show.cc:156
#, c-format
msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1336,70 +1335,70 @@ msgstr[1] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:81
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "內部錯誤,在損毀的套件上執行 InstallPackages!"
-#: apt-private/private-install.cc:90
+#: apt-private/private-install.cc:91
msgid "Packages need to be removed but remove is disabled."
msgstr "有套件需要被移除,但卻被禁止移除。"
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:110
msgid "Internal error, Ordering didn't finish"
msgstr "內部錯誤,排序未能完成"
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr "怪哉... 檔案大小不符,請發信給 apt@packages.debian.org"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "需要下載 %sB/%sB 的套件檔。\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "需要下載 %sB 的套件檔。\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:167
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "此操作完成之後,會多佔用 %sB 的磁碟空間。\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:172
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "此操作完成之後,會空出 %sB 的磁碟空間。\n"
-#: apt-private/private-install.cc:199
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "在 %s 裡沒有足夠的的未使用空間。"
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "發生了問題,且 -y 並沒有和 --force-yes 搭配使用"
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "雖然指定了 Trivial Only(自動答 NO)選項,但這並不是 trivial 操作。"
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:219
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Yes, do as I say!"
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:222
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1410,20 +1409,20 @@ msgstr ""
"請輸入 '%s' 這個句子以繼續進行\n"
" ?] "
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "放棄執行。"
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:243
#, fuzzy
msgid "Do you want to continue?"
msgstr "是否繼續進行 [Y/n]?"
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "有部份檔案無法下載"
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1431,19 +1430,19 @@ msgstr ""
"有部份套件檔無法取得,試著執行 apt-get update 或者試著加上 --fix-missing 選"
"項?"
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "目前尚未支援 --fix-missing 和媒體抽換"
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "無法修正欠缺的套件。"
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:330
msgid "Aborting install."
msgstr "放棄安裝。"
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1453,15 +1452,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr ""
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "我們沒有計劃要刪除任何東西,無法啟動 AutoRemover"
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1479,15 +1478,15 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "以下的資訊或許有助於解決當前的情況:"
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:506
msgid "Internal Error, AutoRemover broke stuff"
msgstr "內部錯誤,AutoRemover 處理失敗"
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:513
#, fuzzy
msgid ""
"The following package was automatically installed and is no longer required:"
@@ -1497,7 +1496,7 @@ msgid_plural ""
msgstr[0] "以下套件是被自動安裝進來的,且已不再會被用到了:"
msgstr[1] "以下套件是被自動安裝進來的,且已不再會被用到了:"
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:517
#, fuzzy, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1505,7 +1504,7 @@ msgid_plural ""
msgstr[0] "以下套件是被自動安裝進來的,且已不再會被用到了:"
msgstr[1] "以下套件是被自動安裝進來的,且已不再會被用到了:"
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:519
#, fuzzy
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1524,7 +1523,7 @@ msgstr ""
"未能滿足相依關係。請試著不指定套件來執行 'apt-get -f install'(或採取其它的解"
"決方案)。"
-#: apt-private/private-install.cc:628
+#: apt-private/private-install.cc:638
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1534,59 +1533,59 @@ msgstr ""
"有些套件無法安裝。這可能意謂著您的要求難以解決,或是若您使用的是\n"
"unstable 發行版,可能有些必要的套件尚未建立,或是被移出 Incoming 了。"
-#: apt-private/private-install.cc:649
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "損毀的套件"
-#: apt-private/private-install.cc:702
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "下列的額外套件將被安裝:"
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "建議套件:"
-#: apt-private/private-install.cc:793
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "推薦套件:"
-#: apt-private/private-install.cc:815
+#: apt-private/private-install.cc:825
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "忽略 %s,它已被安裝且沒有計劃要進行升級。\n"
-#: apt-private/private-install.cc:819
+#: apt-private/private-install.cc:829
#, fuzzy, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr "忽略 %s,它已被安裝且沒有計劃要進行升級。\n"
-#: apt-private/private-install.cc:831
+#: apt-private/private-install.cc:841
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "無法重新安裝 %s,因為它無法下載。\n"
-#: apt-private/private-install.cc:836
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s 已經是最新版本了。\n"
-#: apt-private/private-install.cc:884
+#: apt-private/private-install.cc:894
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n"
-#: apt-private/private-install.cc:889
+#: apt-private/private-install.cc:899
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:931
+#: apt-private/private-install.cc:941
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr "套件 %s 並沒有被安裝,所以也不會被移除\n"
-#: apt-private/private-install.cc:937
+#: apt-private/private-install.cc:947
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "套件 %s 並沒有被安裝,所以也不會被移除\n"
@@ -2158,23 +2157,23 @@ msgstr "無法寫入 %s"
msgid "IO Error saving source cache"
msgstr "在儲存來源快取時 IO 錯誤"
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/edsp.cc:234
+#: apt-pkg/edsp.cc:241
msgid "Send request to solver"
msgstr ""
-#: apt-pkg/edsp.cc:313
+#: apt-pkg/edsp.cc:320
msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/edsp.cc:320
+#: apt-pkg/edsp.cc:327
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
msgid "Execute external solver"
msgstr ""
@@ -2815,7 +2814,7 @@ msgstr ""
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/strutl.cc:1243
#, c-format
msgid "Selection %s not found"
msgstr "選項 %s 找不到"
@@ -3464,7 +3463,7 @@ msgstr "在計算 MD5 時無法讀取到資料"
msgid "Problem unlinking %s"
msgstr "在取消 %s 的連結時發生問題"
-#: cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-internal-solver.cc:49
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -3516,6 +3515,10 @@ msgstr ""
" -c=? 讀取指定的設定檔\n"
" -o=? 指定任意的設定選項,例如:-o dir::cache=/tmp\n"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "內部錯誤,AllUpgrade 造成了損壞"
+
#~ msgid "%s not a valid DEB package."
#~ msgstr "%s 並不是正確的 DEB 套件。"