summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
Diffstat (limited to 'po')
-rw-r--r--po/aptitude.pot171
-rw-r--r--po/ar.po171
-rw-r--r--po/bs.po171
-rw-r--r--po/ca.po171
-rw-r--r--po/cs.po174
-rw-r--r--po/da.po171
-rw-r--r--po/de.po171
-rw-r--r--po/el.po171
-rw-r--r--po/es.po171
-rw-r--r--po/eu.po171
-rw-r--r--po/fi.po171
-rw-r--r--po/fr.po171
-rw-r--r--po/gl.po171
-rw-r--r--po/it.po171
-rw-r--r--po/ja.po171
-rw-r--r--po/lt.po171
-rw-r--r--po/nb.po171
-rw-r--r--po/nl.po171
-rw-r--r--po/nn.po171
-rw-r--r--po/pl.po171
-rw-r--r--po/pt.po171
-rw-r--r--po/pt_BR.po171
-rw-r--r--po/ro.po171
-rw-r--r--po/ru.po171
-rw-r--r--po/sk.po171
-rw-r--r--po/sv.po171
-rw-r--r--po/tl.po171
-rw-r--r--po/tr.po171
-rw-r--r--po/vi.po171
-rw-r--r--po/zh_CN.po171
-rw-r--r--po/zh_TW.po171
31 files changed, 2667 insertions, 2637 deletions
diff --git a/po/aptitude.pot b/po/aptitude.pot
index ee1217d1..9b1a82b2 100644
--- a/po/aptitude.pot
+++ b/po/aptitude.pot
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
-"POT-Creation-Date: 2005-11-07 15:22-0800\n"
+"POT-Creation-Date: 2005-11-13 10:12-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -194,7 +194,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
msgstr ""
#: src/broken_indicator.cc:273 src/solution_dialog.cc:126
-#: src/solution_screen.cc:513
+#: src/solution_screen.cc:522
msgid "Internal error: unexpected null solution."
msgstr ""
@@ -750,37 +750,37 @@ msgid ""
"The following actions are available:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:167
+#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:184
msgid "'+' to install packages"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:186
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:171
+#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:188
msgid "'-' to remove packages"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:173
+#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:190
msgid "'_' to purge packages"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:175
+#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:192
msgid "'=' to place packages on hold"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:177
+#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:194
msgid ""
"':' to keep packages in their current state without placing them on hold"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:179
+#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:196
msgid "'&M' to mark packages as automatically installed"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:181
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:198
msgid "'&m' to mark packages as manually installed"
msgstr ""
@@ -845,194 +845,195 @@ msgstr ""
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_resolver.cc:124 src/cmdline/cmdline_resolver.cc:597
+#: src/generic/apt/apt.cc:199
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:130 src/cmdline/cmdline_resolver.cc:602
+#, c-format
+msgid "Error writing resolver state to %s"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:604
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:145
#, c-format
msgid ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
"n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:164
msgid "accept the proposed changes"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:149
+#: src/cmdline/cmdline_resolver.cc:166
msgid "reject the proposed changes and search for another solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:151
+#: src/cmdline/cmdline_resolver.cc:168
msgid "give up and quit the program"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:153
+#: src/cmdline/cmdline_resolver.cc:170
msgid "move to the next solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:155
+#: src/cmdline/cmdline_resolver.cc:172
msgid "move to the previous solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:157
+#: src/cmdline/cmdline_resolver.cc:174
msgid "view an explanation of the changes in the solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:159
+#: src/cmdline/cmdline_resolver.cc:176
msgid "examine the solution in the visual user interface"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:178
msgid ""
"reject the given package versions; don't display any solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:163
+#: src/cmdline/cmdline_resolver.cc:180
msgid ""
"accept the given package versions; display only solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:165
+#: src/cmdline/cmdline_resolver.cc:182
msgid "adjust the state of the listed packages, where ACTION is one of:"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:183
+#: src/cmdline/cmdline_resolver.cc:200
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:197
+#: src/cmdline/cmdline_resolver.cc:214
#, c-format
msgid "The version %s is available in the following archives:"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:205
+#: src/cmdline/cmdline_resolver.cc:222
#, c-format
msgid "Select the version of %s that should be used: "
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:229
#, c-format
msgid "Invalid response. Please enter an integer between 1 and %d."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:227
+#: src/cmdline/cmdline_resolver.cc:244
#, c-format
msgid "Expected at least one package/version pair following '%c'"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:241
+#: src/cmdline/cmdline_resolver.cc:258
#, c-format
msgid "Expected a version after \"%s\""
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:268
#, c-format
msgid "No such package \"%s\""
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_resolver.cc:284
#, c-format
msgid "%s has no version named \"%s\""
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:301
#, c-format
msgid "Allowing the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:287
+#: src/cmdline/cmdline_resolver.cc:304
#, c-format
msgid "Allowing the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:314
#, c-format
msgid "Rejecting the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:317
#, c-format
msgid "Rejecting the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:330
#, c-format
msgid "No longer requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:333
#, c-format
msgid "No longer requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:325
+#: src/cmdline/cmdline_resolver.cc:342
#, c-format
msgid "Requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:328
+#: src/cmdline/cmdline_resolver.cc:345
#, c-format
msgid "Requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:447 src/solution_screen.cc:486
+#: src/cmdline/cmdline_resolver.cc:464 src/solution_screen.cc:495
#, c-format
msgid "open: %d; closed: %d; defer: %d; conflict: %d"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:493
+#: src/cmdline/cmdline_resolver.cc:510
msgid "The following actions will resolve these dependencies:"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:508
+#: src/cmdline/cmdline_resolver.cc:525
msgid "Accept this solution? [Y/n/q/?] "
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:535 src/cmdline/cmdline_resolver.cc:627
+#: src/cmdline/cmdline_resolver.cc:552 src/cmdline/cmdline_resolver.cc:644
msgid "Abandoning all efforts to resolve these dependencies."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:562
+#: src/cmdline/cmdline_resolver.cc:579
msgid "The following commands are available:"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:577
+#: src/cmdline/cmdline_resolver.cc:594
msgid "File to write resolver state to: "
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:580 src/generic/apt/apt.cc:199
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr ""
-
-#: src/cmdline/cmdline_resolver.cc:585
-#, c-format
-msgid "Error writing resolver state to %s"
-msgstr ""
-
-#: src/cmdline/cmdline_resolver.cc:587
-msgid "Resolver state successfully written!"
-msgstr ""
-
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:609
msgid "Invalid response; please enter one of the following commands:"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:602
+#: src/cmdline/cmdline_resolver.cc:619
msgid "No solution found within the allotted time. Try harder? [Y/n]"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:630
+#: src/cmdline/cmdline_resolver.cc:647
msgid "Invalid response; please enter 'y' or 'n'."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:639
+#: src/cmdline/cmdline_resolver.cc:656
msgid "Unable to resolve dependencies! Giving up..."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:645
+#: src/cmdline/cmdline_resolver.cc:662
msgid "*** No more solutions available ***"
msgstr ""
@@ -1446,61 +1447,61 @@ msgstr ""
msgid "Reading extended state information"
msgstr ""
-#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:403
-#: src/generic/apt/aptcache.cc:406
+#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:405
+#: src/generic/apt/aptcache.cc:408
msgid "Initializing package states"
msgstr ""
-#: src/generic/apt/aptcache.cc:530
+#: src/generic/apt/aptcache.cc:533
msgid "Cannot open Aptitude state file"
msgstr ""
-#: src/generic/apt/aptcache.cc:534 src/generic/apt/aptcache.cc:589
-#: src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:537 src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:595
msgid "Writing extended state information"
msgstr ""
-#: src/generic/apt/aptcache.cc:571
+#: src/generic/apt/aptcache.cc:574
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr ""
-#: src/generic/apt/aptcache.cc:580
+#: src/generic/apt/aptcache.cc:583
msgid "Couldn't write state file"
msgstr ""
-#: src/generic/apt/aptcache.cc:597
+#: src/generic/apt/aptcache.cc:600
msgid "Error writing state file"
msgstr ""
-#: src/generic/apt/aptcache.cc:615
+#: src/generic/apt/aptcache.cc:618
#, c-format
msgid "failed to remove %s"
msgstr ""
-#: src/generic/apt/aptcache.cc:622
+#: src/generic/apt/aptcache.cc:625
#, c-format
msgid "failed to rename %s to %s"
msgstr ""
-#: src/generic/apt/aptcache.cc:630
+#: src/generic/apt/aptcache.cc:633
#, c-format
msgid "couldn't replace %s with %s"
msgstr ""
-#: src/generic/apt/aptcache.cc:1122
+#: src/generic/apt/aptcache.cc:1125
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr ""
-#: src/generic/apt/aptcache.cc:1526
+#: src/generic/apt/aptcache.cc:1600
msgid "The list of sources could not be read."
msgstr ""
-#: src/generic/apt/aptcache.cc:1533
+#: src/generic/apt/aptcache.cc:1607
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
-#: src/generic/apt/aptcache.cc:1536
+#: src/generic/apt/aptcache.cc:1610
msgid "You may want to update the package lists to correct these missing files"
msgstr ""
@@ -3454,12 +3455,12 @@ msgid ""
"s' if you are."
msgstr ""
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:284
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:291
#, c-format
msgid "Information about %s"
msgstr ""
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:282
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:289
#, c-format
msgid "%s info"
msgstr ""
@@ -3761,7 +3762,7 @@ msgid ""
"broken if it is %s."
msgstr ""
-#: src/solution_dialog.cc:91 src/solution_screen.cc:457
+#: src/solution_dialog.cc:91 src/solution_screen.cc:465
msgid "The package cache is not available."
msgstr ""
@@ -3769,11 +3770,11 @@ msgstr ""
msgid "No packages are broken."
msgstr ""
-#: src/solution_dialog.cc:108 src/solution_screen.cc:479
+#: src/solution_dialog.cc:108 src/solution_screen.cc:488
msgid "No resolution found."
msgstr ""
-#: src/solution_dialog.cc:114 src/solution_screen.cc:490
+#: src/solution_dialog.cc:114 src/solution_screen.cc:499
msgid "Resolving dependencies..."
msgstr ""
@@ -3808,7 +3809,7 @@ msgstr ""
msgid "%s suggests %s"
msgstr ""
-#: src/solution_fragment.cc:113 src/solution_item.cc:583
+#: src/solution_fragment.cc:113 src/solution_item.cc:593
#, c-format
msgid "%s recommends %s"
msgstr ""
@@ -3912,7 +3913,7 @@ msgstr ""
msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgstr ""
-#: src/solution_item.cc:587
+#: src/solution_item.cc:597
#, c-format
msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
msgstr ""
@@ -3945,7 +3946,7 @@ msgstr ""
msgid "Leave the following recommendations unresolved:"
msgstr ""
-#: src/solution_screen.cc:463
+#: src/solution_screen.cc:472
msgid "No broken packages."
msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 818ab205..ae6f7e58 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude_po\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
-"POT-Creation-Date: 2005-11-07 15:22-0800\n"
+"POT-Creation-Date: 2005-11-13 10:12-0800\n"
"PO-Revision-Date: 2005-09-14 00:20+0300\n"
"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
"Language-Team: Arabic <support@arabeyes.org>\n"
@@ -196,7 +196,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
msgstr ""
#: src/broken_indicator.cc:273 src/solution_dialog.cc:126
-#: src/solution_screen.cc:513
+#: src/solution_screen.cc:522
msgid "Internal error: unexpected null solution."
msgstr "خطأ داخلي: حلّ غير فارغ متوقع."
@@ -780,37 +780,37 @@ msgstr ""
"الإجراء متبوعاً بواحد أو أكثر من أسماء الحزم (أو التعابير). سيطبق الإجراء على "
"جميع الحزم التي تسردها. الإجراءات التالية هي المتوفرة:"
-#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:167
+#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:184
msgid "'+' to install packages"
msgstr "'+' لتثبيت الحزم"
-#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:186
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
msgstr "'+M' لتثبيت الحزم ولتوّه سيشار إليها كمثبّتة تلقائيا"
-#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:171
+#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:188
msgid "'-' to remove packages"
msgstr "'-' لإزالة الحزم"
-#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:173
+#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:190
msgid "'_' to purge packages"
msgstr "'_' لتنظيف الحزم"
-#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:175
+#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:192
msgid "'=' to place packages on hold"
msgstr "'=' لوضع الحزم قيد الإبقاء"
-#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:177
+#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:194
msgid ""
"':' to keep packages in their current state without placing them on hold"
msgstr "':' لإبقاء الحزم على وضعها الحالي دون جعلها في وضع الإبقاء"
-#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:179
+#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:196
msgid "'&M' to mark packages as automatically installed"
msgstr "'&M' لتحديد الحزم بالتثبيت التلقائي"
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:181
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:198
msgid "'&m' to mark packages as manually installed"
msgstr "'&m' لتحديد الحزم بالتثبيت اليدوي"
@@ -893,195 +893,196 @@ msgstr ""
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr "ردّ غير صالح. رجاء أدخل أمراً صالحاً أ '؟' للمساعدة.\n"
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_resolver.cc:124 src/cmdline/cmdline_resolver.cc:597
+#: src/generic/apt/apt.cc:199
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "تعذر فتح %s للتسجيل"
+
+#: src/cmdline/cmdline_resolver.cc:130 src/cmdline/cmdline_resolver.cc:602
+#, c-format
+msgid "Error writing resolver state to %s"
+msgstr "خطأ في تسجيل وضع المُحلّل إلى %s"
+
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:604
+msgid "Resolver state successfully written!"
+msgstr "تم تسجيل وضع المحلّل بنجاح!"
+
+#: src/cmdline/cmdline_resolver.cc:145
#, fuzzy, c-format
msgid ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
"n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
msgstr "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:164
msgid "accept the proposed changes"
msgstr "قبول التغييرات المقدمة"
-#: src/cmdline/cmdline_resolver.cc:149
+#: src/cmdline/cmdline_resolver.cc:166
msgid "reject the proposed changes and search for another solution"
msgstr "رفض التغييرات المقترحة و البحث عن حلّ آخر"
-#: src/cmdline/cmdline_resolver.cc:151
+#: src/cmdline/cmdline_resolver.cc:168
msgid "give up and quit the program"
msgstr "تراجع والخروج من البرنامج"
-#: src/cmdline/cmdline_resolver.cc:153
+#: src/cmdline/cmdline_resolver.cc:170
msgid "move to the next solution"
msgstr "الانتقال إلى الحل التالي"
-#: src/cmdline/cmdline_resolver.cc:155
+#: src/cmdline/cmdline_resolver.cc:172
msgid "move to the previous solution"
msgstr "الانتقال إلى الحل السابق"
-#: src/cmdline/cmdline_resolver.cc:157
+#: src/cmdline/cmdline_resolver.cc:174
msgid "view an explanation of the changes in the solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:159
+#: src/cmdline/cmdline_resolver.cc:176
#, fuzzy
msgid "examine the solution in the visual user interface"
msgstr "تغيير الإعدادات التي تؤثر على واجهة المستخدم"
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:178
msgid ""
"reject the given package versions; don't display any solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:163
+#: src/cmdline/cmdline_resolver.cc:180
msgid ""
"accept the given package versions; display only solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:165
+#: src/cmdline/cmdline_resolver.cc:182
msgid "adjust the state of the listed packages, where ACTION is one of:"
msgstr "ضبط حالة الحزم المسردة، بحيث ACTION هي واحدة من:"
-#: src/cmdline/cmdline_resolver.cc:183
+#: src/cmdline/cmdline_resolver.cc:200
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
msgstr "ستتسبب التعديلات بتجاهل الحلّ الحالي وإعادة حسابه بحسب الحاجة."
-#: src/cmdline/cmdline_resolver.cc:197
+#: src/cmdline/cmdline_resolver.cc:214
#, c-format
msgid "The version %s is available in the following archives:"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:205
+#: src/cmdline/cmdline_resolver.cc:222
#, c-format
msgid "Select the version of %s that should be used: "
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:229
#, fuzzy, c-format
msgid "Invalid response. Please enter an integer between 1 and %d."
msgstr "ردّ باطل؛ من فضلك أدخل 'y' أو 'n'."
-#: src/cmdline/cmdline_resolver.cc:227
+#: src/cmdline/cmdline_resolver.cc:244
#, c-format
msgid "Expected at least one package/version pair following '%c'"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:241
+#: src/cmdline/cmdline_resolver.cc:258
#, c-format
msgid "Expected a version after \"%s\""
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:268
#, fuzzy, c-format
msgid "No such package \"%s\""
msgstr "الحزمة المصدرية: "
-#: src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_resolver.cc:284
#, c-format
msgid "%s has no version named \"%s\""
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:301
#, c-format
msgid "Allowing the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:287
+#: src/cmdline/cmdline_resolver.cc:304
#, c-format
msgid "Allowing the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:314
#, c-format
msgid "Rejecting the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:317
#, c-format
msgid "Rejecting the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:330
#, c-format
msgid "No longer requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:333
#, c-format
msgid "No longer requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:325
+#: src/cmdline/cmdline_resolver.cc:342
#, c-format
msgid "Requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:328
+#: src/cmdline/cmdline_resolver.cc:345
#, c-format
msgid "Requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:447 src/solution_screen.cc:486
+#: src/cmdline/cmdline_resolver.cc:464 src/solution_screen.cc:495
#, c-format
msgid "open: %d; closed: %d; defer: %d; conflict: %d"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:493
+#: src/cmdline/cmdline_resolver.cc:510
msgid "The following actions will resolve these dependencies:"
msgstr "العمليات التالية ستحلّ هذه الاعتمادات:"
-#: src/cmdline/cmdline_resolver.cc:508
+#: src/cmdline/cmdline_resolver.cc:525
msgid "Accept this solution? [Y/n/q/?] "
msgstr "قبول هذا الحل? [Y/n/q/?] "
-#: src/cmdline/cmdline_resolver.cc:535 src/cmdline/cmdline_resolver.cc:627
+#: src/cmdline/cmdline_resolver.cc:552 src/cmdline/cmdline_resolver.cc:644
msgid "Abandoning all efforts to resolve these dependencies."
msgstr "تجاهل جميع الجهود لحلّ هذه المعتمدات."
-#: src/cmdline/cmdline_resolver.cc:562
+#: src/cmdline/cmdline_resolver.cc:579
msgid "The following commands are available:"
msgstr "الأوامر التالية متوفّرة:"
-#: src/cmdline/cmdline_resolver.cc:577
+#: src/cmdline/cmdline_resolver.cc:594
msgid "File to write resolver state to: "
msgstr "اسم الملف المطلوب تسجيل وضع المحلّل إليه:"
-#: src/cmdline/cmdline_resolver.cc:580 src/generic/apt/apt.cc:199
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "تعذر فتح %s للتسجيل"
-
-#: src/cmdline/cmdline_resolver.cc:585
-#, c-format
-msgid "Error writing resolver state to %s"
-msgstr "خطأ في تسجيل وضع المُحلّل إلى %s"
-
-#: src/cmdline/cmdline_resolver.cc:587
-msgid "Resolver state successfully written!"
-msgstr "تم تسجيل وضع المحلّل بنجاح!"
-
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:609
msgid "Invalid response; please enter one of the following commands:"
msgstr "ردّ باطل؛ من فضلك أدخل أحد هذه الأوامر: "
-#: src/cmdline/cmdline_resolver.cc:602
+#: src/cmdline/cmdline_resolver.cc:619
msgid "No solution found within the allotted time. Try harder? [Y/n]"
msgstr "لم يُعثر على حل ضمن الوقع المُخصّص. هل أحاول بجهد أكبر؟ [Y/n]"
-#: src/cmdline/cmdline_resolver.cc:630
+#: src/cmdline/cmdline_resolver.cc:647
msgid "Invalid response; please enter 'y' or 'n'."
msgstr "ردّ باطل؛ من فضلك أدخل 'y' أو 'n'."
-#: src/cmdline/cmdline_resolver.cc:639
+#: src/cmdline/cmdline_resolver.cc:656
msgid "Unable to resolve dependencies! Giving up..."
msgstr "تعذر إرضاء المعتمدات! الاستسلام..."
-#: src/cmdline/cmdline_resolver.cc:645
+#: src/cmdline/cmdline_resolver.cc:662
#, fuzzy
msgid "*** No more solutions available ***"
msgstr "لا مزيد من الحلول."
@@ -1498,61 +1499,61 @@ msgstr "تعذر فتح ملف وضع Aptitude التفصيلي"
msgid "Reading extended state information"
msgstr "قراءة معلومات الوضع التفصيلية"
-#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:403
-#: src/generic/apt/aptcache.cc:406
+#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:405
+#: src/generic/apt/aptcache.cc:408
msgid "Initializing package states"
msgstr "تمهيد أحوال الحزم"
-#: src/generic/apt/aptcache.cc:530
+#: src/generic/apt/aptcache.cc:533
msgid "Cannot open Aptitude state file"
msgstr "تعذر فتح ملف وضع Aptitude"
-#: src/generic/apt/aptcache.cc:534 src/generic/apt/aptcache.cc:589
-#: src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:537 src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:595
msgid "Writing extended state information"
msgstr "تسجيل معلومات الوضع التفصيلية"
-#: src/generic/apt/aptcache.cc:571
+#: src/generic/apt/aptcache.cc:574
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr ""
-#: src/generic/apt/aptcache.cc:580
+#: src/generic/apt/aptcache.cc:583
msgid "Couldn't write state file"
msgstr "تعذر تسجيل ملف الوضع"
-#: src/generic/apt/aptcache.cc:597
+#: src/generic/apt/aptcache.cc:600
msgid "Error writing state file"
msgstr "خطأ في تسجيل ملف الوضع"
-#: src/generic/apt/aptcache.cc:615
+#: src/generic/apt/aptcache.cc:618
#, fuzzy, c-format
msgid "failed to remove %s"
msgstr "تعذر فتح %ls"
-#: src/generic/apt/aptcache.cc:622
+#: src/generic/apt/aptcache.cc:625
#, c-format
msgid "failed to rename %s to %s"
msgstr ""
-#: src/generic/apt/aptcache.cc:630
+#: src/generic/apt/aptcache.cc:633
#, fuzzy, c-format
msgid "couldn't replace %s with %s"
msgstr "تعذر استبدال ملف الوضع القديم"
-#: src/generic/apt/aptcache.cc:1122
+#: src/generic/apt/aptcache.cc:1125
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr "تعذر تصحيح المعتمدات، لذا لن يمكن تثبيت بعض الحزم"
-#: src/generic/apt/aptcache.cc:1526
+#: src/generic/apt/aptcache.cc:1600
msgid "The list of sources could not be read."
msgstr "تعذرت قراءة لائحة المصادر."
-#: src/generic/apt/aptcache.cc:1533
+#: src/generic/apt/aptcache.cc:1607
msgid "The package lists or status file could not be parsed or opened."
msgstr "لوائح الحزم أو ملف الوضع تعذر إعرابه أو فتحه."
-#: src/generic/apt/aptcache.cc:1536
+#: src/generic/apt/aptcache.cc:1610
msgid "You may want to update the package lists to correct these missing files"
msgstr "قد ترغب بتحديث لوائح الحزم لتصحيح هذه الملفات المفقودة"
@@ -3630,12 +3631,12 @@ msgstr ""
"هل أنت متأكّد من أنك تريد إزالتها؟\n"
"اطبع '%s' إن كنت كذلك."
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:284
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:291
#, c-format
msgid "Information about %s"
msgstr "معلومات حول %s"
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:282
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:289
#, c-format
msgid "%s info"
msgstr "معلومات %s"
@@ -3951,7 +3952,7 @@ msgid ""
"broken if it is %s."
msgstr "الحزم التالية تعتمد على النسخة %B%s%b من %B%s%b، وسوف تُعطب إن كانت %s."
-#: src/solution_dialog.cc:91 src/solution_screen.cc:457
+#: src/solution_dialog.cc:91 src/solution_screen.cc:465
msgid "The package cache is not available."
msgstr ""
@@ -3959,11 +3960,11 @@ msgstr ""
msgid "No packages are broken."
msgstr "ليس هناك حزم معطوبة."
-#: src/solution_dialog.cc:108 src/solution_screen.cc:479
+#: src/solution_dialog.cc:108 src/solution_screen.cc:488
msgid "No resolution found."
msgstr ""
-#: src/solution_dialog.cc:114 src/solution_screen.cc:490
+#: src/solution_dialog.cc:114 src/solution_screen.cc:499
#, fuzzy
msgid "Resolving dependencies..."
msgstr "تعذر إرضاء المعتمدات."
@@ -3999,7 +4000,7 @@ msgstr "تعتمد مسبقاً على"
msgid "%s suggests %s"
msgstr "يقترح"
-#: src/solution_fragment.cc:113 src/solution_item.cc:583
+#: src/solution_fragment.cc:113 src/solution_item.cc:593
#, fuzzy, c-format
msgid "%s recommends %s"
msgstr "يوصي"
@@ -4103,7 +4104,7 @@ msgstr ""
msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgstr "تم تنزيل %s بايت خلال %s (%s بايت/ثانية)."
-#: src/solution_item.cc:587
+#: src/solution_item.cc:597
#, c-format
msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
msgstr ""
@@ -4143,7 +4144,7 @@ msgstr "%Bتثبيط%b الحزم التالية:%n"
msgid "Leave the following recommendations unresolved:"
msgstr "الأوامر التالية متوفّرة:"
-#: src/solution_screen.cc:463
+#: src/solution_screen.cc:472
#, fuzzy
msgid "No broken packages."
msgstr "'-' لإزالة الحزم"
diff --git a/po/bs.po b/po/bs.po
index dd754448..09bfca68 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
-"POT-Creation-Date: 2005-11-07 15:22-0800\n"
+"POT-Creation-Date: 2005-11-13 10:12-0800\n"
"PO-Revision-Date: 2004-05-08 17:40+0100\n"
"Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
"Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -196,7 +196,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
msgstr ""
#: src/broken_indicator.cc:273 src/solution_dialog.cc:126
-#: src/solution_screen.cc:513
+#: src/solution_screen.cc:522
msgid "Internal error: unexpected null solution."
msgstr ""
@@ -754,40 +754,40 @@ msgid ""
"The following actions are available:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:167
+#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:184
#, fuzzy
msgid "'+' to install packages"
msgstr "Automatski nadogradi instalirane pakete"
-#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:186
#, fuzzy
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
msgstr "Slijedeći NOVI paketi će biti automatski instalirani:"
-#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:171
+#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:188
msgid "'-' to remove packages"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:173
+#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:190
msgid "'_' to purge packages"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:175
+#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:192
msgid "'=' to place packages on hold"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:177
+#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:194
msgid ""
"':' to keep packages in their current state without placing them on hold"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:179
+#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:196
#, fuzzy
msgid "'&M' to mark packages as automatically installed"
msgstr "Slijedeći NOVI paketi će biti automatski instalirani:"
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:181
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:198
msgid "'&m' to mark packages as manually installed"
msgstr ""
@@ -853,195 +853,196 @@ msgstr ""
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_resolver.cc:124 src/cmdline/cmdline_resolver.cc:597
+#: src/generic/apt/apt.cc:199
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:130 src/cmdline/cmdline_resolver.cc:602
+#, c-format
+msgid "Error writing resolver state to %s"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:604
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:145
#, c-format
msgid ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
"n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:164
msgid "accept the proposed changes"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:149
+#: src/cmdline/cmdline_resolver.cc:166
msgid "reject the proposed changes and search for another solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:151
+#: src/cmdline/cmdline_resolver.cc:168
msgid "give up and quit the program"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:153
+#: src/cmdline/cmdline_resolver.cc:170
msgid "move to the next solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:155
+#: src/cmdline/cmdline_resolver.cc:172
msgid "move to the previous solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:157
+#: src/cmdline/cmdline_resolver.cc:174
msgid "view an explanation of the changes in the solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:159
+#: src/cmdline/cmdline_resolver.cc:176
msgid "examine the solution in the visual user interface"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:178
msgid ""
"reject the given package versions; don't display any solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:163
+#: src/cmdline/cmdline_resolver.cc:180
msgid ""
"accept the given package versions; display only solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:165
+#: src/cmdline/cmdline_resolver.cc:182
msgid "adjust the state of the listed packages, where ACTION is one of:"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:183
+#: src/cmdline/cmdline_resolver.cc:200
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:197
+#: src/cmdline/cmdline_resolver.cc:214
#, c-format
msgid "The version %s is available in the following archives:"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:205
+#: src/cmdline/cmdline_resolver.cc:222
#, c-format
msgid "Select the version of %s that should be used: "
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:229
#, c-format
msgid "Invalid response. Please enter an integer between 1 and %d."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:227
+#: src/cmdline/cmdline_resolver.cc:244
#, c-format
msgid "Expected at least one package/version pair following '%c'"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:241
+#: src/cmdline/cmdline_resolver.cc:258
#, c-format
msgid "Expected a version after \"%s\""
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:268
#, c-format
msgid "No such package \"%s\""
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_resolver.cc:284
#, c-format
msgid "%s has no version named \"%s\""
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:301
#, c-format
msgid "Allowing the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:287
+#: src/cmdline/cmdline_resolver.cc:304
#, c-format
msgid "Allowing the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:314
#, c-format
msgid "Rejecting the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:317
#, c-format
msgid "Rejecting the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:330
#, c-format
msgid "No longer requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:333
#, c-format
msgid "No longer requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:325
+#: src/cmdline/cmdline_resolver.cc:342
#, c-format
msgid "Requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:328
+#: src/cmdline/cmdline_resolver.cc:345
#, c-format
msgid "Requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:447 src/solution_screen.cc:486
+#: src/cmdline/cmdline_resolver.cc:464 src/solution_screen.cc:495
#, c-format
msgid "open: %d; closed: %d; defer: %d; conflict: %d"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:493
+#: src/cmdline/cmdline_resolver.cc:510
msgid "The following actions will resolve these dependencies:"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:508
+#: src/cmdline/cmdline_resolver.cc:525
msgid "Accept this solution? [Y/n/q/?] "
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:535 src/cmdline/cmdline_resolver.cc:627
+#: src/cmdline/cmdline_resolver.cc:552 src/cmdline/cmdline_resolver.cc:644
msgid "Abandoning all efforts to resolve these dependencies."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:562
+#: src/cmdline/cmdline_resolver.cc:579
#, fuzzy
msgid "The following commands are available:"
msgstr "Slijedeći paketi su OŠTEĆENI:"
-#: src/cmdline/cmdline_resolver.cc:577
+#: src/cmdline/cmdline_resolver.cc:594
msgid "File to write resolver state to: "
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:580 src/generic/apt/apt.cc:199
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr ""
-
-#: src/cmdline/cmdline_resolver.cc:585
-#, c-format
-msgid "Error writing resolver state to %s"
-msgstr ""
-
-#: src/cmdline/cmdline_resolver.cc:587
-msgid "Resolver state successfully written!"
-msgstr ""
-
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:609
msgid "Invalid response; please enter one of the following commands:"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:602
+#: src/cmdline/cmdline_resolver.cc:619
msgid "No solution found within the allotted time. Try harder? [Y/n]"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:630
+#: src/cmdline/cmdline_resolver.cc:647
msgid "Invalid response; please enter 'y' or 'n'."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:639
+#: src/cmdline/cmdline_resolver.cc:656
msgid "Unable to resolve dependencies! Giving up..."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:645
+#: src/cmdline/cmdline_resolver.cc:662
msgid "*** No more solutions available ***"
msgstr ""
@@ -1456,61 +1457,61 @@ msgstr ""
msgid "Reading extended state information"
msgstr ""
-#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:403
-#: src/generic/apt/aptcache.cc:406
+#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:405
+#: src/generic/apt/aptcache.cc:408
msgid "Initializing package states"
msgstr ""
-#: src/generic/apt/aptcache.cc:530
+#: src/generic/apt/aptcache.cc:533
msgid "Cannot open Aptitude state file"
msgstr ""
-#: src/generic/apt/aptcache.cc:534 src/generic/apt/aptcache.cc:589
-#: src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:537 src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:595
msgid "Writing extended state information"
msgstr ""
-#: src/generic/apt/aptcache.cc:571
+#: src/generic/apt/aptcache.cc:574
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr ""
-#: src/generic/apt/aptcache.cc:580
+#: src/generic/apt/aptcache.cc:583
msgid "Couldn't write state file"
msgstr ""
-#: src/generic/apt/aptcache.cc:597
+#: src/generic/apt/aptcache.cc:600
msgid "Error writing state file"
msgstr ""
-#: src/generic/apt/aptcache.cc:615
+#: src/generic/apt/aptcache.cc:618
#, c-format
msgid "failed to remove %s"
msgstr ""
-#: src/generic/apt/aptcache.cc:622
+#: src/generic/apt/aptcache.cc:625
#, c-format
msgid "failed to rename %s to %s"
msgstr ""
-#: src/generic/apt/aptcache.cc:630
+#: src/generic/apt/aptcache.cc:633
#, c-format
msgid "couldn't replace %s with %s"
msgstr ""
-#: src/generic/apt/aptcache.cc:1122
+#: src/generic/apt/aptcache.cc:1125
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr ""
-#: src/generic/apt/aptcache.cc:1526
+#: src/generic/apt/aptcache.cc:1600
msgid "The list of sources could not be read."
msgstr ""
-#: src/generic/apt/aptcache.cc:1533
+#: src/generic/apt/aptcache.cc:1607
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
-#: src/generic/apt/aptcache.cc:1536
+#: src/generic/apt/aptcache.cc:1610
msgid "You may want to update the package lists to correct these missing files"
msgstr ""
@@ -3469,12 +3470,12 @@ msgid ""
"s' if you are."
msgstr ""
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:284
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:291
#, c-format
msgid "Information about %s"
msgstr ""
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:282
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:289
#, c-format
msgid "%s info"
msgstr ""
@@ -3776,7 +3777,7 @@ msgid ""
"broken if it is %s."
msgstr ""
-#: src/solution_dialog.cc:91 src/solution_screen.cc:457
+#: src/solution_dialog.cc:91 src/solution_screen.cc:465
msgid "The package cache is not available."
msgstr ""
@@ -3785,11 +3786,11 @@ msgstr ""
msgid "No packages are broken."
msgstr "Automatski prikazuj zašto su paketi oštećeni"
-#: src/solution_dialog.cc:108 src/solution_screen.cc:479
+#: src/solution_dialog.cc:108 src/solution_screen.cc:488
msgid "No resolution found."
msgstr ""
-#: src/solution_dialog.cc:114 src/solution_screen.cc:490
+#: src/solution_dialog.cc:114 src/solution_screen.cc:499
msgid "Resolving dependencies..."
msgstr ""
@@ -3824,7 +3825,7 @@ msgstr ""
msgid "%s suggests %s"
msgstr "Predlaže"
-#: src/solution_fragment.cc:113 src/solution_item.cc:583
+#: src/solution_fragment.cc:113 src/solution_item.cc:593
#, fuzzy, c-format
msgid "%s recommends %s"
msgstr "Preporučuje"
@@ -3933,7 +3934,7 @@ msgstr ""
msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgstr ""
-#: src/solution_item.cc:587
+#: src/solution_item.cc:597
#, fuzzy, c-format
msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
msgstr "Slijedeći paketi su OŠTEĆENI:"
@@ -3972,7 +3973,7 @@ msgstr "Slijedeći paketi su OŠTEĆENI:"
msgid "Leave the following recommendations unresolved:"
msgstr "Slijedeći paketi su OŠTEĆENI:"
-#: src/solution_screen.cc:463
+#: src/solution_screen.cc:472
#, fuzzy
msgid "No broken packages."
msgstr "Paket:"
diff --git a/po/ca.po b/po/ca.po
index 421146e6..507d12a7 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude_0.2.13-2\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
-"POT-Creation-Date: 2005-11-07 15:22-0800\n"
+"POT-Creation-Date: 2005-11-13 10:12-0800\n"
"PO-Revision-Date: 2004-07-22 17:53+0100\n"
"Last-Translator: Aleix Badia i Bosch <a.badia@callusdigital.org>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -212,7 +212,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
msgstr "No s'ha pogut obrir %s per a l'escriptura"
#: src/broken_indicator.cc:273 src/solution_dialog.cc:126
-#: src/solution_screen.cc:513
+#: src/solution_screen.cc:522
msgid "Internal error: unexpected null solution."
msgstr ""
@@ -804,43 +804,43 @@ msgid ""
"The following actions are available:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:167
+#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:184
#, fuzzy
msgid "'+' to install packages"
msgstr "^Instal·la/suprimeix els paquets"
-#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:186
#, fuzzy
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
msgstr "Els paquets nous següents s'instal·laran automàticament:<"
-#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:171
+#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:188
#, fuzzy
msgid "'-' to remove packages"
msgstr "^Instal·la/suprimeix els paquets"
-#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:173
+#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:190
#, fuzzy
msgid "'_' to purge packages"
msgstr "^Oblida els paquets nous"
-#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:175
+#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:192
#, fuzzy
msgid "'=' to place packages on hold"
msgstr " hold - Deixa els paquets congelats\n"
-#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:177
+#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:194
msgid ""
"':' to keep packages in their current state without placing them on hold"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:179
+#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:196
#, fuzzy
msgid "'&M' to mark packages as automatically installed"
msgstr " markauto - Marca els paquets com a instal·lats automàticament\n"
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:181
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:198
#, fuzzy
msgid "'&m' to mark packages as manually installed"
msgstr " unmarkauto - Marca els paquets com a instal·lats manualment\n"
@@ -926,203 +926,204 @@ msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr ""
"La resposta no és vàlid. Introduïu una ordre vàlid o '?' per a ajuda.\n"
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_resolver.cc:124 src/cmdline/cmdline_resolver.cc:597
+#: src/generic/apt/apt.cc:199
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "No s'ha pogut obrir %s per a l'escriptura"
+
+#: src/cmdline/cmdline_resolver.cc:130 src/cmdline/cmdline_resolver.cc:602
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "S'ha produït un error en escriure el fitxer d'estat"
+
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:604
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:145
#, c-format
msgid ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
"n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:164
msgid "accept the proposed changes"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:149
+#: src/cmdline/cmdline_resolver.cc:166
msgid "reject the proposed changes and search for another solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:151
+#: src/cmdline/cmdline_resolver.cc:168
#, fuzzy
msgid "give up and quit the program"
msgstr "Surt del programa"
-#: src/cmdline/cmdline_resolver.cc:153
+#: src/cmdline/cmdline_resolver.cc:170
msgid "move to the next solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:155
+#: src/cmdline/cmdline_resolver.cc:172
msgid "move to the previous solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:157
+#: src/cmdline/cmdline_resolver.cc:174
msgid "view an explanation of the changes in the solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:159
+#: src/cmdline/cmdline_resolver.cc:176
#, fuzzy
msgid "examine the solution in the visual user interface"
msgstr "Canvia els paràmetres relacionats amb la interfície d'usuari"
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:178
msgid ""
"reject the given package versions; don't display any solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:163
+#: src/cmdline/cmdline_resolver.cc:180
msgid ""
"accept the given package versions; display only solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:165
+#: src/cmdline/cmdline_resolver.cc:182
msgid "adjust the state of the listed packages, where ACTION is one of:"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:183
+#: src/cmdline/cmdline_resolver.cc:200
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:197
+#: src/cmdline/cmdline_resolver.cc:214
#, c-format
msgid "The version %s is available in the following archives:"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:205
+#: src/cmdline/cmdline_resolver.cc:222
#, c-format
msgid "Select the version of %s that should be used: "
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:229
#, fuzzy, c-format
msgid "Invalid response. Please enter an integer between 1 and %d."
msgstr ""
"La resposta no és vàlid. Introduïu una ordre vàlid o '?' per a ajuda.\n"
-#: src/cmdline/cmdline_resolver.cc:227
+#: src/cmdline/cmdline_resolver.cc:244
#, c-format
msgid "Expected at least one package/version pair following '%c'"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:241
+#: src/cmdline/cmdline_resolver.cc:258
#, fuzzy, c-format
msgid "Expected a version after \"%s\""
msgstr "No s'ha pogut obrir %s per a l'escriptura"
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:268
#, fuzzy, c-format
msgid "No such package \"%s\""
msgstr "Font del paquet: "
-#: src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_resolver.cc:284
#, c-format
msgid "%s has no version named \"%s\""
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:301
#, c-format
msgid "Allowing the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:287
+#: src/cmdline/cmdline_resolver.cc:304
#, c-format
msgid "Allowing the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:314
#, c-format
msgid "Rejecting the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:317
#, c-format
msgid "Rejecting the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:330
#, c-format
msgid "No longer requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:333
#, c-format
msgid "No longer requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:325
+#: src/cmdline/cmdline_resolver.cc:342
#, c-format
msgid "Requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:328
+#: src/cmdline/cmdline_resolver.cc:345
#, c-format
msgid "Requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:447 src/solution_screen.cc:486
+#: src/cmdline/cmdline_resolver.cc:464 src/solution_screen.cc:495
#, c-format
msgid "open: %d; closed: %d; defer: %d; conflict: %d"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:493
+#: src/cmdline/cmdline_resolver.cc:510
#, fuzzy
msgid "The following actions will resolve these dependencies:"
msgstr "No s'han trobat les dependències del paquets següents:\n"
-#: src/cmdline/cmdline_resolver.cc:508
+#: src/cmdline/cmdline_resolver.cc:525
msgid "Accept this solution? [Y/n/q/?] "
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:535 src/cmdline/cmdline_resolver.cc:627
+#: src/cmdline/cmdline_resolver.cc:552 src/cmdline/cmdline_resolver.cc:644
msgid "Abandoning all efforts to resolve these dependencies."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:562
+#: src/cmdline/cmdline_resolver.cc:579
#, fuzzy
msgid "The following commands are available:"
msgstr "Els paquets següents contenen errors."
-#: src/cmdline/cmdline_resolver.cc:577
+#: src/cmdline/cmdline_resolver.cc:594
msgid "File to write resolver state to: "
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:580 src/generic/apt/apt.cc:199
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "No s'ha pogut obrir %s per a l'escriptura"
-
-#: src/cmdline/cmdline_resolver.cc:585
-#, fuzzy, c-format
-msgid "Error writing resolver state to %s"
-msgstr "S'ha produït un error en escriure el fitxer d'estat"
-
-#: src/cmdline/cmdline_resolver.cc:587
-msgid "Resolver state successfully written!"
-msgstr ""
-
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:609
#, fuzzy
msgid "Invalid response; please enter one of the following commands:"
msgstr ""
"La resposta no és vàlid. Introduïu una ordre vàlid o '?' per a ajuda.\n"
-#: src/cmdline/cmdline_resolver.cc:602
+#: src/cmdline/cmdline_resolver.cc:619
msgid "No solution found within the allotted time. Try harder? [Y/n]"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:630
+#: src/cmdline/cmdline_resolver.cc:647
#, fuzzy
msgid "Invalid response; please enter 'y' or 'n'."
msgstr ""
"La resposta no és vàlid. Introduïu una ordre vàlid o '?' per a ajuda.\n"
-#: src/cmdline/cmdline_resolver.cc:639
+#: src/cmdline/cmdline_resolver.cc:656
msgid "Unable to resolve dependencies! Giving up..."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:645
+#: src/cmdline/cmdline_resolver.cc:662
msgid "*** No more solutions available ***"
msgstr ""
@@ -1542,66 +1543,66 @@ msgstr "No s'ha pogut obrir el fitxer d'estat estès de l'Aptitude"
msgid "Reading extended state information"
msgstr "S'està llegint la informació d'estat estesa"
-#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:403
-#: src/generic/apt/aptcache.cc:406
+#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:405
+#: src/generic/apt/aptcache.cc:408
msgid "Initializing package states"
msgstr "S'estan inicialitzant els estats dels paquets"
-#: src/generic/apt/aptcache.cc:530
+#: src/generic/apt/aptcache.cc:533
msgid "Cannot open Aptitude state file"
msgstr "No s'ha pogut obrir el fitxer d'estat de l'Aptitude"
-#: src/generic/apt/aptcache.cc:534 src/generic/apt/aptcache.cc:589
-#: src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:537 src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:595
msgid "Writing extended state information"
msgstr "S'està escrivint la informació d'estat estesa"
-#: src/generic/apt/aptcache.cc:571
+#: src/generic/apt/aptcache.cc:574
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr ""
"S'ha produït un sobreeiximent de memòria intermèdia interna al paquet \"%s\" "
"quan s'estava escrivint el fitxer d'estat"
-#: src/generic/apt/aptcache.cc:580
+#: src/generic/apt/aptcache.cc:583
msgid "Couldn't write state file"
msgstr "No s'ha pogut escriure el fitxer d'estat"
-#: src/generic/apt/aptcache.cc:597
+#: src/generic/apt/aptcache.cc:600
msgid "Error writing state file"
msgstr "S'ha produït un error en escriure el fitxer d'estat"
-#: src/generic/apt/aptcache.cc:615
+#: src/generic/apt/aptcache.cc:618
#, fuzzy, c-format
msgid "failed to remove %s"
msgstr "No s'ha pogut obrir %s per a l'escriptura"
-#: src/generic/apt/aptcache.cc:622
+#: src/generic/apt/aptcache.cc:625
#, c-format
msgid "failed to rename %s to %s"
msgstr ""
-#: src/generic/apt/aptcache.cc:630
+#: src/generic/apt/aptcache.cc:633
#, fuzzy, c-format
msgid "couldn't replace %s with %s"
msgstr "no s'ha pogut reemplaçar el fitxer d'estat antic"
-#: src/generic/apt/aptcache.cc:1122
+#: src/generic/apt/aptcache.cc:1125
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr ""
"No s'han pogut resoldre les dependències, alguns paquets no es poden "
"instal·lar"
-#: src/generic/apt/aptcache.cc:1526
+#: src/generic/apt/aptcache.cc:1600
msgid "The list of sources could not be read."
msgstr "No s'ha pogut llegir la llista de fonts."
-#: src/generic/apt/aptcache.cc:1533
+#: src/generic/apt/aptcache.cc:1607
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
"No s'han pogut analitzar o obrir les llistes de paquets o el fitxer d'estat."
-#: src/generic/apt/aptcache.cc:1536
+#: src/generic/apt/aptcache.cc:1610
msgid "You may want to update the package lists to correct these missing files"
msgstr ""
"Probablement voldreu actualitzar la llista de paquets per resoldre els "
@@ -3928,12 +3929,12 @@ msgstr ""
"Esteu segur que el voleu suprimir?\n"
"Si n'esteu segur introduïu '%s'."
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:284
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:291
#, c-format
msgid "Information about %s"
msgstr "Informació quant a %s"
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:282
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:289
#, c-format
msgid "%s info"
msgstr ""
@@ -4286,7 +4287,7 @@ msgstr ""
"Els següents paquets depenen de la versió %B%s%b del %B%s%b i contindran "
"errors si és %s."
-#: src/solution_dialog.cc:91 src/solution_screen.cc:457
+#: src/solution_dialog.cc:91 src/solution_screen.cc:465
msgid "The package cache is not available."
msgstr ""
@@ -4295,11 +4296,11 @@ msgstr ""
msgid "No packages are broken."
msgstr "Alguns paquets contenen errors. Voleu intentar arreglar-los?"
-#: src/solution_dialog.cc:108 src/solution_screen.cc:479
+#: src/solution_dialog.cc:108 src/solution_screen.cc:488
msgid "No resolution found."
msgstr ""
-#: src/solution_dialog.cc:114 src/solution_screen.cc:490
+#: src/solution_dialog.cc:114 src/solution_screen.cc:499
#, fuzzy
msgid "Resolving dependencies..."
msgstr "No s'ha pogut obrir %s per a l'escriptura"
@@ -4338,7 +4339,7 @@ msgstr "predepèn de"
msgid "%s suggests %s"
msgstr "suggereix"
-#: src/solution_fragment.cc:113 src/solution_item.cc:583
+#: src/solution_fragment.cc:113 src/solution_item.cc:593
#, fuzzy, c-format
msgid "%s recommends %s"
msgstr "recomana"
@@ -4447,7 +4448,7 @@ msgstr ""
msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgstr "Baixats %sB en %s (%sB/s)."
-#: src/solution_item.cc:587
+#: src/solution_item.cc:597
#, fuzzy, c-format
msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
msgstr "Els paquets següents contenen errors."
@@ -4487,7 +4488,7 @@ msgstr "S'estan baixant les paquets"
msgid "Leave the following recommendations unresolved:"
msgstr "Els paquets següents contenen errors."
-#: src/solution_screen.cc:463
+#: src/solution_screen.cc:472
#, fuzzy
msgid "No broken packages."
msgstr "^Instal·la/suprimeix els paquets"
diff --git a/po/cs.po b/po/cs.po
index 53e2d07c..5deae40a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
-"POT-Creation-Date: 2005-11-07 15:22-0800\n"
+"POT-Creation-Date: 2005-11-13 10:12-0800\n"
"PO-Revision-Date: 2005-10-16 10:29+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -195,7 +195,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] Řeším závislosti"
#: src/broken_indicator.cc:273 src/solution_dialog.cc:126
-#: src/solution_screen.cc:513
+#: src/solution_screen.cc:522
msgid "Internal error: unexpected null solution."
msgstr "Vnitřní chyba: neočekávané prázdné řešení."
@@ -787,38 +787,38 @@ msgstr ""
"následovaný jedním nebo více názvy balíků nebo vzorů. Akce se provede na "
"všech zadaných balících. K dispozici jsou následující akce:"
-#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:167
+#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:184
msgid "'+' to install packages"
msgstr "'+' pro instalaci balíků"
-#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:186
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
msgstr ""
"'+M' pro instalaci balíků a následné označení jako instalované automaticky"
-#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:171
+#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:188
msgid "'-' to remove packages"
msgstr "'-' pro odstranění balíků"
-#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:173
+#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:190
msgid "'_' to purge packages"
msgstr "'_' pro odstranění balíků i s konfigurací"
-#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:175
+#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:192
msgid "'=' to place packages on hold"
msgstr "'=' pro podržení balíků v aktuální verzi"
-#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:177
+#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:194
msgid ""
"':' to keep packages in their current state without placing them on hold"
msgstr "':' pro ponechání balíků v aktuálním stavu bez permanentního podržení"
-#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:179
+#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:196
msgid "'&M' to mark packages as automatically installed"
msgstr "'&M' pro označení balíků jako instalované automaticky"
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:181
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:198
msgid "'&m' to mark packages as manually installed"
msgstr "'&m' pro označení balíků jako instalované ručně"
@@ -901,7 +901,22 @@ msgstr ""
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr "Chybná odpověď. Zadejte platný příkaz nebo '?' pro nápovědu.\n"
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_resolver.cc:124 src/cmdline/cmdline_resolver.cc:597
+#: src/generic/apt/apt.cc:199
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "Nemohu otevřít %s pro zápis"
+
+#: src/cmdline/cmdline_resolver.cc:130 src/cmdline/cmdline_resolver.cc:602
+#, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Chyba při zápisu duševního stavu řešitele do %s"
+
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:604
+msgid "Resolver state successfully written!"
+msgstr "Stav řešitele byl úspěšně zapsán!"
+
+#: src/cmdline/cmdline_resolver.cc:145
#, c-format
msgid ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
@@ -910,190 +925,176 @@ msgstr ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr balík verze ...: %F%na balík verze ...: "
"%F%n<AKCE> balík... : %F%n%F%F%F%F%F%F%F%F"
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:164
msgid "accept the proposed changes"
msgstr "přijme navrhované změny"
-#: src/cmdline/cmdline_resolver.cc:149
+#: src/cmdline/cmdline_resolver.cc:166
msgid "reject the proposed changes and search for another solution"
msgstr "zamítne navrhované změny a bude hledat další řešení"
-#: src/cmdline/cmdline_resolver.cc:151
+#: src/cmdline/cmdline_resolver.cc:168
msgid "give up and quit the program"
msgstr "poddá se a ukončí program"
-#: src/cmdline/cmdline_resolver.cc:153
+#: src/cmdline/cmdline_resolver.cc:170
msgid "move to the next solution"
msgstr "přejde na další řešení"
-#: src/cmdline/cmdline_resolver.cc:155
+#: src/cmdline/cmdline_resolver.cc:172
msgid "move to the previous solution"
msgstr "přejde na předchozí řešení"
-#: src/cmdline/cmdline_resolver.cc:157
+#: src/cmdline/cmdline_resolver.cc:174
msgid "view an explanation of the changes in the solution"
msgstr "zobrazí popis změn v navrhovaném řešení"
-#: src/cmdline/cmdline_resolver.cc:159
+#: src/cmdline/cmdline_resolver.cc:176
msgid "examine the solution in the visual user interface"
msgstr "prozkoumá řešení ve vizuálním uživatelském rozhraní"
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:178
msgid ""
"reject the given package versions; don't display any solutions in which they "
"occur."
msgstr ""
"zamítne dané verze balíků; nezobrazí zádná řešení, ve kterých se vyskytují"
-#: src/cmdline/cmdline_resolver.cc:163
+#: src/cmdline/cmdline_resolver.cc:180
msgid ""
"accept the given package versions; display only solutions in which they "
"occur."
msgstr ""
"povolí dané verze balíků; zobrazí pouze řešení, ve kterých se vyskytují"
-#: src/cmdline/cmdline_resolver.cc:165
+#: src/cmdline/cmdline_resolver.cc:182
msgid "adjust the state of the listed packages, where ACTION is one of:"
msgstr "upraví stav vypsaných balíků, kde AKCE může být:"
-#: src/cmdline/cmdline_resolver.cc:183
+#: src/cmdline/cmdline_resolver.cc:200
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
msgstr ""
"Úpravy způsobí, že se aktuální řešení zahodí a přepočítá se podle potřeb."
-#: src/cmdline/cmdline_resolver.cc:197
+#: src/cmdline/cmdline_resolver.cc:214
#, c-format
msgid "The version %s is available in the following archives:"
msgstr "Verze %s je dostupná v následujících archivech:"
-#: src/cmdline/cmdline_resolver.cc:205
+#: src/cmdline/cmdline_resolver.cc:222
#, c-format
msgid "Select the version of %s that should be used: "
msgstr "Vyberte verzi %s, která se má použít: "
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:229
#, c-format
msgid "Invalid response. Please enter an integer between 1 and %d."
msgstr "Chybná odpověď. Zadejte prosím celé číslo mezi 1 a %d."
-#: src/cmdline/cmdline_resolver.cc:227
+#: src/cmdline/cmdline_resolver.cc:244
#, c-format
msgid "Expected at least one package/version pair following '%c'"
msgstr "Očekávána alespoň jedna dvojice balík/verze následovaná '%c'"
-#: src/cmdline/cmdline_resolver.cc:241
+#: src/cmdline/cmdline_resolver.cc:258
#, c-format
msgid "Expected a version after \"%s\""
msgstr "Za \"%s\" je očekávána verze"
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:268
#, c-format
msgid "No such package \"%s\""
msgstr "Balík \"%s\" neexistuje"
-#: src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_resolver.cc:284
#, c-format
msgid "%s has no version named \"%s\""
msgstr "%s nemá verzi \"%s\""
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:301
#, c-format
msgid "Allowing the removal of %s"
msgstr "Povoluji odstranění %s"
-#: src/cmdline/cmdline_resolver.cc:287
+#: src/cmdline/cmdline_resolver.cc:304
#, c-format
msgid "Allowing the installation of %s version %s (%s)"
msgstr "Povoluji instalaci balíku %s verze %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:314
#, c-format
msgid "Rejecting the removal of %s"
msgstr "Zamítám odstranění balíku %s"
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:317
#, c-format
msgid "Rejecting the installation of %s version %s (%s)"
msgstr "Zamítám instalaci balíku %s verze %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:330
#, c-format
msgid "No longer requiring the removal of %s"
msgstr "Již nevyžaduji odstranění balíku %s"
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:333
#, c-format
msgid "No longer requiring the installation of %s version %s (%s)"
msgstr "Již nevyžaduji instalaci balíku %s verze %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:325
+#: src/cmdline/cmdline_resolver.cc:342
#, c-format
msgid "Requiring the removal of %s"
msgstr "Vyžaduji odstranění balíku %s"
-#: src/cmdline/cmdline_resolver.cc:328
+#: src/cmdline/cmdline_resolver.cc:345
#, c-format
msgid "Requiring the installation of %s version %s (%s)"
msgstr "Vyžaduji instalaci balíku %s verze %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:447 src/solution_screen.cc:486
+#: src/cmdline/cmdline_resolver.cc:464 src/solution_screen.cc:495
#, c-format
msgid "open: %d; closed: %d; defer: %d; conflict: %d"
msgstr "otevřené: %d; zavřené: %d; odložené: %d; konfliktní: %d"
-#: src/cmdline/cmdline_resolver.cc:493
+#: src/cmdline/cmdline_resolver.cc:510
msgid "The following actions will resolve these dependencies:"
msgstr "Následující akce vyřeší tyto závislosti:"
-#: src/cmdline/cmdline_resolver.cc:508
+#: src/cmdline/cmdline_resolver.cc:525
msgid "Accept this solution? [Y/n/q/?] "
msgstr "Přijmout toto řešení? [Y/n/q/?] "
-#: src/cmdline/cmdline_resolver.cc:535 src/cmdline/cmdline_resolver.cc:627
+#: src/cmdline/cmdline_resolver.cc:552 src/cmdline/cmdline_resolver.cc:644
msgid "Abandoning all efforts to resolve these dependencies."
msgstr "Končím všechny snahy na vyřešení těchto závislostí."
-#: src/cmdline/cmdline_resolver.cc:562
+#: src/cmdline/cmdline_resolver.cc:579
msgid "The following commands are available:"
msgstr "K dispozici jsou následující příkazy:"
-#: src/cmdline/cmdline_resolver.cc:577
+#: src/cmdline/cmdline_resolver.cc:594
msgid "File to write resolver state to: "
msgstr "Soubor, do kterého zapsat stav řešitele:"
-#: src/cmdline/cmdline_resolver.cc:580 src/generic/apt/apt.cc:199
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Nemohu otevřít %s pro zápis"
-
-#: src/cmdline/cmdline_resolver.cc:585
-#, c-format
-msgid "Error writing resolver state to %s"
-msgstr "Chyba při zápisu duševního stavu řešitele do %s"
-
-#: src/cmdline/cmdline_resolver.cc:587
-msgid "Resolver state successfully written!"
-msgstr "Stav řešitele byl úspěšně zapsán!"
-
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:609
msgid "Invalid response; please enter one of the following commands:"
msgstr "Chybná odpověď; zadejte některý z následujících příkazů:"
-#: src/cmdline/cmdline_resolver.cc:602
+#: src/cmdline/cmdline_resolver.cc:619
msgid "No solution found within the allotted time. Try harder? [Y/n]"
msgstr "V přiděleném čase nebylo nalezeno řešení. Zkusit důkladněji? [Y/n]"
-#: src/cmdline/cmdline_resolver.cc:630
+#: src/cmdline/cmdline_resolver.cc:647
msgid "Invalid response; please enter 'y' or 'n'."
msgstr "Chybná odpověď; zadejte 'y' nebo 'n'."
-#: src/cmdline/cmdline_resolver.cc:639
+#: src/cmdline/cmdline_resolver.cc:656
msgid "Unable to resolve dependencies! Giving up..."
msgstr "Nemohu vyřešit závislosti! Vzdávám se..."
-#: src/cmdline/cmdline_resolver.cc:645
+#: src/cmdline/cmdline_resolver.cc:662
msgid "*** No more solutions available ***"
msgstr "*** Žádná další řešení nejsou dostupná ***"
@@ -1508,61 +1509,61 @@ msgstr "Nemohu otevřít rozšířený stavový soubor programu Aptitude"
msgid "Reading extended state information"
msgstr "Čtu rozšířené stavové informace"
-#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:403
-#: src/generic/apt/aptcache.cc:406
+#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:405
+#: src/generic/apt/aptcache.cc:408
msgid "Initializing package states"
msgstr "Inicializuji stavy balíků"
-#: src/generic/apt/aptcache.cc:530
+#: src/generic/apt/aptcache.cc:533
msgid "Cannot open Aptitude state file"
msgstr "Nemohu otevřít stavový soubor programu Aptitude"
-#: src/generic/apt/aptcache.cc:534 src/generic/apt/aptcache.cc:589
-#: src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:537 src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:595
msgid "Writing extended state information"
msgstr "Zapisuji rozšířené stavové informace"
-#: src/generic/apt/aptcache.cc:571
+#: src/generic/apt/aptcache.cc:574
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr "Při zápisu stavového souboru přetekl interní buffer na balíku \"%s\""
-#: src/generic/apt/aptcache.cc:580
+#: src/generic/apt/aptcache.cc:583
msgid "Couldn't write state file"
msgstr "Nemohu zapsat stavový soubor"
-#: src/generic/apt/aptcache.cc:597
+#: src/generic/apt/aptcache.cc:600
msgid "Error writing state file"
msgstr "Chyba při zápisu stavového souboru"
-#: src/generic/apt/aptcache.cc:615
+#: src/generic/apt/aptcache.cc:618
#, c-format
msgid "failed to remove %s"
msgstr "selhalo odstranění %s"
-#: src/generic/apt/aptcache.cc:622
+#: src/generic/apt/aptcache.cc:625
#, c-format
msgid "failed to rename %s to %s"
msgstr "selhalo přejmenování %s na %s"
-#: src/generic/apt/aptcache.cc:630
+#: src/generic/apt/aptcache.cc:633
#, c-format
msgid "couldn't replace %s with %s"
msgstr "nemohu nahradit %s za %s"
-#: src/generic/apt/aptcache.cc:1122
+#: src/generic/apt/aptcache.cc:1125
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr "Nemohu opravit závislosti, některé balíky nemohou být nainstalovány"
-#: src/generic/apt/aptcache.cc:1526
+#: src/generic/apt/aptcache.cc:1600
msgid "The list of sources could not be read."
msgstr "Nelze přečíst seznam zdrojů."
-#: src/generic/apt/aptcache.cc:1533
+#: src/generic/apt/aptcache.cc:1607
msgid "The package lists or status file could not be parsed or opened."
msgstr "Seznamy balíků nebo stavový soubor nelze otevřít nebo zpracovat."
-#: src/generic/apt/aptcache.cc:1536
+#: src/generic/apt/aptcache.cc:1610
msgid "You may want to update the package lists to correct these missing files"
msgstr "Pro opravení chybějících souborů zkuste aktualizovat seznamy balíků"
@@ -2409,8 +2410,7 @@ msgstr ""
msgid ""
" -q In command-line mode, suppress the incremental progress "
"indicators.\n"
-msgstr ""
-" -q V příkazovém režimu potlačí indikátory postupu.\n"
+msgstr " -q V příkazovém režimu potlačí indikátory postupu.\n"
#: src/main.cc:160
#, c-format
@@ -3792,12 +3792,12 @@ msgstr ""
"%s je nezbytný balík!%n%nJste si jisti, že jej chcete odstranit?%nPokud ano, "
"napište '%s'."
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:284
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:291
#, c-format
msgid "Information about %s"
msgstr "Informace o %s"
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:282
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:289
#, c-format
msgid "%s info"
msgstr "informace o %s"
@@ -4125,7 +4125,7 @@ msgstr ""
"Následující balíky jsou závisí na verzi %B%s%b balíku %B%s%b. Pokud bude "
"balík %s, budou tyto balíky porušeny."
-#: src/solution_dialog.cc:91 src/solution_screen.cc:457
+#: src/solution_dialog.cc:91 src/solution_screen.cc:465
msgid "The package cache is not available."
msgstr "Vyrovnávací paměť balíků není není dostupná."
@@ -4133,11 +4133,11 @@ msgstr "Vyrovnávací paměť balíků není není dostupná."
msgid "No packages are broken."
msgstr "Žádné balíky nejsou porušené."
-#: src/solution_dialog.cc:108 src/solution_screen.cc:479
+#: src/solution_dialog.cc:108 src/solution_screen.cc:488
msgid "No resolution found."
msgstr "Žádné řešení nebylo nalezeno."
-#: src/solution_dialog.cc:114 src/solution_screen.cc:490
+#: src/solution_dialog.cc:114 src/solution_screen.cc:499
msgid "Resolving dependencies..."
msgstr "Řeším závislosti..."
@@ -4172,7 +4172,7 @@ msgstr "%s předzávisí na %s"
msgid "%s suggests %s"
msgstr "%s navrhuje %s"
-#: src/solution_fragment.cc:113 src/solution_item.cc:583
+#: src/solution_fragment.cc:113 src/solution_item.cc:593
#, c-format
msgid "%s recommends %s"
msgstr "%s doporučuje %s"
@@ -4276,7 +4276,7 @@ msgstr "Aktualizace %F [%s (%s) -> %s (%s)]"
msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgstr "Degradace %F [%s (%s) -> %s (%s)]"
-#: src/solution_item.cc:587
+#: src/solution_item.cc:597
#, c-format
msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
msgstr "-> Ponechat závislost \"%s doporučuje %s\" nevyřešenou."
@@ -4309,7 +4309,7 @@ msgstr "Degradovat následující balíky:"
msgid "Leave the following recommendations unresolved:"
msgstr "Ponechat následující závislosti nevyřešené:"
-#: src/solution_screen.cc:463
+#: src/solution_screen.cc:472
msgid "No broken packages."
msgstr "Žádné porušené balíky."
diff --git a/po/da.po b/po/da.po
index 1b062ea4..8f9e387c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude 0.3.5\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
-"POT-Creation-Date: 2005-11-07 15:22-0800\n"
+"POT-Creation-Date: 2005-11-13 10:12-0800\n"
"PO-Revision-Date: 2005-10-26 15:11+0200\n"
"Last-Translator: Morten Bo Johansen <mojo@mbjnet.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
@@ -202,7 +202,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] Udreder afhngigheder"
#: src/broken_indicator.cc:273 src/solution_dialog.cc:126
-#: src/solution_screen.cc:513
+#: src/solution_screen.cc:522
msgid "Internal error: unexpected null solution."
msgstr "Intern fejl: Lsning returnerede uventet nul."
@@ -800,40 +800,40 @@ msgstr ""
"eller flere pakkenavne (eller mnstre). Handlingen vil s blive anvendt p "
"alle de pakker du anfrer. Flgende handlinger kan bruges:"
-#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:167
+#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:184
msgid "'+' to install packages"
msgstr "'+' for at installere pakker"
-#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:186
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
msgstr ""
"'+M' for at installere pakker samtidig med at de markeres automatisk "
"installeret"
-#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:171
+#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:188
msgid "'-' to remove packages"
msgstr "'-' for at afinstallere pakker"
-#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:173
+#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:190
msgid "'_' to purge packages"
msgstr "'_' for at udrense pakker"
-#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:175
+#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:192
msgid "'=' to place packages on hold"
msgstr "'=' for at tilbageholde pakker"
-#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:177
+#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:194
msgid ""
"':' to keep packages in their current state without placing them on hold"
msgstr ""
"':' for at bevare pakker i deres nuvrende tilstand, uden at tilbageholde dem"
-#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:179
+#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:196
msgid "'&M' to mark packages as automatically installed"
msgstr "'&M' for at markere pakker som automatisk installerede"
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:181
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:198
msgid "'&m' to mark packages as manually installed"
msgstr "'&m' for at markere pakker som manuelt installerede"
@@ -916,7 +916,22 @@ msgstr ""
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr "Ugyldigt svar. Anfr en gyldig kommando eller \"?\" for hjlp.\n"
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_resolver.cc:124 src/cmdline/cmdline_resolver.cc:597
+#: src/generic/apt/apt.cc:199
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "Kunne ikke bne %s til skrivning"
+
+#: src/cmdline/cmdline_resolver.cc:130 src/cmdline/cmdline_resolver.cc:602
+#, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Kunne ikke skrive status ved lsningsforslag til %s"
+
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:604
+msgid "Resolver state successfully written!"
+msgstr "Status for lsningsforslag gemt!"
+
+#: src/cmdline/cmdline_resolver.cc:145
#, c-format
msgid ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
@@ -925,53 +940,53 @@ msgstr ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pakke ver ...: %F%na pakke ver ...: %F%"
"n<HANDLING> pakke... : %F%n%F%F%F%F%F%F%F%F"
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:164
msgid "accept the proposed changes"
msgstr "godkend de foreslede ndringer"
-#: src/cmdline/cmdline_resolver.cc:149
+#: src/cmdline/cmdline_resolver.cc:166
msgid "reject the proposed changes and search for another solution"
msgstr "forkast de foreslede ndringer og sg efter en anden lsning"
-#: src/cmdline/cmdline_resolver.cc:151
+#: src/cmdline/cmdline_resolver.cc:168
msgid "give up and quit the program"
msgstr "Opgiv og afslut programmet"
-#: src/cmdline/cmdline_resolver.cc:153
+#: src/cmdline/cmdline_resolver.cc:170
msgid "move to the next solution"
msgstr "flyt til den nste lsning"
-#: src/cmdline/cmdline_resolver.cc:155
+#: src/cmdline/cmdline_resolver.cc:172
msgid "move to the previous solution"
msgstr "flyt til den forrige lsning"
-#: src/cmdline/cmdline_resolver.cc:157
+#: src/cmdline/cmdline_resolver.cc:174
msgid "view an explanation of the changes in the solution"
msgstr "se en forklaring p ndringerne i lsningen"
-#: src/cmdline/cmdline_resolver.cc:159
+#: src/cmdline/cmdline_resolver.cc:176
msgid "examine the solution in the visual user interface"
msgstr "gennemg lsningen i den interaktive brugerflade"
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:178
msgid ""
"reject the given package versions; don't display any solutions in which they "
"occur."
msgstr ""
"afvis de anfrte pakkeversioner; vis ikke lsninger hvori de forekommer."
-#: src/cmdline/cmdline_resolver.cc:163
+#: src/cmdline/cmdline_resolver.cc:180
msgid ""
"accept the given package versions; display only solutions in which they "
"occur."
msgstr ""
"godkend de anfrte pakkeversioner; vis kun lsninger hvori de forekommer."
-#: src/cmdline/cmdline_resolver.cc:165
+#: src/cmdline/cmdline_resolver.cc:182
msgid "adjust the state of the listed packages, where ACTION is one of:"
msgstr "Justr status p oplistede pakker hvor HANDLING er en af:"
-#: src/cmdline/cmdline_resolver.cc:183
+#: src/cmdline/cmdline_resolver.cc:200
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
@@ -979,139 +994,125 @@ msgstr ""
"Justeringer vil medfre at den nuvrende lsning forkastes og genberegnes "
"omndvendigt."
-#: src/cmdline/cmdline_resolver.cc:197
+#: src/cmdline/cmdline_resolver.cc:214
#, c-format
msgid "The version %s is available in the following archives:"
msgstr "Versionen %s er tilgngelig i de flgende arkiver:"
-#: src/cmdline/cmdline_resolver.cc:205
+#: src/cmdline/cmdline_resolver.cc:222
#, c-format
msgid "Select the version of %s that should be used: "
msgstr "Vlg versionen af %s som skal bruges: "
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:229
#, c-format
msgid "Invalid response. Please enter an integer between 1 and %d."
msgstr "Ugyldigt svar. Anfr venligst et heltal mellem 1 og %d."
-#: src/cmdline/cmdline_resolver.cc:227
+#: src/cmdline/cmdline_resolver.cc:244
#, c-format
msgid "Expected at least one package/version pair following '%c'"
msgstr "Forventede mindst n angivelse af pakke og version efter \"%c\""
-#: src/cmdline/cmdline_resolver.cc:241
+#: src/cmdline/cmdline_resolver.cc:258
#, c-format
msgid "Expected a version after \"%s\""
msgstr "Forventede et versionsnummer efter \"%s\""
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:268
#, c-format
msgid "No such package \"%s\""
msgstr "Ingen sdan pakke \"%s\""
-#: src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_resolver.cc:284
#, c-format
msgid "%s has no version named \"%s\""
msgstr "%s har ingen version ved navn \"%s"
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:301
#, c-format
msgid "Allowing the removal of %s"
msgstr "Tillader afinstallering af %s"
-#: src/cmdline/cmdline_resolver.cc:287
+#: src/cmdline/cmdline_resolver.cc:304
#, c-format
msgid "Allowing the installation of %s version %s (%s)"
msgstr "Tillader installeringen af %s version %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:314
#, c-format
msgid "Rejecting the removal of %s"
msgstr "Afviser afinstallering af %s"
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:317
#, c-format
msgid "Rejecting the installation of %s version %s (%s)"
msgstr "Afviser installeringen af %s version %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:330
#, c-format
msgid "No longer requiring the removal of %s"
msgstr "Krver ikke lngere %s afinstalleret"
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:333
#, c-format
msgid "No longer requiring the installation of %s version %s (%s)"
msgstr "Krver ikke lngere %s version %s (%s) installeret"
-#: src/cmdline/cmdline_resolver.cc:325
+#: src/cmdline/cmdline_resolver.cc:342
#, c-format
msgid "Requiring the removal of %s"
msgstr "Krver %s afinstalleret"
-#: src/cmdline/cmdline_resolver.cc:328
+#: src/cmdline/cmdline_resolver.cc:345
#, c-format
msgid "Requiring the installation of %s version %s (%s)"
msgstr "Krver installering af %s version %s (%s)"
# Er i tvivl om "defer" -MBJ
-#: src/cmdline/cmdline_resolver.cc:447 src/solution_screen.cc:486
+#: src/cmdline/cmdline_resolver.cc:464 src/solution_screen.cc:495
#, c-format
msgid "open: %d; closed: %d; defer: %d; conflict: %d"
msgstr "bne: %d; lukkede: %d; afviste: %d; konflikter: %d"
-#: src/cmdline/cmdline_resolver.cc:493
+#: src/cmdline/cmdline_resolver.cc:510
msgid "The following actions will resolve these dependencies:"
msgstr "De flgende handlinger vil udrede disse afhngigheder:"
-#: src/cmdline/cmdline_resolver.cc:508
+#: src/cmdline/cmdline_resolver.cc:525
msgid "Accept this solution? [Y/n/q/?] "
msgstr "Godkend denne lsning? [Y/n/q/?] "
-#: src/cmdline/cmdline_resolver.cc:535 src/cmdline/cmdline_resolver.cc:627
+#: src/cmdline/cmdline_resolver.cc:552 src/cmdline/cmdline_resolver.cc:644
msgid "Abandoning all efforts to resolve these dependencies."
msgstr "Opgiver alle forsg p at udrede disse afhngigheder."
-#: src/cmdline/cmdline_resolver.cc:562
+#: src/cmdline/cmdline_resolver.cc:579
msgid "The following commands are available:"
msgstr "De flgende kommandoer er tilgngelige:"
-#: src/cmdline/cmdline_resolver.cc:577
+#: src/cmdline/cmdline_resolver.cc:594
msgid "File to write resolver state to: "
msgstr "Fil som status ved lsningsforslag skrives til: "
-#: src/cmdline/cmdline_resolver.cc:580 src/generic/apt/apt.cc:199
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Kunne ikke bne %s til skrivning"
-
-#: src/cmdline/cmdline_resolver.cc:585
-#, c-format
-msgid "Error writing resolver state to %s"
-msgstr "Kunne ikke skrive status ved lsningsforslag til %s"
-
-#: src/cmdline/cmdline_resolver.cc:587
-msgid "Resolver state successfully written!"
-msgstr "Status for lsningsforslag gemt!"
-
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:609
msgid "Invalid response; please enter one of the following commands:"
msgstr "Ugyldigt svar. Anfr en af flgende kommandoer:"
-#: src/cmdline/cmdline_resolver.cc:602
+#: src/cmdline/cmdline_resolver.cc:619
msgid "No solution found within the allotted time. Try harder? [Y/n]"
msgstr ""
"Ingen lsning fundet indenfor den fastsatte tid. Prv mere ihrdigt? [Y/n]"
-#: src/cmdline/cmdline_resolver.cc:630
+#: src/cmdline/cmdline_resolver.cc:647
msgid "Invalid response; please enter 'y' or 'n'."
msgstr "Ugyldigt svar; anfr venligst 'y' eller 'n'."
-#: src/cmdline/cmdline_resolver.cc:639
+#: src/cmdline/cmdline_resolver.cc:656
msgid "Unable to resolve dependencies! Giving up..."
msgstr "Kunne ikke udrede afhngigheder! Opgiver ..."
-#: src/cmdline/cmdline_resolver.cc:645
+#: src/cmdline/cmdline_resolver.cc:662
msgid "*** No more solutions available ***"
msgstr "*** Ikke flere tilgngelige lsninger ***"
@@ -1527,61 +1528,61 @@ msgstr "Kan ikke bne Aptitudes fil for udvidet tilstand"
msgid "Reading extended state information"
msgstr "Lser information om udvidet tilstand"
-#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:403
-#: src/generic/apt/aptcache.cc:406
+#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:405
+#: src/generic/apt/aptcache.cc:408
msgid "Initializing package states"
msgstr "klargrer pakketilstande"
-#: src/generic/apt/aptcache.cc:530
+#: src/generic/apt/aptcache.cc:533
msgid "Cannot open Aptitude state file"
msgstr "Kan ikke bne Aptitudes statusfil"
-#: src/generic/apt/aptcache.cc:534 src/generic/apt/aptcache.cc:589
-#: src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:537 src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:595
msgid "Writing extended state information"
msgstr "Skriver information om udvidet status"
-#: src/generic/apt/aptcache.cc:571
+#: src/generic/apt/aptcache.cc:574
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr "Internt bufferoverlb p pakke \"%s\" under skrivning af statusfil"
-#: src/generic/apt/aptcache.cc:580
+#: src/generic/apt/aptcache.cc:583
msgid "Couldn't write state file"
msgstr "Kunne ikke skrive statusfil"
-#: src/generic/apt/aptcache.cc:597
+#: src/generic/apt/aptcache.cc:600
msgid "Error writing state file"
msgstr "Fejl ved skrivning til statusfil"
-#: src/generic/apt/aptcache.cc:615
+#: src/generic/apt/aptcache.cc:618
#, c-format
msgid "failed to remove %s"
msgstr "kunne ikke afinstallere %s"
-#: src/generic/apt/aptcache.cc:622
+#: src/generic/apt/aptcache.cc:625
#, c-format
msgid "failed to rename %s to %s"
msgstr "kunne ikke omdbe %s til %s"
-#: src/generic/apt/aptcache.cc:630
+#: src/generic/apt/aptcache.cc:633
#, c-format
msgid "couldn't replace %s with %s"
msgstr "kunne ikke erstatte %s med %s"
-#: src/generic/apt/aptcache.cc:1122
+#: src/generic/apt/aptcache.cc:1125
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr "Kunne ikke reparere afhngigheder, visse pakker kan ikke installeres"
-#: src/generic/apt/aptcache.cc:1526
+#: src/generic/apt/aptcache.cc:1600
msgid "The list of sources could not be read."
msgstr "Kildelisten til pakker kunne ikke lses"
-#: src/generic/apt/aptcache.cc:1533
+#: src/generic/apt/aptcache.cc:1607
msgid "The package lists or status file could not be parsed or opened."
msgstr "Pakkelisterne eller statusfilen kunne hverken fortolkes eller bnes"
-#: src/generic/apt/aptcache.cc:1536
+#: src/generic/apt/aptcache.cc:1610
msgid "You may want to update the package lists to correct these missing files"
msgstr "En opdatering af pakkelisterne vil mske korrigere for manglende filer"
@@ -3837,12 +3838,12 @@ msgstr ""
"%s er en essentiel pakke!%n%nEr du sikker p at du vil afinstallere den?%n "
"Tast '%s' hvis du er sikker."
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:284
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:291
#, c-format
msgid "Information about %s"
msgstr "Oplysninger om %s"
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:282
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:289
#, c-format
msgid "%s info"
msgstr "%s info"
@@ -4179,7 +4180,7 @@ msgstr ""
"Flgende pakker afhnger af version %B%s%b af %B%s%b og vil blive brudte "
"hvis den bliver %s."
-#: src/solution_dialog.cc:91 src/solution_screen.cc:457
+#: src/solution_dialog.cc:91 src/solution_screen.cc:465
msgid "The package cache is not available."
msgstr "Pakkecachen er ikke tilgngelig."
@@ -4187,11 +4188,11 @@ msgstr "Pakkecachen er ikke tilgngelig."
msgid "No packages are broken."
msgstr "Ingen pakker har brudte afhngigheder."
-#: src/solution_dialog.cc:108 src/solution_screen.cc:479
+#: src/solution_dialog.cc:108 src/solution_screen.cc:488
msgid "No resolution found."
msgstr "Ingen lsning fundet."
-#: src/solution_dialog.cc:114 src/solution_screen.cc:490
+#: src/solution_dialog.cc:114 src/solution_screen.cc:499
msgid "Resolving dependencies..."
msgstr "Udreder afhngigheder ..."
@@ -4226,7 +4227,7 @@ msgstr "%s forhndsafhnger af %s"
msgid "%s suggests %s"
msgstr "%s foreslr %s"
-#: src/solution_fragment.cc:113 src/solution_item.cc:583
+#: src/solution_fragment.cc:113 src/solution_item.cc:593
#, c-format
msgid "%s recommends %s"
msgstr "%s anbefaler %s"
@@ -4330,7 +4331,7 @@ msgstr "Opgradr %F [%s (%s) -> %s (%s)]"
msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgstr "Nedgradr %F [%s (%s) -> %s (%s)]"
-#: src/solution_item.cc:587
+#: src/solution_item.cc:597
#, c-format
msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
msgstr "-> Lad afhngigheden \"%s anbefaler %s\" vre uafklaret."
@@ -4363,7 +4364,7 @@ msgstr "Nedgradr de flgende pakker:"
msgid "Leave the following recommendations unresolved:"
msgstr "Afinstallr de flgende pakker:"
-#: src/solution_screen.cc:463
+#: src/solution_screen.cc:472
msgid "No broken packages."
msgstr "Ingen brudte pakker."
diff --git a/po/de.po b/po/de.po
index 534edce9..e2f64383 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude 0.2.15.5\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
-"POT-Creation-Date: 2005-11-07 15:22-0800\n"
+"POT-Creation-Date: 2005-11-13 10:12-0800\n"
"PO-Revision-Date: 2005-06-21 11:38GMT\n"
"Last-Translator: Dennis Stampfer <seppy@debian.org>\n"
"Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
@@ -200,7 +200,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
msgstr "%s konnte nicht zum schreiben geöffnet werden"
#: src/broken_indicator.cc:273 src/solution_dialog.cc:126
-#: src/solution_screen.cc:513
+#: src/solution_screen.cc:522
msgid "Internal error: unexpected null solution."
msgstr ""
@@ -803,44 +803,44 @@ msgid ""
"The following actions are available:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:167
+#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:184
#, fuzzy
msgid "'+' to install packages"
msgstr "^Installieren/Entfernen von Paketen"
-#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:186
#, fuzzy
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
msgstr "Die folgenden Pakete werden zusätzlich automatisch installiert:"
-#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:171
+#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:188
#, fuzzy
msgid "'-' to remove packages"
msgstr "^Installieren/Entfernen von Paketen"
# FIXME: this is a bad name for the menu item.
-#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:173
+#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:190
#, fuzzy
msgid "'_' to purge packages"
msgstr "Neue Pakete ^vergessen"
-#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:175
+#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:192
#, fuzzy
msgid "'=' to place packages on hold"
msgstr " hold Pakete auf »zurückhalten« setzen\n"
-#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:177
+#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:194
msgid ""
"':' to keep packages in their current state without placing them on hold"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:179
+#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:196
#, fuzzy
msgid "'&M' to mark packages as automatically installed"
msgstr " markauto Pakete als automatisch installiert markieren\n"
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:181
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:198
#, fuzzy
msgid "'&m' to mark packages as manually installed"
msgstr " unmarkauto Pakete als manuell installiert markieren\n"
@@ -927,206 +927,207 @@ msgstr ""
"Ungültige Antwort. Bitte geben Sie einen gültigen Befehl oder »?« für Hilfe "
"ein.\n"
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_resolver.cc:124 src/cmdline/cmdline_resolver.cc:597
+#: src/generic/apt/apt.cc:199
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "%s konnte nicht zum schreiben geöffnet werden"
+
+#: src/cmdline/cmdline_resolver.cc:130 src/cmdline/cmdline_resolver.cc:602
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Fehler beim Schreiben der Statusdatei"
+
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:604
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:145
#, c-format
msgid ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
"n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:164
msgid "accept the proposed changes"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:149
+#: src/cmdline/cmdline_resolver.cc:166
msgid "reject the proposed changes and search for another solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:151
+#: src/cmdline/cmdline_resolver.cc:168
#, fuzzy
msgid "give up and quit the program"
msgstr "Aptitude verlassen"
-#: src/cmdline/cmdline_resolver.cc:153
+#: src/cmdline/cmdline_resolver.cc:170
msgid "move to the next solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:155
+#: src/cmdline/cmdline_resolver.cc:172
msgid "move to the previous solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:157
+#: src/cmdline/cmdline_resolver.cc:174
msgid "view an explanation of the changes in the solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:159
+#: src/cmdline/cmdline_resolver.cc:176
#, fuzzy
msgid "examine the solution in the visual user interface"
msgstr "Einstellungen verändern, die die Benutzeroberfläche betreffen"
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:178
msgid ""
"reject the given package versions; don't display any solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:163
+#: src/cmdline/cmdline_resolver.cc:180
msgid ""
"accept the given package versions; display only solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:165
+#: src/cmdline/cmdline_resolver.cc:182
msgid "adjust the state of the listed packages, where ACTION is one of:"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:183
+#: src/cmdline/cmdline_resolver.cc:200
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:197
+#: src/cmdline/cmdline_resolver.cc:214
#, c-format
msgid "The version %s is available in the following archives:"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:205
+#: src/cmdline/cmdline_resolver.cc:222
#, c-format
msgid "Select the version of %s that should be used: "
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:229
#, fuzzy, c-format
msgid "Invalid response. Please enter an integer between 1 and %d."
msgstr ""
"Ungültige Antwort. Bitte geben Sie einen gültigen Befehl oder »?« für Hilfe "
"ein.\n"
-#: src/cmdline/cmdline_resolver.cc:227
+#: src/cmdline/cmdline_resolver.cc:244
#, c-format
msgid "Expected at least one package/version pair following '%c'"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:241
+#: src/cmdline/cmdline_resolver.cc:258
#, fuzzy, c-format
msgid "Expected a version after \"%s\""
msgstr "%s konnte nicht zum schreiben geöffnet werden"
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:268
#, fuzzy, c-format
msgid "No such package \"%s\""
msgstr "Quellpaket: "
-#: src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_resolver.cc:284
#, c-format
msgid "%s has no version named \"%s\""
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:301
#, c-format
msgid "Allowing the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:287
+#: src/cmdline/cmdline_resolver.cc:304
#, c-format
msgid "Allowing the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:314
#, c-format
msgid "Rejecting the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:317
#, c-format
msgid "Rejecting the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:330
#, c-format
msgid "No longer requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:333
#, c-format
msgid "No longer requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:325
+#: src/cmdline/cmdline_resolver.cc:342
#, c-format
msgid "Requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:328
+#: src/cmdline/cmdline_resolver.cc:345
#, c-format
msgid "Requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:447 src/solution_screen.cc:486
+#: src/cmdline/cmdline_resolver.cc:464 src/solution_screen.cc:495
#, c-format
msgid "open: %d; closed: %d; defer: %d; conflict: %d"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:493
+#: src/cmdline/cmdline_resolver.cc:510
#, fuzzy
msgid "The following actions will resolve these dependencies:"
msgstr "Die folgenden Pakete haben verletzte Abhängigkeiten:\n"
-#: src/cmdline/cmdline_resolver.cc:508
+#: src/cmdline/cmdline_resolver.cc:525
msgid "Accept this solution? [Y/n/q/?] "
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:535 src/cmdline/cmdline_resolver.cc:627
+#: src/cmdline/cmdline_resolver.cc:552 src/cmdline/cmdline_resolver.cc:644
msgid "Abandoning all efforts to resolve these dependencies."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:562
+#: src/cmdline/cmdline_resolver.cc:579
#, fuzzy
msgid "The following commands are available:"
msgstr "Die folgenden Pakete sind KAPUTT:"
-#: src/cmdline/cmdline_resolver.cc:577
+#: src/cmdline/cmdline_resolver.cc:594
msgid "File to write resolver state to: "
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:580 src/generic/apt/apt.cc:199
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "%s konnte nicht zum schreiben geöffnet werden"
-
-#: src/cmdline/cmdline_resolver.cc:585
-#, fuzzy, c-format
-msgid "Error writing resolver state to %s"
-msgstr "Fehler beim Schreiben der Statusdatei"
-
-#: src/cmdline/cmdline_resolver.cc:587
-msgid "Resolver state successfully written!"
-msgstr ""
-
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:609
#, fuzzy
msgid "Invalid response; please enter one of the following commands:"
msgstr ""
"Ungültige Antwort. Bitte geben Sie einen gültigen Befehl oder »?« für Hilfe "
"ein.\n"
-#: src/cmdline/cmdline_resolver.cc:602
+#: src/cmdline/cmdline_resolver.cc:619
msgid "No solution found within the allotted time. Try harder? [Y/n]"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:630
+#: src/cmdline/cmdline_resolver.cc:647
#, fuzzy
msgid "Invalid response; please enter 'y' or 'n'."
msgstr ""
"Ungültige Antwort. Bitte geben Sie einen gültigen Befehl oder »?« für Hilfe "
"ein.\n"
-#: src/cmdline/cmdline_resolver.cc:639
+#: src/cmdline/cmdline_resolver.cc:656
msgid "Unable to resolve dependencies! Giving up..."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:645
+#: src/cmdline/cmdline_resolver.cc:662
msgid "*** No more solutions available ***"
msgstr ""
@@ -1549,65 +1550,65 @@ msgstr "Kann Aptitudes erweiterte Statusdatei nicht öffnen"
msgid "Reading extended state information"
msgstr "Lese erweiterte Statusinformationen"
-#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:403
-#: src/generic/apt/aptcache.cc:406
+#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:405
+#: src/generic/apt/aptcache.cc:408
msgid "Initializing package states"
msgstr "Initialisiere Paketstatus"
-#: src/generic/apt/aptcache.cc:530
+#: src/generic/apt/aptcache.cc:533
msgid "Cannot open Aptitude state file"
msgstr "Kann Aptitudes Statusdatei nicht öffnen"
-#: src/generic/apt/aptcache.cc:534 src/generic/apt/aptcache.cc:589
-#: src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:537 src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:595
msgid "Writing extended state information"
msgstr "Schreibe erweiterte Statusinformation"
-#: src/generic/apt/aptcache.cc:571
+#: src/generic/apt/aptcache.cc:574
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr ""
"Interner Pufferüberlauf im Paket »%s« während dem Schreiben der Statusdatei"
-#: src/generic/apt/aptcache.cc:580
+#: src/generic/apt/aptcache.cc:583
msgid "Couldn't write state file"
msgstr "Konnte Statusdatei nicht schreiben"
-#: src/generic/apt/aptcache.cc:597
+#: src/generic/apt/aptcache.cc:600
msgid "Error writing state file"
msgstr "Fehler beim Schreiben der Statusdatei"
-#: src/generic/apt/aptcache.cc:615
+#: src/generic/apt/aptcache.cc:618
#, fuzzy, c-format
msgid "failed to remove %s"
msgstr "%s konnte nicht zum schreiben geöffnet werden"
-#: src/generic/apt/aptcache.cc:622
+#: src/generic/apt/aptcache.cc:625
#, c-format
msgid "failed to rename %s to %s"
msgstr ""
-#: src/generic/apt/aptcache.cc:630
+#: src/generic/apt/aptcache.cc:633
#, fuzzy, c-format
msgid "couldn't replace %s with %s"
msgstr "Konnte alte Statusdatei nicht ersetzen"
-#: src/generic/apt/aptcache.cc:1122
+#: src/generic/apt/aptcache.cc:1125
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr ""
"Konnte Abhängigkeiten nicht korrigieren, manche Pakete können nicht "
"installiert werden"
-#: src/generic/apt/aptcache.cc:1526
+#: src/generic/apt/aptcache.cc:1600
msgid "The list of sources could not be read."
msgstr "Die Liste der Quellen konnte nicht gelesen werden."
-#: src/generic/apt/aptcache.cc:1533
+#: src/generic/apt/aptcache.cc:1607
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
"Die Paketliste oder Statusdatei konnte nicht gelesen oder geöffnet werden."
-#: src/generic/apt/aptcache.cc:1536
+#: src/generic/apt/aptcache.cc:1610
msgid "You may want to update the package lists to correct these missing files"
msgstr ""
"Sie wollen vielleicht die Paketlisten aktualisieren um die fehlenden Dateien "
@@ -3943,12 +3944,12 @@ msgstr ""
"wollen?%nDann geben Sie '%s' ein."
# ummmm...
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:284
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:291
#, c-format
msgid "Information about %s"
msgstr "Informationen über %s"
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:282
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:289
#, c-format
msgid "%s info"
msgstr ""
@@ -4305,7 +4306,7 @@ msgstr ""
"Die folgenden Pakete hängen ab von Version %B%s%b des Pakets %B%s%b, und "
"werden kaputt sein, wenn es %s wird."
-#: src/solution_dialog.cc:91 src/solution_screen.cc:457
+#: src/solution_dialog.cc:91 src/solution_screen.cc:465
msgid "The package cache is not available."
msgstr ""
@@ -4314,11 +4315,11 @@ msgstr ""
msgid "No packages are broken."
msgstr "Manche Pakete sind kaputt. Versuchen, das zu reparieren?"
-#: src/solution_dialog.cc:108 src/solution_screen.cc:479
+#: src/solution_dialog.cc:108 src/solution_screen.cc:488
msgid "No resolution found."
msgstr ""
-#: src/solution_dialog.cc:114 src/solution_screen.cc:490
+#: src/solution_dialog.cc:114 src/solution_screen.cc:499
#, fuzzy
msgid "Resolving dependencies..."
msgstr "%s konnte nicht zum schreiben geöffnet werden"
@@ -4357,7 +4358,7 @@ msgstr "hängt ab (vorher) von"
msgid "%s suggests %s"
msgstr "schlägt vor"
-#: src/solution_fragment.cc:113 src/solution_item.cc:583
+#: src/solution_fragment.cc:113 src/solution_item.cc:593
#, fuzzy, c-format
msgid "%s recommends %s"
msgstr "empfiehlt"
@@ -4466,7 +4467,7 @@ msgstr ""
msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgstr "%sB wurden in %s heruntergeladen (%sB/s)."
-#: src/solution_item.cc:587
+#: src/solution_item.cc:597
#, fuzzy, c-format
msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
msgstr "Die folgenden Pakete sind KAPUTT:"
@@ -4506,7 +4507,7 @@ msgstr "Herunterladen von Paketen"
msgid "Leave the following recommendations unresolved:"
msgstr "Die folgenden Pakete sind KAPUTT:"
-#: src/solution_screen.cc:463
+#: src/solution_screen.cc:472
#, fuzzy
msgid "No broken packages."
msgstr "^Installieren/Entfernen von Paketen"
diff --git a/po/el.po b/po/el.po
index a169717a..2b342da9 100644
--- a/po/el.po
+++ b/po/el.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude_po_el\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
-"POT-Creation-Date: 2005-11-07 15:22-0800\n"
+"POT-Creation-Date: 2005-11-13 10:12-0800\n"
"PO-Revision-Date: 2005-04-03 14:02EEST\n"
"Last-Translator: Greek Translation Team <debian-l10n-greek@lists.debian."
"org>\n"
@@ -222,7 +222,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
msgstr "Αδύνατο το άνοιγμα του %s για εγγραφή"
#: src/broken_indicator.cc:273 src/solution_dialog.cc:126
-#: src/solution_screen.cc:513
+#: src/solution_screen.cc:522
msgid "Internal error: unexpected null solution."
msgstr ""
@@ -826,43 +826,43 @@ msgid ""
"The following actions are available:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:167
+#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:184
#, fuzzy
msgid "'+' to install packages"
msgstr "^Εγκατάσταση/Αφαίρεση πακέτων"
-#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:186
#, fuzzy
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν αυτόματα:"
-#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:171
+#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:188
#, fuzzy
msgid "'-' to remove packages"
msgstr "^Εγκατάσταση/Αφαίρεση πακέτων"
-#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:173
+#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:190
#, fuzzy
msgid "'_' to purge packages"
msgstr "Ξέχασε τα νέα πακέτα"
-#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:175
+#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:192
#, fuzzy
msgid "'=' to place packages on hold"
msgstr " hold - Τοποθέτηση πακέτων σε αναμονή\n"
-#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:177
+#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:194
msgid ""
"':' to keep packages in their current state without placing them on hold"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:179
+#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:196
#, fuzzy
msgid "'&M' to mark packages as automatically installed"
msgstr "markauto - Σήμανση των πακέτων σαν να έχουν εγκατασταθεί αυτόματα\n"
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:181
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:198
#, fuzzy
msgid "'&m' to mark packages as manually installed"
msgstr ""
@@ -949,203 +949,204 @@ msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr ""
"Ακυρη απάντηση. Παρακαλώ εισάγετε μια έγκυρη εντολή ή '?' για βοήθεια.\n"
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_resolver.cc:124 src/cmdline/cmdline_resolver.cc:597
+#: src/generic/apt/apt.cc:199
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "Αδύνατο το άνοιγμα του %s για εγγραφή"
+
+#: src/cmdline/cmdline_resolver.cc:130 src/cmdline/cmdline_resolver.cc:602
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Σφάλμα κατά την εγγραφή στο αρχείο κατάστασης"
+
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:604
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:145
#, c-format
msgid ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
"n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:164
msgid "accept the proposed changes"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:149
+#: src/cmdline/cmdline_resolver.cc:166
msgid "reject the proposed changes and search for another solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:151
+#: src/cmdline/cmdline_resolver.cc:168
#, fuzzy
msgid "give up and quit the program"
msgstr "Έξοδος από το πρόγραμμα"
-#: src/cmdline/cmdline_resolver.cc:153
+#: src/cmdline/cmdline_resolver.cc:170
msgid "move to the next solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:155
+#: src/cmdline/cmdline_resolver.cc:172
msgid "move to the previous solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:157
+#: src/cmdline/cmdline_resolver.cc:174
msgid "view an explanation of the changes in the solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:159
+#: src/cmdline/cmdline_resolver.cc:176
#, fuzzy
msgid "examine the solution in the visual user interface"
msgstr "Αλλαγή των επιλογών που μεταβάλουν το περιβάλλον εργασίας"
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:178
msgid ""
"reject the given package versions; don't display any solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:163
+#: src/cmdline/cmdline_resolver.cc:180
msgid ""
"accept the given package versions; display only solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:165
+#: src/cmdline/cmdline_resolver.cc:182
msgid "adjust the state of the listed packages, where ACTION is one of:"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:183
+#: src/cmdline/cmdline_resolver.cc:200
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:197
+#: src/cmdline/cmdline_resolver.cc:214
#, c-format
msgid "The version %s is available in the following archives:"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:205
+#: src/cmdline/cmdline_resolver.cc:222
#, c-format
msgid "Select the version of %s that should be used: "
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:229
#, fuzzy, c-format
msgid "Invalid response. Please enter an integer between 1 and %d."
msgstr ""
"Ακυρη απάντηση. Παρακαλώ εισάγετε μια έγκυρη εντολή ή '?' για βοήθεια.\n"
-#: src/cmdline/cmdline_resolver.cc:227
+#: src/cmdline/cmdline_resolver.cc:244
#, c-format
msgid "Expected at least one package/version pair following '%c'"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:241
+#: src/cmdline/cmdline_resolver.cc:258
#, fuzzy, c-format
msgid "Expected a version after \"%s\""
msgstr "Αδύνατο το άνοιγμα του %s για εγγραφή"
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:268
#, fuzzy, c-format
msgid "No such package \"%s\""
msgstr "Πηγαίο Πακέτο: "
-#: src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_resolver.cc:284
#, c-format
msgid "%s has no version named \"%s\""
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:301
#, c-format
msgid "Allowing the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:287
+#: src/cmdline/cmdline_resolver.cc:304
#, c-format
msgid "Allowing the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:314
#, c-format
msgid "Rejecting the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:317
#, c-format
msgid "Rejecting the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:330
#, c-format
msgid "No longer requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:333
#, c-format
msgid "No longer requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:325
+#: src/cmdline/cmdline_resolver.cc:342
#, c-format
msgid "Requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:328
+#: src/cmdline/cmdline_resolver.cc:345
#, c-format
msgid "Requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:447 src/solution_screen.cc:486
+#: src/cmdline/cmdline_resolver.cc:464 src/solution_screen.cc:495
#, c-format
msgid "open: %d; closed: %d; defer: %d; conflict: %d"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:493
+#: src/cmdline/cmdline_resolver.cc:510
#, fuzzy
msgid "The following actions will resolve these dependencies:"
msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:\n"
-#: src/cmdline/cmdline_resolver.cc:508
+#: src/cmdline/cmdline_resolver.cc:525
msgid "Accept this solution? [Y/n/q/?] "
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:535 src/cmdline/cmdline_resolver.cc:627
+#: src/cmdline/cmdline_resolver.cc:552 src/cmdline/cmdline_resolver.cc:644
msgid "Abandoning all efforts to resolve these dependencies."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:562
+#: src/cmdline/cmdline_resolver.cc:579
#, fuzzy
msgid "The following commands are available:"
msgstr "Τα ακόλουθα πακέτα είναι ΕΛΑΤΤΩΜΑΤΙΚΑ:"
-#: src/cmdline/cmdline_resolver.cc:577
+#: src/cmdline/cmdline_resolver.cc:594
msgid "File to write resolver state to: "
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:580 src/generic/apt/apt.cc:199
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Αδύνατο το άνοιγμα του %s για εγγραφή"
-
-#: src/cmdline/cmdline_resolver.cc:585
-#, fuzzy, c-format
-msgid "Error writing resolver state to %s"
-msgstr "Σφάλμα κατά την εγγραφή στο αρχείο κατάστασης"
-
-#: src/cmdline/cmdline_resolver.cc:587
-msgid "Resolver state successfully written!"
-msgstr ""
-
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:609
#, fuzzy
msgid "Invalid response; please enter one of the following commands:"
msgstr ""
"Ακυρη απάντηση. Παρακαλώ εισάγετε μια έγκυρη εντολή ή '?' για βοήθεια.\n"
-#: src/cmdline/cmdline_resolver.cc:602
+#: src/cmdline/cmdline_resolver.cc:619
msgid "No solution found within the allotted time. Try harder? [Y/n]"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:630
+#: src/cmdline/cmdline_resolver.cc:647
#, fuzzy
msgid "Invalid response; please enter 'y' or 'n'."
msgstr ""
"Ακυρη απάντηση. Παρακαλώ εισάγετε μια έγκυρη εντολή ή '?' για βοήθεια.\n"
-#: src/cmdline/cmdline_resolver.cc:639
+#: src/cmdline/cmdline_resolver.cc:656
msgid "Unable to resolve dependencies! Giving up..."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:645
+#: src/cmdline/cmdline_resolver.cc:662
msgid "*** No more solutions available ***"
msgstr ""
@@ -1563,65 +1564,65 @@ msgstr "Αδύνατο το άνοιγμα του αρχείου λεπτομε
msgid "Reading extended state information"
msgstr "Ανάκτηση των δεδομένων λεπτομερούς κατάστασης"
-#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:403
-#: src/generic/apt/aptcache.cc:406
+#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:405
+#: src/generic/apt/aptcache.cc:408
msgid "Initializing package states"
msgstr "Αρχικοποίηση κατάστασης πακέτων"
-#: src/generic/apt/aptcache.cc:530
+#: src/generic/apt/aptcache.cc:533
msgid "Cannot open Aptitude state file"
msgstr "Αδύνατο το άνοιγμα του αρχείου κατάστασης του Aptitude"
-#: src/generic/apt/aptcache.cc:534 src/generic/apt/aptcache.cc:589
-#: src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:537 src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:595
msgid "Writing extended state information"
msgstr "Αποθήκευση δεδομένων λεπτομερούς κατάστασης"
-#: src/generic/apt/aptcache.cc:571
+#: src/generic/apt/aptcache.cc:574
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr ""
"Εσωτερική υπερχείλιση στο πακέτο \"%s\" κατά την εγγραφή του αρχείου "
"κατάστασης"
-#: src/generic/apt/aptcache.cc:580
+#: src/generic/apt/aptcache.cc:583
msgid "Couldn't write state file"
msgstr "Αδύνατη η εγγραφή στο αρχείο κατάστασης"
-#: src/generic/apt/aptcache.cc:597
+#: src/generic/apt/aptcache.cc:600
msgid "Error writing state file"
msgstr "Σφάλμα κατά την εγγραφή στο αρχείο κατάστασης"
-#: src/generic/apt/aptcache.cc:615
+#: src/generic/apt/aptcache.cc:618
#, fuzzy, c-format
msgid "failed to remove %s"
msgstr "Αδύνατο το άνοιγμα του %s για εγγραφή"
-#: src/generic/apt/aptcache.cc:622
+#: src/generic/apt/aptcache.cc:625
#, c-format
msgid "failed to rename %s to %s"
msgstr ""
-#: src/generic/apt/aptcache.cc:630
+#: src/generic/apt/aptcache.cc:633
#, fuzzy, c-format
msgid "couldn't replace %s with %s"
msgstr "αδύνατη η αντικατάσταση του υπάρχοντος αρχείου κατάστασης"
-#: src/generic/apt/aptcache.cc:1122
+#: src/generic/apt/aptcache.cc:1125
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr ""
"Αδύνατη η διόρθωση των εξαρτήσεων, κάποια πακέτα δεν μπορούν να εγκατασταθούν"
-#: src/generic/apt/aptcache.cc:1526
+#: src/generic/apt/aptcache.cc:1600
msgid "The list of sources could not be read."
msgstr "Αδύνατη η ανάγνωση της λίστας πηγών."
-#: src/generic/apt/aptcache.cc:1533
+#: src/generic/apt/aptcache.cc:1607
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
"Αδύνατο το άνοιγμα ή η ανάλυση των λιστών πακέτων ή του αρχείου κατάστασης."
-#: src/generic/apt/aptcache.cc:1536
+#: src/generic/apt/aptcache.cc:1610
msgid "You may want to update the package lists to correct these missing files"
msgstr ""
"Ίσως να χρειαστεί να ενημερώσετε τις λίστες των πακέτων για να διορθώσετε "
@@ -3949,12 +3950,12 @@ msgstr ""
"Είστε βέβαιοι για την αφαίρεσή του;\n"
"Πληκτρολογήστε '%s' αν είστε βέβαιοι."
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:284
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:291
#, c-format
msgid "Information about %s"
msgstr "Πληροφορίες σχετικά με το %s"
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:282
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:289
#, c-format
msgid "%s info"
msgstr ""
@@ -4297,7 +4298,7 @@ msgstr ""
"Τα ακόλουθα πακέτα εξαρτώνται από την έκδοση %B%s%b του %B%s%b, και θα "
"χαλάσουν αν είναι %s."
-#: src/solution_dialog.cc:91 src/solution_screen.cc:457
+#: src/solution_dialog.cc:91 src/solution_screen.cc:465
msgid "The package cache is not available."
msgstr ""
@@ -4307,11 +4308,11 @@ msgid "No packages are broken."
msgstr ""
"Κάποια πακέτα είναι κατεστραμμένα. Να γίνει προσπάθεια επιδιόρθωσής τους;"
-#: src/solution_dialog.cc:108 src/solution_screen.cc:479
+#: src/solution_dialog.cc:108 src/solution_screen.cc:488
msgid "No resolution found."
msgstr ""
-#: src/solution_dialog.cc:114 src/solution_screen.cc:490
+#: src/solution_dialog.cc:114 src/solution_screen.cc:499
#, fuzzy
msgid "Resolving dependencies..."
msgstr "Αδύνατο το άνοιγμα του %s για εγγραφή"
@@ -4350,7 +4351,7 @@ msgstr "προ-εξαρτάται από"
msgid "%s suggests %s"
msgstr "προτείνει"
-#: src/solution_fragment.cc:113 src/solution_item.cc:583
+#: src/solution_fragment.cc:113 src/solution_item.cc:593
#, fuzzy, c-format
msgid "%s recommends %s"
msgstr "συνιστά"
@@ -4459,7 +4460,7 @@ msgstr ""
msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgstr "Μεταφορτώθηκαν %sB σε %s (%sB/s)."
-#: src/solution_item.cc:587
+#: src/solution_item.cc:597
#, fuzzy, c-format
msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
msgstr "Τα ακόλουθα πακέτα είναι ΕΛΑΤΤΩΜΑΤΙΚΑ:"
@@ -4499,7 +4500,7 @@ msgstr "Μεταφόρτωση πακέτων"
msgid "Leave the following recommendations unresolved:"
msgstr "Τα ακόλουθα πακέτα είναι ΕΛΑΤΤΩΜΑΤΙΚΑ:"
-#: src/solution_screen.cc:463
+#: src/solution_screen.cc:472
#, fuzzy
msgid "No broken packages."
msgstr "^Εγκατάσταση/Αφαίρεση πακέτων"
diff --git a/po/es.po b/po/es.po
index faa3f3bd..05d6cb9c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude 0.3.2-4\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
-"POT-Creation-Date: 2005-11-07 15:22-0800\n"
+"POT-Creation-Date: 2005-11-13 10:12-0800\n"
"PO-Revision-Date: 2005-09-24 10:57+0200\n"
"Last-Translator: Rubén Porras Campo <nahoo@inicia.es>\n"
"Language-Team: Debian-l10n-Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -203,7 +203,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] Resolviendo las dependencias"
#: src/broken_indicator.cc:273 src/solution_dialog.cc:126
-#: src/solution_screen.cc:513
+#: src/solution_screen.cc:522
msgid "Internal error: unexpected null solution."
msgstr "Error interno: solución nula inesperada."
@@ -816,39 +816,39 @@ msgstr ""
"nombres de paquetes (o patrones). La acción se aplicará a todos los paquetes "
"que ponga. Las siguientes acciones están disponibles:"
-#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:167
+#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:184
msgid "'+' to install packages"
msgstr "'+' para instalar paquetes"
-#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:186
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
msgstr ""
"'+M' para instalar paquetes y marcarlos inmediatamente como instalados "
"automáticamente"
-#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:171
+#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:188
msgid "'-' to remove packages"
msgstr "'-' para eliminar"
-#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:173
+#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:190
msgid "'_' to purge packages"
msgstr "'_' para purgar los paquetes"
-#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:175
+#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:192
msgid "'=' to place packages on hold"
msgstr "'=' para bloquear paquetes"
-#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:177
+#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:194
msgid ""
"':' to keep packages in their current state without placing them on hold"
msgstr "':' para mantener paquetes en su estado actual sin bloquearlos"
-#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:179
+#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:196
msgid "'&M' to mark packages as automatically installed"
msgstr "'&M' para marcar paquetes como instalados automáticamente"
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:181
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:198
msgid "'&m' to mark packages as manually installed"
msgstr "'&m' para marcar paquetes como instalados manualmente"
@@ -933,7 +933,22 @@ msgstr ""
"Respuesta inválida. Por favor, introduzca una orden válida o '?' para leer "
"la ayuda.\n"
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_resolver.cc:124 src/cmdline/cmdline_resolver.cc:597
+#: src/generic/apt/apt.cc:199
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "No se pudo abrir %s para escribir en él"
+
+#: src/cmdline/cmdline_resolver.cc:130 src/cmdline/cmdline_resolver.cc:602
+#, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Error al escribir el estado del solucionador a %s"
+
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:604
+msgid "Resolver state successfully written!"
+msgstr "El estado del solucionador se escribió correctamente!"
+
+#: src/cmdline/cmdline_resolver.cc:145
#, c-format
msgid ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
@@ -942,35 +957,35 @@ msgstr ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr paq ver ...: %F%na paq ver ...: %F%"
"n<ACCIÓN> paq... : %F%n%F%F%F%F%F%F%F%F"
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:164
msgid "accept the proposed changes"
msgstr "aceptar los cambios propuestos"
-#: src/cmdline/cmdline_resolver.cc:149
+#: src/cmdline/cmdline_resolver.cc:166
msgid "reject the proposed changes and search for another solution"
msgstr "rechazar los cambios propuestos y buscar otra solución"
-#: src/cmdline/cmdline_resolver.cc:151
+#: src/cmdline/cmdline_resolver.cc:168
msgid "give up and quit the program"
msgstr "Salir del programa"
-#: src/cmdline/cmdline_resolver.cc:153
+#: src/cmdline/cmdline_resolver.cc:170
msgid "move to the next solution"
msgstr "ir a la siguiente solución"
-#: src/cmdline/cmdline_resolver.cc:155
+#: src/cmdline/cmdline_resolver.cc:172
msgid "move to the previous solution"
msgstr "ir a la solución anterior"
-#: src/cmdline/cmdline_resolver.cc:157
+#: src/cmdline/cmdline_resolver.cc:174
msgid "view an explanation of the changes in the solution"
msgstr "ver una explicación de los cambios de la solución"
-#: src/cmdline/cmdline_resolver.cc:159
+#: src/cmdline/cmdline_resolver.cc:176
msgid "examine the solution in the visual user interface"
msgstr "examinar la solución en la interfaz de usuario visual"
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:178
msgid ""
"reject the given package versions; don't display any solutions in which they "
"occur."
@@ -978,7 +993,7 @@ msgstr ""
"rechazar las versiones especificadas de los paquetes, no mostrar ninguna de "
"las soluciones en las que aparezcan."
-#: src/cmdline/cmdline_resolver.cc:163
+#: src/cmdline/cmdline_resolver.cc:180
msgid ""
"accept the given package versions; display only solutions in which they "
"occur."
@@ -986,11 +1001,11 @@ msgstr ""
"aceptar las versiones especificadas de los paquetes, mostrar sólolas "
"soluciones en las que aparezcan."
-#: src/cmdline/cmdline_resolver.cc:165
+#: src/cmdline/cmdline_resolver.cc:182
msgid "adjust the state of the listed packages, where ACTION is one of:"
msgstr "ajustar el estado de los paquetes listados, donde ACCIÓN es una de:"
-#: src/cmdline/cmdline_resolver.cc:183
+#: src/cmdline/cmdline_resolver.cc:200
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
@@ -998,141 +1013,127 @@ msgstr ""
"Los ajustes harán que la solución actual se descarte y se recalcule según "
"sea necesario"
-#: src/cmdline/cmdline_resolver.cc:197
+#: src/cmdline/cmdline_resolver.cc:214
#, c-format
msgid "The version %s is available in the following archives:"
msgstr "La versión %s sólo está disponible en los siguientes archivos:"
-#: src/cmdline/cmdline_resolver.cc:205
+#: src/cmdline/cmdline_resolver.cc:222
#, c-format
msgid "Select the version of %s that should be used: "
msgstr "Seleccionar la versión que se deba usar de %s:"
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:229
#, c-format
msgid "Invalid response. Please enter an integer between 1 and %d."
msgstr "Respuesta inválida. Por favor, introduzca un entero entre 1 y %d."
-#: src/cmdline/cmdline_resolver.cc:227
+#: src/cmdline/cmdline_resolver.cc:244
#, c-format
msgid "Expected at least one package/version pair following '%c'"
msgstr ""
"Se esperaba al menos una pareja del tipo paquete/versión siguiendo a «%c»"
-#: src/cmdline/cmdline_resolver.cc:241
+#: src/cmdline/cmdline_resolver.cc:258
#, c-format
msgid "Expected a version after \"%s\""
msgstr "Se esperaba una versión después de «%s»"
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:268
#, c-format
msgid "No such package \"%s\""
msgstr "El paquete «%s» no existe"
-#: src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_resolver.cc:284
#, c-format
msgid "%s has no version named \"%s\""
msgstr "%s no tiene ninguna versión con el nombre «%s»"
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:301
#, c-format
msgid "Allowing the removal of %s"
msgstr "Permitiendo la eliminación de %s"
-#: src/cmdline/cmdline_resolver.cc:287
+#: src/cmdline/cmdline_resolver.cc:304
#, c-format
msgid "Allowing the installation of %s version %s (%s)"
msgstr "Permitiendo la instalación de %s versión %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:314
#, c-format
msgid "Rejecting the removal of %s"
msgstr "Rechazando la eliminación de %s"
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:317
#, c-format
msgid "Rejecting the installation of %s version %s (%s)"
msgstr "Rechazando la instalación de %s versión %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:330
#, c-format
msgid "No longer requiring the removal of %s"
msgstr "Ya no se necesita la eliminación de %s"
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:333
#, c-format
msgid "No longer requiring the installation of %s version %s (%s)"
msgstr "Ya no se necesita la instalación de %s versión %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:325
+#: src/cmdline/cmdline_resolver.cc:342
#, c-format
msgid "Requiring the removal of %s"
msgstr "Se necesita la eliminación de %s"
-#: src/cmdline/cmdline_resolver.cc:328
+#: src/cmdline/cmdline_resolver.cc:345
#, c-format
msgid "Requiring the installation of %s version %s (%s)"
msgstr "Se necesita la instalación de %s versión %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:447 src/solution_screen.cc:486
+#: src/cmdline/cmdline_resolver.cc:464 src/solution_screen.cc:495
#, fuzzy, c-format
msgid "open: %d; closed: %d; defer: %d; conflict: %d"
msgstr "abierto: %d; cerrado: %d; defer: %d; conflicto: %d"
-#: src/cmdline/cmdline_resolver.cc:493
+#: src/cmdline/cmdline_resolver.cc:510
msgid "The following actions will resolve these dependencies:"
msgstr "Las acciones siguientes resolverán estas dependencias"
-#: src/cmdline/cmdline_resolver.cc:508
+#: src/cmdline/cmdline_resolver.cc:525
msgid "Accept this solution? [Y/n/q/?] "
msgstr "¿Acepta esta solución? [Y/n/q/?]"
-#: src/cmdline/cmdline_resolver.cc:535 src/cmdline/cmdline_resolver.cc:627
+#: src/cmdline/cmdline_resolver.cc:552 src/cmdline/cmdline_resolver.cc:644
msgid "Abandoning all efforts to resolve these dependencies."
msgstr "Abandonando todos los esfuerzos por resolver estas dependencias"
-#: src/cmdline/cmdline_resolver.cc:562
+#: src/cmdline/cmdline_resolver.cc:579
msgid "The following commands are available:"
msgstr "Las siguientes órdenes están disponibles:"
-#: src/cmdline/cmdline_resolver.cc:577
+#: src/cmdline/cmdline_resolver.cc:594
msgid "File to write resolver state to: "
msgstr "Fichero en el que escribir el estado del solucionador:"
-#: src/cmdline/cmdline_resolver.cc:580 src/generic/apt/apt.cc:199
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "No se pudo abrir %s para escribir en él"
-
-#: src/cmdline/cmdline_resolver.cc:585
-#, c-format
-msgid "Error writing resolver state to %s"
-msgstr "Error al escribir el estado del solucionador a %s"
-
-#: src/cmdline/cmdline_resolver.cc:587
-msgid "Resolver state successfully written!"
-msgstr "El estado del solucionador se escribió correctamente!"
-
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:609
msgid "Invalid response; please enter one of the following commands:"
msgstr ""
"Respuesta inválida. Por favor, introduzca una de las órdenes siguientes:"
-#: src/cmdline/cmdline_resolver.cc:602
+#: src/cmdline/cmdline_resolver.cc:619
msgid "No solution found within the allotted time. Try harder? [Y/n]"
msgstr ""
"No se encontró ninguna solución en el tiempo asignado. ¿Intentarlo "
"conzienzudamente? [Y/n]"
-#: src/cmdline/cmdline_resolver.cc:630
+#: src/cmdline/cmdline_resolver.cc:647
msgid "Invalid response; please enter 'y' or 'n'."
msgstr "Respuesta inválida. Por favor, introduzca 'y' o 'n'."
-#: src/cmdline/cmdline_resolver.cc:639
+#: src/cmdline/cmdline_resolver.cc:656
msgid "Unable to resolve dependencies! Giving up..."
msgstr "¡Incapaz de resolver las dependencias! Desistiendo..."
-#: src/cmdline/cmdline_resolver.cc:645
+#: src/cmdline/cmdline_resolver.cc:662
#, fuzzy
msgid "*** No more solutions available ***"
msgstr "No hay más soluciones"
@@ -1554,66 +1555,66 @@ msgstr "No se puede abrir el fichero de estado extendido de Aptitude"
msgid "Reading extended state information"
msgstr "Leyendo la información de estado extendido"
-#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:403
-#: src/generic/apt/aptcache.cc:406
+#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:405
+#: src/generic/apt/aptcache.cc:408
msgid "Initializing package states"
msgstr "Inicializando el estado de los paquetes"
-#: src/generic/apt/aptcache.cc:530
+#: src/generic/apt/aptcache.cc:533
msgid "Cannot open Aptitude state file"
msgstr "No se puede abrir el fichero de estado de Aptitude"
-#: src/generic/apt/aptcache.cc:534 src/generic/apt/aptcache.cc:589
-#: src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:537 src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:595
msgid "Writing extended state information"
msgstr "Escribiendo información de estado extendido"
-#: src/generic/apt/aptcache.cc:571
+#: src/generic/apt/aptcache.cc:574
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr ""
"Desbordamiento de búfer interno en el paquete \"%s\" al escribir el fichero "
"de estado"
-#: src/generic/apt/aptcache.cc:580
+#: src/generic/apt/aptcache.cc:583
msgid "Couldn't write state file"
msgstr "No se pudo escribir el fichero de estado"
-#: src/generic/apt/aptcache.cc:597
+#: src/generic/apt/aptcache.cc:600
msgid "Error writing state file"
msgstr "Error al escribir el fichero de estado"
-#: src/generic/apt/aptcache.cc:615
+#: src/generic/apt/aptcache.cc:618
#, fuzzy, c-format
msgid "failed to remove %s"
msgstr "No se pudo abrir %ls"
-#: src/generic/apt/aptcache.cc:622
+#: src/generic/apt/aptcache.cc:625
#, c-format
msgid "failed to rename %s to %s"
msgstr ""
-#: src/generic/apt/aptcache.cc:630
+#: src/generic/apt/aptcache.cc:633
#, fuzzy, c-format
msgid "couldn't replace %s with %s"
msgstr "No se pudo reemplazar el fichero de estado anterior"
-#: src/generic/apt/aptcache.cc:1122
+#: src/generic/apt/aptcache.cc:1125
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr ""
"No ha sido posible corregir las dependencias, no se pueden instalar algunos "
"de los paquetes"
-#: src/generic/apt/aptcache.cc:1526
+#: src/generic/apt/aptcache.cc:1600
msgid "The list of sources could not be read."
msgstr "No se pudo leer la lista de fuentes."
-#: src/generic/apt/aptcache.cc:1533
+#: src/generic/apt/aptcache.cc:1607
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
"No se pudo abrir o interpretar las listas de paquetes o el fichero de estado."
-#: src/generic/apt/aptcache.cc:1536
+#: src/generic/apt/aptcache.cc:1610
msgid "You may want to update the package lists to correct these missing files"
msgstr ""
"Puede que quiera actualizar las listas de paquetes para corregir los "
@@ -3923,12 +3924,12 @@ msgstr ""
"¡%s es un paquete esencial!%n%n¿Seguro que quiere eliminarlo?%nSi lo está "
"escriba '%s'."
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:284
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:291
#, c-format
msgid "Information about %s"
msgstr "Información sobre %s"
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:282
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:289
#, c-format
msgid "%s info"
msgstr "%s info"
@@ -4269,7 +4270,7 @@ msgstr ""
"Los siguientes paquetes dependen de la versión %B%s%b de %B%s%b, y se "
"romperán si es %s."
-#: src/solution_dialog.cc:91 src/solution_screen.cc:457
+#: src/solution_dialog.cc:91 src/solution_screen.cc:465
msgid "The package cache is not available."
msgstr "No está disponible la caché de paquetes."
@@ -4277,11 +4278,11 @@ msgstr "No está disponible la caché de paquetes."
msgid "No packages are broken."
msgstr "No hay paquetes rotos."
-#: src/solution_dialog.cc:108 src/solution_screen.cc:479
+#: src/solution_dialog.cc:108 src/solution_screen.cc:488
msgid "No resolution found."
msgstr "No se encontró ninguna solución."
-#: src/solution_dialog.cc:114 src/solution_screen.cc:490
+#: src/solution_dialog.cc:114 src/solution_screen.cc:499
msgid "Resolving dependencies..."
msgstr "Resolviendo las dependencias..."
@@ -4316,7 +4317,7 @@ msgstr "%s predepende de %s"
msgid "%s suggests %s"
msgstr "%s sugiere %s"
-#: src/solution_fragment.cc:113 src/solution_item.cc:583
+#: src/solution_fragment.cc:113 src/solution_item.cc:593
#, c-format
msgid "%s recommends %s"
msgstr "%s recomienda %s"
@@ -4420,7 +4421,7 @@ msgstr "Actualizar %F [%s (%s) -> %s (%s)]"
msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgstr "Desactualizar %F [%s (%s) -> %s (%s)]"
-#: src/solution_item.cc:587
+#: src/solution_item.cc:597
#, c-format
msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
msgstr "-> Dejar la dependencia \"%s recomienda %s\" sin resolver."
@@ -4453,7 +4454,7 @@ msgstr "Desactualizar los paquetes siguientes:"
msgid "Leave the following recommendations unresolved:"
msgstr "Dejar las siguientes recomendaciones sin resolver:"
-#: src/solution_screen.cc:463
+#: src/solution_screen.cc:472
msgid "No broken packages."
msgstr "Ningún paquete roto"
diff --git a/po/eu.po b/po/eu.po
index fb0c0a48..e7ec3145 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude.eu3\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
-"POT-Creation-Date: 2005-11-07 15:22-0800\n"
+"POT-Creation-Date: 2005-11-13 10:12-0800\n"
"PO-Revision-Date: 2005-09-25 15:41+0200\n"
"Last-Translator: Iñaki Larrañaga <dooteo@euskalgnu.org>\n"
"Language-Team: <itzulpena@euskalgnu.org>\n"
@@ -204,7 +204,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] Mendekotasunak ebaztea"
#: src/broken_indicator.cc:273 src/solution_dialog.cc:126
-#: src/solution_screen.cc:513
+#: src/solution_screen.cc:522
msgid "Internal error: unexpected null solution."
msgstr "Barne-errorea: ustegabeko 'null' emaitza."
@@ -804,39 +804,39 @@ msgstr ""
"ekintza-karaktere bat, eta jarraian pakete-izen edo -eredu bat edo gehiago. "
"Ekintza pakete guztiei aplikatuko zaie. Ekintza erabilgarriak:"
-#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:167
+#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:184
msgid "'+' to install packages"
msgstr "'+' paketeak instalatzeko"
-#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:186
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
msgstr ""
"'+M' paketeak instalatzeko eta jarri bandera pakete hauek automatikoki "
"instalatu direla adierazteko"
-#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:171
+#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:188
msgid "'-' to remove packages"
msgstr "'-' paketeak kentzeko"
-#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:173
+#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:190
msgid "'_' to purge packages"
msgstr "'_' paketeak purgatzeko"
-#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:175
+#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:192
msgid "'=' to place packages on hold"
msgstr "'=' paketeak atxikitzeko"
-#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:177
+#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:194
msgid ""
"':' to keep packages in their current state without placing them on hold"
msgstr "':' paketeak beraien uneko egoeran mantentzeko, atxikitu gabe"
-#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:179
+#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:196
msgid "'&M' to mark packages as automatically installed"
msgstr "'&M' markatu automatikoki instalatu izan diren paketeak"
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:181
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:198
msgid "'&m' to mark packages as manually installed"
msgstr "'&m' markatu eskus instalaturik izan diren paketeak"
@@ -920,7 +920,22 @@ msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr ""
"Erantzun baliogabea. Sartu baliozko komando bat, edo '?' laguntza ikusteko.\n"
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_resolver.cc:124 src/cmdline/cmdline_resolver.cc:597
+#: src/generic/apt/apt.cc:199
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "Ezin da %s idazteko ireki"
+
+#: src/cmdline/cmdline_resolver.cc:130 src/cmdline/cmdline_resolver.cc:602
+#, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Errorea ebazpen-egoera %s(e)n idaztean"
+
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:604
+msgid "Resolver state successfully written!"
+msgstr "Ebazpen-egoera ongi idatzi da."
+
+#: src/cmdline/cmdline_resolver.cc:145
#, c-format
msgid ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
@@ -929,42 +944,42 @@ msgstr ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkt bert ...: %F%na pkt bert ...: %F%"
"n<ACTION> pkt... : %F%n%F%F%F%F%F%F%F%F"
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:164
msgid "accept the proposed changes"
msgstr "onartu proposatutako aldaketak"
-#: src/cmdline/cmdline_resolver.cc:149
+#: src/cmdline/cmdline_resolver.cc:166
msgid "reject the proposed changes and search for another solution"
msgstr "ezetsi proposatutako aldaketak eta bilatu beste irtenbide bat"
-#: src/cmdline/cmdline_resolver.cc:151
+#: src/cmdline/cmdline_resolver.cc:168
msgid "give up and quit the program"
msgstr "bertan behera utzi eta irten programatik"
-#: src/cmdline/cmdline_resolver.cc:153
+#: src/cmdline/cmdline_resolver.cc:170
msgid "move to the next solution"
msgstr "joan hurrengo irtenbidera"
-#: src/cmdline/cmdline_resolver.cc:155
+#: src/cmdline/cmdline_resolver.cc:172
msgid "move to the previous solution"
msgstr "joan aurreko irtenbidera"
-#: src/cmdline/cmdline_resolver.cc:157
+#: src/cmdline/cmdline_resolver.cc:174
msgid "view an explanation of the changes in the solution"
msgstr "ikusi irtenbidearen aldaketen azalpenak"
-#: src/cmdline/cmdline_resolver.cc:159
+#: src/cmdline/cmdline_resolver.cc:176
msgid "examine the solution in the visual user interface"
msgstr "aztertu irtenbidea erabiltzaile-interfazean"
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:178
msgid ""
"reject the given package versions; don't display any solutions in which they "
"occur."
msgstr ""
"ezetsi emandako paketeen bertsioak: ez erakutsi agertzen direnen irtenbideak"
-#: src/cmdline/cmdline_resolver.cc:163
+#: src/cmdline/cmdline_resolver.cc:180
msgid ""
"accept the given package versions; display only solutions in which they "
"occur."
@@ -972,11 +987,11 @@ msgstr ""
"onartu emandako paketeen bertsioak: erakutsi agertzen direnen irtenbideak "
"soilik"
-#: src/cmdline/cmdline_resolver.cc:165
+#: src/cmdline/cmdline_resolver.cc:182
msgid "adjust the state of the listed packages, where ACTION is one of:"
msgstr "egokitu zerrendatutako paketeen egoera, EKINTZA hauetariko bat da"
-#: src/cmdline/cmdline_resolver.cc:183
+#: src/cmdline/cmdline_resolver.cc:200
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
@@ -984,137 +999,123 @@ msgstr ""
"Egokitzeak uneko irtenbidea baztertzea, eta beharrezkoak diren kalkuluak "
"berriro egitea dakar."
-#: src/cmdline/cmdline_resolver.cc:197
+#: src/cmdline/cmdline_resolver.cc:214
#, c-format
msgid "The version %s is available in the following archives:"
msgstr "%s bertsioa honako artxiboetan eskuragarri dago:"
-#: src/cmdline/cmdline_resolver.cc:205
+#: src/cmdline/cmdline_resolver.cc:222
#, c-format
msgid "Select the version of %s that should be used: "
msgstr "Hautatu %s(r)en bertsioa erabiltzeko:"
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:229
#, c-format
msgid "Invalid response. Please enter an integer between 1 and %d."
msgstr "Erantzun baliogabea. Sakatu 1 eta %d arteko zenbaki osokoa."
-#: src/cmdline/cmdline_resolver.cc:227
+#: src/cmdline/cmdline_resolver.cc:244
#, c-format
msgid "Expected at least one package/version pair following '%c'"
msgstr "Pakete/bertsio bikote bat bederen espero da '%c'-ri jarraituz"
-#: src/cmdline/cmdline_resolver.cc:241
+#: src/cmdline/cmdline_resolver.cc:258
#, c-format
msgid "Expected a version after \"%s\""
msgstr "\"%s\"(r)en ondoren bertsioa espero da"
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:268
#, c-format
msgid "No such package \"%s\""
msgstr "Ez dago \"%s\" bezalako paketerik"
-#: src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_resolver.cc:284
#, c-format
msgid "%s has no version named \"%s\""
msgstr "%s(e)k ez du \"%s\" bertsio-izenik"
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:301
#, c-format
msgid "Allowing the removal of %s"
msgstr "Baimendu %s kentzea"
-#: src/cmdline/cmdline_resolver.cc:287
+#: src/cmdline/cmdline_resolver.cc:304
#, c-format
msgid "Allowing the installation of %s version %s (%s)"
msgstr "Baimendu %s(r)en %s bertsioa (%s) instalatzea"
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:314
#, c-format
msgid "Rejecting the removal of %s"
msgstr "Ezetsi %s kentzea"
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:317
#, c-format
msgid "Rejecting the installation of %s version %s (%s)"
msgstr "Ezetsi %s(r)en %s bertsioa (%s) instalatzea"
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:330
#, c-format
msgid "No longer requiring the removal of %s"
msgstr "Ez da gehiago eskatuko %s kentzea"
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:333
#, c-format
msgid "No longer requiring the installation of %s version %s (%s)"
msgstr "Ez da gehiago eskatuko %s(r)en %s bertsioa (%s) instalatzea"
-#: src/cmdline/cmdline_resolver.cc:325
+#: src/cmdline/cmdline_resolver.cc:342
#, c-format
msgid "Requiring the removal of %s"
msgstr "Eskatu %s kentzea"
-#: src/cmdline/cmdline_resolver.cc:328
+#: src/cmdline/cmdline_resolver.cc:345
#, c-format
msgid "Requiring the installation of %s version %s (%s)"
msgstr "Eskatu %s(r)en %s bertsioa (%s) instalatzea"
-#: src/cmdline/cmdline_resolver.cc:447 src/solution_screen.cc:486
+#: src/cmdline/cmdline_resolver.cc:464 src/solution_screen.cc:495
#, c-format
msgid "open: %d; closed: %d; defer: %d; conflict: %d"
msgstr "ireki: %d; itxita: %d; geroratua: %d; gatazka: %d"
-#: src/cmdline/cmdline_resolver.cc:493
+#: src/cmdline/cmdline_resolver.cc:510
msgid "The following actions will resolve these dependencies:"
msgstr "Honako ekintzek mendekotasun hauek konponduko dituzte:"
-#: src/cmdline/cmdline_resolver.cc:508
+#: src/cmdline/cmdline_resolver.cc:525
msgid "Accept this solution? [Y/n/q/?] "
msgstr "Onartu irtenbide hau? [Y/n/q/?] "
-#: src/cmdline/cmdline_resolver.cc:535 src/cmdline/cmdline_resolver.cc:627
+#: src/cmdline/cmdline_resolver.cc:552 src/cmdline/cmdline_resolver.cc:644
msgid "Abandoning all efforts to resolve these dependencies."
msgstr "Mendekotasun hauek ebazteko ahalegin guztiak bertan behera uzten."
-#: src/cmdline/cmdline_resolver.cc:562
+#: src/cmdline/cmdline_resolver.cc:579
msgid "The following commands are available:"
msgstr "Honako komandoak eskuragarri daude:"
-#: src/cmdline/cmdline_resolver.cc:577
+#: src/cmdline/cmdline_resolver.cc:594
msgid "File to write resolver state to: "
msgstr "Fitxategia ebazpen-egoera idazteko:"
-#: src/cmdline/cmdline_resolver.cc:580 src/generic/apt/apt.cc:199
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Ezin da %s idazteko ireki"
-
-#: src/cmdline/cmdline_resolver.cc:585
-#, c-format
-msgid "Error writing resolver state to %s"
-msgstr "Errorea ebazpen-egoera %s(e)n idaztean"
-
-#: src/cmdline/cmdline_resolver.cc:587
-msgid "Resolver state successfully written!"
-msgstr "Ebazpen-egoera ongi idatzi da."
-
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:609
msgid "Invalid response; please enter one of the following commands:"
msgstr "Erantzun baliogabea. Sartu hurrengo komendoetariko bat:"
-#: src/cmdline/cmdline_resolver.cc:602
+#: src/cmdline/cmdline_resolver.cc:619
msgid "No solution found within the allotted time. Try harder? [Y/n]"
msgstr "Ez da irtenbiderik aurkitu emandako denboran. Sakonago saiatu? [Y/n]"
-#: src/cmdline/cmdline_resolver.cc:630
+#: src/cmdline/cmdline_resolver.cc:647
msgid "Invalid response; please enter 'y' or 'n'."
msgstr "Erantzun baliogabea. Sakatu 'y' edo 'n'."
-#: src/cmdline/cmdline_resolver.cc:639
+#: src/cmdline/cmdline_resolver.cc:656
msgid "Unable to resolve dependencies! Giving up..."
msgstr "Ezin da mendekotasunak ebatzi. Bertan behera uzten..."
-#: src/cmdline/cmdline_resolver.cc:645
+#: src/cmdline/cmdline_resolver.cc:662
#, fuzzy
msgid "*** No more solutions available ***"
msgstr "Ez dago irtenbide gehiagorik."
@@ -1531,62 +1532,62 @@ msgstr "Ezin da ireki Aptitude egoera-fitxategi hedatua"
msgid "Reading extended state information"
msgstr "Egoera-informazio hedatua irakurtzen"
-#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:403
-#: src/generic/apt/aptcache.cc:406
+#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:405
+#: src/generic/apt/aptcache.cc:408
msgid "Initializing package states"
msgstr "Pakete-egoerak hasieratzen"
-#: src/generic/apt/aptcache.cc:530
+#: src/generic/apt/aptcache.cc:533
msgid "Cannot open Aptitude state file"
msgstr "Ezin da Aptitude egoera-fitxategia ireki"
-#: src/generic/apt/aptcache.cc:534 src/generic/apt/aptcache.cc:589
-#: src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:537 src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:595
msgid "Writing extended state information"
msgstr "Egoera-informazio hedatua idazten"
-#: src/generic/apt/aptcache.cc:571
+#: src/generic/apt/aptcache.cc:574
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr "Barneko buffer-gainezkatzea \"%s\" paketean egoera-fitxategia idaztean"
-#: src/generic/apt/aptcache.cc:580
+#: src/generic/apt/aptcache.cc:583
msgid "Couldn't write state file"
msgstr "Ezin izan da egoera-fitxategia idatzi"
-#: src/generic/apt/aptcache.cc:597
+#: src/generic/apt/aptcache.cc:600
msgid "Error writing state file"
msgstr "Errorea egoera-fitxategia idaztean"
-#: src/generic/apt/aptcache.cc:615
+#: src/generic/apt/aptcache.cc:618
#, c-format
msgid "failed to remove %s"
msgstr "huts egin du %s kentzean"
-#: src/generic/apt/aptcache.cc:622
+#: src/generic/apt/aptcache.cc:625
#, c-format
msgid "failed to rename %s to %s"
msgstr "huts egin du izenez aldatzean: %s -> %s"
-#: src/generic/apt/aptcache.cc:630
+#: src/generic/apt/aptcache.cc:633
#, c-format
msgid "couldn't replace %s with %s"
msgstr "ezin izan da %s %s(e)kin ordeztu"
-#: src/generic/apt/aptcache.cc:1122
+#: src/generic/apt/aptcache.cc:1125
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr ""
"Ezin izan dira mendekotasunak zuzendu; pakete batzuk ezin dira instalatu"
-#: src/generic/apt/aptcache.cc:1526
+#: src/generic/apt/aptcache.cc:1600
msgid "The list of sources could not be read."
msgstr "Ezin izan da iturburu-zerrenda irakurri."
-#: src/generic/apt/aptcache.cc:1533
+#: src/generic/apt/aptcache.cc:1607
msgid "The package lists or status file could not be parsed or opened."
msgstr "Pakete-zerrendak edo egoera-fitxategia ezin dira analizatu edo ireki."
-#: src/generic/apt/aptcache.cc:1536
+#: src/generic/apt/aptcache.cc:1610
msgid "You may want to update the package lists to correct these missing files"
msgstr ""
"Beharbada pakete-zerrendak eguneratu nahiko dituzu, falta diren fitxategiak "
@@ -3882,12 +3883,12 @@ msgstr ""
"%s beharrezko pakete bat da. %n%nZiur zaude ezabatu nahi duzula?%nZiur "
"bazaude, idatzi %s."
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:284
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:291
#, c-format
msgid "Information about %s"
msgstr "Honi buruzko informazioa: %s"
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:282
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:289
#, c-format
msgid "%s info"
msgstr "%s info"
@@ -4223,7 +4224,7 @@ msgstr ""
"Ondorengo paketeak %B%s%b bertsioaren (%B%s%b) mendekoak dira, eta hautsi "
"egingo dira %s bada."
-#: src/solution_dialog.cc:91 src/solution_screen.cc:457
+#: src/solution_dialog.cc:91 src/solution_screen.cc:465
msgid "The package cache is not available."
msgstr "Pakete-cachea ez dago eskuragarri."
@@ -4231,11 +4232,11 @@ msgstr "Pakete-cachea ez dago eskuragarri."
msgid "No packages are broken."
msgstr "Ez dago hautsitako paketerik."
-#: src/solution_dialog.cc:108 src/solution_screen.cc:479
+#: src/solution_dialog.cc:108 src/solution_screen.cc:488
msgid "No resolution found."
msgstr "Ez da bereizmenik aurkitu."
-#: src/solution_dialog.cc:114 src/solution_screen.cc:490
+#: src/solution_dialog.cc:114 src/solution_screen.cc:499
msgid "Resolving dependencies..."
msgstr "Mendekotasunak ebazten..."
@@ -4270,7 +4271,7 @@ msgstr "%s honen aurremendekoa da: %s"
msgid "%s suggests %s"
msgstr "%s(e)k hau iradokitzen du: %s"
-#: src/solution_fragment.cc:113 src/solution_item.cc:583
+#: src/solution_fragment.cc:113 src/solution_item.cc:593
#, c-format
msgid "%s recommends %s"
msgstr "%s(e)k hau gomendatzen du: %s"
@@ -4374,7 +4375,7 @@ msgstr "Eguneratu %F [%s (%s) -> %s (%s)]"
msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgstr "Bertsio-zahartu %F [%s (%s) -> %s (%s)]"
-#: src/solution_item.cc:587
+#: src/solution_item.cc:597
#, c-format
msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
msgstr "-> Utzi \"%s(e)k hau gomendatzen du: %s\" mendekotasuna ebatzi gabe."
@@ -4407,7 +4408,7 @@ msgstr "Aurreko bertsiora itzuli honako paketeak:"
msgid "Leave the following recommendations unresolved:"
msgstr "Utzi honako gomendioak ebatzi gabe:"
-#: src/solution_screen.cc:463
+#: src/solution_screen.cc:472
msgid "No broken packages."
msgstr "Ez dago hondatutako paketerik."
diff --git a/po/fi.po b/po/fi.po
index c5d5d574..9b005135 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude 0.3.5.1\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
-"POT-Creation-Date: 2005-11-07 15:22-0800\n"
+"POT-Creation-Date: 2005-11-13 10:12-0800\n"
"PO-Revision-Date: 2005-10-23 21:17+0300\n"
"Last-Translator: Jaakko Kangasharju <ashar@iki.fi>\n"
"Language-Team: Jaakko Kangasharju <ashar@iki.fi>\n"
@@ -198,7 +198,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] Selvitän riippuvuuksia"
#: src/broken_indicator.cc:273 src/solution_dialog.cc:126
-#: src/solution_screen.cc:513
+#: src/solution_screen.cc:522
msgid "Internal error: unexpected null solution."
msgstr "Ohjelmavirhe: odottamaton tyhjä ratkaisu."
@@ -797,38 +797,38 @@ msgstr ""
"suoritetaan kaikille luettelemillesi paketeille. Käytössä olevat toiminnot "
"ovat:"
-#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:167
+#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:184
msgid "'+' to install packages"
msgstr "'+' asentaaksesi paketteja"
-#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:186
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
msgstr ""
"'+M' asentaaksesi paketteja ja merkitäksesi ne automaattisesti asennetuiksi"
-#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:171
+#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:188
msgid "'-' to remove packages"
msgstr "'-' poistaaksesi paketteja"
-#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:173
+#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:190
msgid "'_' to purge packages"
msgstr "'_' siivotaksesi paketteja"
-#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:175
+#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:192
msgid "'=' to place packages on hold"
msgstr "'=' jäädyttääksesi paketteja"
-#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:177
+#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:194
msgid ""
"':' to keep packages in their current state without placing them on hold"
msgstr "':' säilyttääksesi paketteja nykyisessä tilassaan jäädyttämättä niitä"
-#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:179
+#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:196
msgid "'&M' to mark packages as automatically installed"
msgstr "'&M' merkitäksesi paketteja automaattisesti asennetuiksi"
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:181
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:198
msgid "'&m' to mark packages as manually installed"
msgstr "'&m' merkitäksesi paketteja käsin asennetuiksi"
@@ -912,8 +912,23 @@ msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr ""
"Virheellinen komento. Anna hyväksytty komento tai '?' saadaksesi apua.\n"
+#: src/cmdline/cmdline_resolver.cc:124 src/cmdline/cmdline_resolver.cc:597
+#: src/generic/apt/apt.cc:199
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "En pysty kirjoittamaan tiedostoon %s"
+
+#: src/cmdline/cmdline_resolver.cc:130 src/cmdline/cmdline_resolver.cc:602
+#, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Virhe kirjoitettaessa selvityksen tilatietoja tiedostoon %s"
+
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:604
+msgid "Resolver state successfully written!"
+msgstr "Ratkaisimen tila tallennettu!"
+
# Left (almost) as is on purpose - JJK
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_resolver.cc:145
#, c-format
msgid ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
@@ -922,42 +937,42 @@ msgstr ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %F pkt ver ...: %F%na pkt ver ...: %F%"
"n<TOIMINTO> pkt... : %F%n%F%F%F%F%F%F%F%F"
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:164
msgid "accept the proposed changes"
msgstr "hyväksy ehdotetut muutokset"
-#: src/cmdline/cmdline_resolver.cc:149
+#: src/cmdline/cmdline_resolver.cc:166
msgid "reject the proposed changes and search for another solution"
msgstr "hylkää ehdotetut muutokset ja etsi toista ratkaisua"
-#: src/cmdline/cmdline_resolver.cc:151
+#: src/cmdline/cmdline_resolver.cc:168
msgid "give up and quit the program"
msgstr "poistu ohjelmasta"
-#: src/cmdline/cmdline_resolver.cc:153
+#: src/cmdline/cmdline_resolver.cc:170
msgid "move to the next solution"
msgstr "siirry seuraavaan ratkaisuun"
-#: src/cmdline/cmdline_resolver.cc:155
+#: src/cmdline/cmdline_resolver.cc:172
msgid "move to the previous solution"
msgstr "siirry edelliseen ratkaisuun"
-#: src/cmdline/cmdline_resolver.cc:157
+#: src/cmdline/cmdline_resolver.cc:174
msgid "view an explanation of the changes in the solution"
msgstr "näytä ratkaisun tekemät muutokset"
-#: src/cmdline/cmdline_resolver.cc:159
+#: src/cmdline/cmdline_resolver.cc:176
msgid "examine the solution in the visual user interface"
msgstr "tutki ratkaisua kokoruudun käyttöliittymässä"
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:178
msgid ""
"reject the given package versions; don't display any solutions in which they "
"occur."
msgstr ""
"hylkää pakettien annetut versiot; älä näytä ratkaisuja, joissa ne esiintyvät."
-#: src/cmdline/cmdline_resolver.cc:163
+#: src/cmdline/cmdline_resolver.cc:180
msgid ""
"accept the given package versions; display only solutions in which they "
"occur."
@@ -965,150 +980,136 @@ msgstr ""
"hyväksy pakettien annetut versiot; näytä vain ratkaisuja, joissa ne "
"esiintyvät."
-#: src/cmdline/cmdline_resolver.cc:165
+#: src/cmdline/cmdline_resolver.cc:182
msgid "adjust the state of the listed packages, where ACTION is one of:"
msgstr "muuta lueteltujen pakettien tilaa, missä TOIMINTO on yksi seuraavista:"
-#: src/cmdline/cmdline_resolver.cc:183
+#: src/cmdline/cmdline_resolver.cc:200
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
msgstr ""
"Muutokset hylkäävät nykyisen ratkaisun ja etsivät uuden, jos se on tarpeen."
-#: src/cmdline/cmdline_resolver.cc:197
+#: src/cmdline/cmdline_resolver.cc:214
#, c-format
msgid "The version %s is available in the following archives:"
msgstr "Versio %s on saatavilla arkistoista:"
-#: src/cmdline/cmdline_resolver.cc:205
+#: src/cmdline/cmdline_resolver.cc:222
#, c-format
msgid "Select the version of %s that should be used: "
msgstr "Valitse haluamasi paketin %s versio: "
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:229
#, c-format
msgid "Invalid response. Please enter an integer between 1 and %d."
msgstr "Virheellinen syöte. Anna luku 1:n ja %d:n väliltä."
-#: src/cmdline/cmdline_resolver.cc:227
+#: src/cmdline/cmdline_resolver.cc:244
#, c-format
msgid "Expected at least one package/version pair following '%c'"
msgstr "'%c':ta pitäisi seurata ainakin yksi paketti-versio-pari"
-#: src/cmdline/cmdline_resolver.cc:241
+#: src/cmdline/cmdline_resolver.cc:258
#, c-format
msgid "Expected a version after \"%s\""
msgstr "Nimeä \"%s\" ei seurannut versio"
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:268
#, c-format
msgid "No such package \"%s\""
msgstr "Pakettia \"%s\" ei ole olemassa"
-#: src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_resolver.cc:284
#, c-format
msgid "%s has no version named \"%s\""
msgstr "Paketilla %s ei ole versiota \"%s\""
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:301
#, c-format
msgid "Allowing the removal of %s"
msgstr "Sallin paketin %s poiston"
-#: src/cmdline/cmdline_resolver.cc:287
+#: src/cmdline/cmdline_resolver.cc:304
#, c-format
msgid "Allowing the installation of %s version %s (%s)"
msgstr "Sallin paketin %s version %s (%s) asennuksen"
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:314
#, c-format
msgid "Rejecting the removal of %s"
msgstr "Hylkään paketin %s poiston"
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:317
#, c-format
msgid "Rejecting the installation of %s version %s (%s)"
msgstr "Hylkään paketin %s version %s (%s) poiston"
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:330
#, c-format
msgid "No longer requiring the removal of %s"
msgstr "En enää vaadi paketin %s poistoa"
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:333
#, c-format
msgid "No longer requiring the installation of %s version %s (%s)"
msgstr "En enää vaadi paketin %s version %s (%s) asennusta"
-#: src/cmdline/cmdline_resolver.cc:325
+#: src/cmdline/cmdline_resolver.cc:342
#, c-format
msgid "Requiring the removal of %s"
msgstr "Vaadin paketin %s poiston"
-#: src/cmdline/cmdline_resolver.cc:328
+#: src/cmdline/cmdline_resolver.cc:345
#, c-format
msgid "Requiring the installation of %s version %s (%s)"
msgstr "Vaadin paketin %s version %s (%s) asennuksen"
-#: src/cmdline/cmdline_resolver.cc:447 src/solution_screen.cc:486
+#: src/cmdline/cmdline_resolver.cc:464 src/solution_screen.cc:495
#, c-format
msgid "open: %d; closed: %d; defer: %d; conflict: %d"
msgstr "avoinna: %d; ratkaistu: %d; siirretty: %d; ristiriitoja: %d"
-#: src/cmdline/cmdline_resolver.cc:493
+#: src/cmdline/cmdline_resolver.cc:510
msgid "The following actions will resolve these dependencies:"
msgstr "Seuraavat toiminnot selvittävät nämä riippuvuudet:"
-#: src/cmdline/cmdline_resolver.cc:508
+#: src/cmdline/cmdline_resolver.cc:525
msgid "Accept this solution? [Y/n/q/?] "
msgstr "Hyväksytkö tämän ratkaisun? [Kyllä=y/ei=n/lopeta=q/?] "
-#: src/cmdline/cmdline_resolver.cc:535 src/cmdline/cmdline_resolver.cc:627
+#: src/cmdline/cmdline_resolver.cc:552 src/cmdline/cmdline_resolver.cc:644
msgid "Abandoning all efforts to resolve these dependencies."
msgstr "Lopetetaan yritykset ratkaista näitä riippuvuuksia."
-#: src/cmdline/cmdline_resolver.cc:562
+#: src/cmdline/cmdline_resolver.cc:579
msgid "The following commands are available:"
msgstr "Käytettävissä olevat komennot:"
-#: src/cmdline/cmdline_resolver.cc:577
+#: src/cmdline/cmdline_resolver.cc:594
msgid "File to write resolver state to: "
msgstr "Mihin tiedostoon selvityksen tila tallennetaan? "
-#: src/cmdline/cmdline_resolver.cc:580 src/generic/apt/apt.cc:199
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "En pysty kirjoittamaan tiedostoon %s"
-
-#: src/cmdline/cmdline_resolver.cc:585
-#, c-format
-msgid "Error writing resolver state to %s"
-msgstr "Virhe kirjoitettaessa selvityksen tilatietoja tiedostoon %s"
-
-#: src/cmdline/cmdline_resolver.cc:587
-msgid "Resolver state successfully written!"
-msgstr "Ratkaisimen tila tallennettu!"
-
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:609
msgid "Invalid response; please enter one of the following commands:"
msgstr "Virheellinen syöte; anna jokin seuraavista komennoista:"
-#: src/cmdline/cmdline_resolver.cc:602
+#: src/cmdline/cmdline_resolver.cc:619
msgid "No solution found within the allotted time. Try harder? [Y/n]"
msgstr ""
"Ratkaisua ei löytynyt annetun ajan sisällä. Yritetäänkö pitempään? [Kyllä=y/"
"ei=n]"
-#: src/cmdline/cmdline_resolver.cc:630
+#: src/cmdline/cmdline_resolver.cc:647
msgid "Invalid response; please enter 'y' or 'n'."
msgstr "Virheellinen syöte; kirjoita joko 'y' (kyllä) tai 'n' (ei)."
-#: src/cmdline/cmdline_resolver.cc:639
+#: src/cmdline/cmdline_resolver.cc:656
msgid "Unable to resolve dependencies! Giving up..."
msgstr "Riippuvuuksien selvitys epäonnistui! Luovutan..."
-#: src/cmdline/cmdline_resolver.cc:645
+#: src/cmdline/cmdline_resolver.cc:662
msgid "*** No more solutions available ***"
msgstr "*** Ei muita ratkaisuja ***"
@@ -1522,61 +1523,61 @@ msgstr "En pystynyt avaamaan Aptituden tilatiedostoa"
msgid "Reading extended state information"
msgstr "Luen tilatietoja"
-#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:403
-#: src/generic/apt/aptcache.cc:406
+#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:405
+#: src/generic/apt/aptcache.cc:408
msgid "Initializing package states"
msgstr "Alustan pakettien tiloja"
-#: src/generic/apt/aptcache.cc:530
+#: src/generic/apt/aptcache.cc:533
msgid "Cannot open Aptitude state file"
msgstr "En pystynyt avaamaan Aptituden tilatiedostoa"
-#: src/generic/apt/aptcache.cc:534 src/generic/apt/aptcache.cc:589
-#: src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:537 src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:595
msgid "Writing extended state information"
msgstr "Kirjoitan tilatietoja"
-#: src/generic/apt/aptcache.cc:571
+#: src/generic/apt/aptcache.cc:574
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr "Puskurin ylivuoto paketin \"%s\" kohdalla tilatietoja kirjoitettaessa"
-#: src/generic/apt/aptcache.cc:580
+#: src/generic/apt/aptcache.cc:583
msgid "Couldn't write state file"
msgstr "En pystynyt kirjoittamaan tilatietoja"
-#: src/generic/apt/aptcache.cc:597
+#: src/generic/apt/aptcache.cc:600
msgid "Error writing state file"
msgstr "Virhe tilatietoja kirjoitettaessa"
-#: src/generic/apt/aptcache.cc:615
+#: src/generic/apt/aptcache.cc:618
#, c-format
msgid "failed to remove %s"
msgstr "%s:n poisto epäonnistui"
-#: src/generic/apt/aptcache.cc:622
+#: src/generic/apt/aptcache.cc:625
#, c-format
msgid "failed to rename %s to %s"
msgstr "%s:n nimeäminen %s:ksi epäonnistui"
-#: src/generic/apt/aptcache.cc:630
+#: src/generic/apt/aptcache.cc:633
#, c-format
msgid "couldn't replace %s with %s"
msgstr "%s:n korvaus %s:lla epäonnistui"
-#: src/generic/apt/aptcache.cc:1122
+#: src/generic/apt/aptcache.cc:1125
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr "En pysty korjaamaan riippuvuuksia; joitain paketteja ei voi asentaa"
-#: src/generic/apt/aptcache.cc:1526
+#: src/generic/apt/aptcache.cc:1600
msgid "The list of sources could not be read."
msgstr "Pakettivarastojen luetteloa ei pystynyt lukemaan."
-#: src/generic/apt/aptcache.cc:1533
+#: src/generic/apt/aptcache.cc:1607
msgid "The package lists or status file could not be parsed or opened."
msgstr "Pakettiluettelon tai tilatiedoston avaaminen tai jäsennys epäonnistui."
-#: src/generic/apt/aptcache.cc:1536
+#: src/generic/apt/aptcache.cc:1610
msgid "You may want to update the package lists to correct these missing files"
msgstr ""
"Haluat ehkä päivittää pakettiluettelon korjataksesi nämä puuttuvat tiedostot"
@@ -3821,12 +3822,12 @@ msgstr ""
"%s on välttämätön paketti!%n%nOletko aivan varma, että haluat poistaa sen?%"
"nKirjoita '%s' jos olet."
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:284
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:291
#, c-format
msgid "Information about %s"
msgstr "%s:n tiedot"
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:282
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:289
#, c-format
msgid "%s info"
msgstr "%s: tiedot"
@@ -4171,7 +4172,7 @@ msgstr ""
"Nämä paketit riippuvat paketin %B%2$s%b versiosta %B%1$s%b ja hajoavat, jos %"
"s tehdään."
-#: src/solution_dialog.cc:91 src/solution_screen.cc:457
+#: src/solution_dialog.cc:91 src/solution_screen.cc:465
msgid "The package cache is not available."
msgstr "Pakettivarasto ei ole saatavilla."
@@ -4179,11 +4180,11 @@ msgstr "Pakettivarasto ei ole saatavilla."
msgid "No packages are broken."
msgstr "Mikään paketti ei ole rikki."
-#: src/solution_dialog.cc:108 src/solution_screen.cc:479
+#: src/solution_dialog.cc:108 src/solution_screen.cc:488
msgid "No resolution found."
msgstr "Ratkaisua ei löytynyt."
-#: src/solution_dialog.cc:114 src/solution_screen.cc:490
+#: src/solution_dialog.cc:114 src/solution_screen.cc:499
msgid "Resolving dependencies..."
msgstr "Selvitän riippuvuuksia..."
@@ -4218,7 +4219,7 @@ msgstr "%s esiriippuu %s:sta"
msgid "%s suggests %s"
msgstr "%s ehdottaa %s:a"
-#: src/solution_fragment.cc:113 src/solution_item.cc:583
+#: src/solution_fragment.cc:113 src/solution_item.cc:593
#, c-format
msgid "%s recommends %s"
msgstr "%s suosittelee %s:a"
@@ -4322,7 +4323,7 @@ msgstr "Päivitä %F [%s (%s) -> %s (%s)]"
msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgstr "Vanhenna %F [%s (%s) -> %s (%s)]"
-#: src/solution_item.cc:587
+#: src/solution_item.cc:597
#, c-format
msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
msgstr "-> Jätä riippuvuus \"%s suosittelee %s:a\" selvittämättä."
@@ -4355,7 +4356,7 @@ msgstr "Vanhenna paketit:"
msgid "Leave the following recommendations unresolved:"
msgstr "Jätä suosittelut huomioimatta:"
-#: src/solution_screen.cc:463
+#: src/solution_screen.cc:472
msgid "No broken packages."
msgstr "Ei rikkinäisiä paketteja."
diff --git a/po/fr.po b/po/fr.po
index 690b2226..2f312fbb 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude 0.3.4\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
-"POT-Creation-Date: 2005-11-07 15:22-0800\n"
+"POT-Creation-Date: 2005-11-13 10:12-0800\n"
"PO-Revision-Date: 2005-10-15 00:02+0200\n"
"Last-Translator: Jean-Luc Coulon <jean-luc.coulon@wanadoo.fr>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -197,7 +197,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] Rsolution des dpendances"
#: src/broken_indicator.cc:273 src/solution_dialog.cc:126
-#: src/solution_screen.cc:513
+#: src/solution_screen.cc:522
msgid "Internal error: unexpected null solution."
msgstr "Erreur interne: solution null inattendue."
@@ -815,42 +815,42 @@ msgstr ""
"de plusieurs noms de paquets (ou motif). L'action sera applique tous les "
"paquets que vous avez indiqus. Les actions possibles sont les suivantes:"
-#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:167
+#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:184
msgid "'+' to install packages"
msgstr "+ pour installer des paquets"
-#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:186
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
msgstr ""
"+M pour installer des paquets et les marquer aussitt comme ayant t "
"installs automatiquement."
-#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:171
+#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:188
msgid "'-' to remove packages"
msgstr "- pour supprimer des paquets"
-#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:173
+#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:190
msgid "'_' to purge packages"
msgstr "_ pour purger des paquets"
-#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:175
+#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:192
msgid "'=' to place packages on hold"
msgstr "= pour conserver des paquets"
-#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:177
+#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:194
msgid ""
"':' to keep packages in their current state without placing them on hold"
msgstr ""
": pour conserver les paquets dans leur tat actuel sans les mettre dans "
"l'tat conserv (hold)"
-#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:179
+#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:196
msgid "'&M' to mark packages as automatically installed"
msgstr ""
"&M pour marquer des paquets comme ayant t installs automatiquement"
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:181
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:198
msgid "'&m' to mark packages as manually installed"
msgstr "&m pour marquer des paquets comme ayant t manuellement installs"
@@ -935,7 +935,22 @@ msgstr ""
"Rponse incorrecte. Veuillez entrer une commande correcte ou ? pour "
"obtenir de l'aide.\n"
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_resolver.cc:124 src/cmdline/cmdline_resolver.cc:597
+#: src/generic/apt/apt.cc:199
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "Impossible d'ouvrir %s en criture"
+
+#: src/cmdline/cmdline_resolver.cc:130 src/cmdline/cmdline_resolver.cc:602
+#, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Erreur lors de l'criture de l'tat du rsolveur vers %s"
+
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:604
+msgid "Resolver state successfully written!"
+msgstr "L'tat du solveur a t enregistr avec succs."
+
+#: src/cmdline/cmdline_resolver.cc:145
#, c-format
msgid ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
@@ -944,35 +959,35 @@ msgstr ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkt ver ...: %F%na pkt ver ...: %F%"
"n<ACTION> pkt... : %F%n%F%F%F%F%F%F%F%F"
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:164
msgid "accept the proposed changes"
msgstr "accepter les modifications proposes"
-#: src/cmdline/cmdline_resolver.cc:149
+#: src/cmdline/cmdline_resolver.cc:166
msgid "reject the proposed changes and search for another solution"
msgstr "rejeter les modifications proposes et rechercher une autre solution"
-#: src/cmdline/cmdline_resolver.cc:151
+#: src/cmdline/cmdline_resolver.cc:168
msgid "give up and quit the program"
msgstr "abandonner et quitter le programme"
-#: src/cmdline/cmdline_resolver.cc:153
+#: src/cmdline/cmdline_resolver.cc:170
msgid "move to the next solution"
msgstr "aller la solution suivante"
-#: src/cmdline/cmdline_resolver.cc:155
+#: src/cmdline/cmdline_resolver.cc:172
msgid "move to the previous solution"
msgstr "aller la solution prcdente"
-#: src/cmdline/cmdline_resolver.cc:157
+#: src/cmdline/cmdline_resolver.cc:174
msgid "view an explanation of the changes in the solution"
msgstr "afficher une explication des modifications dans la solution"
-#: src/cmdline/cmdline_resolver.cc:159
+#: src/cmdline/cmdline_resolver.cc:176
msgid "examine the solution in the visual user interface"
msgstr "examiner la solution dans l'interface utilisateur visuelle"
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:178
msgid ""
"reject the given package versions; don't display any solutions in which they "
"occur."
@@ -980,7 +995,7 @@ msgstr ""
"rejeter les versions donnes du paquet; n'afficher aucune solution dans "
"laquelle elles apparaissent."
-#: src/cmdline/cmdline_resolver.cc:163
+#: src/cmdline/cmdline_resolver.cc:180
msgid ""
"accept the given package versions; display only solutions in which they "
"occur."
@@ -988,12 +1003,12 @@ msgstr ""
"accepter les versions donnes du paquet; n'afficher que les solutions dans "
"lesquelles elles apparaissent."
-#: src/cmdline/cmdline_resolver.cc:165
+#: src/cmdline/cmdline_resolver.cc:182
msgid "adjust the state of the listed packages, where ACTION is one of:"
msgstr ""
"ajuster l'tat des paquets affichs, o ACTION est l'une des suivantes:"
-#: src/cmdline/cmdline_resolver.cc:183
+#: src/cmdline/cmdline_resolver.cc:200
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
@@ -1001,140 +1016,126 @@ msgstr ""
"Les ajustements feront abandonner et recalculer la solution actuelle si "
"besoin."
-#: src/cmdline/cmdline_resolver.cc:197
+#: src/cmdline/cmdline_resolver.cc:214
#, c-format
msgid "The version %s is available in the following archives:"
msgstr "La version %s est disponible dans les archives suivantes:"
-#: src/cmdline/cmdline_resolver.cc:205
+#: src/cmdline/cmdline_resolver.cc:222
#, c-format
msgid "Select the version of %s that should be used: "
msgstr "Choisir la version de %s devant tre utilise: "
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:229
#, c-format
msgid "Invalid response. Please enter an integer between 1 and %d."
msgstr "Rponse incorrecte. Veuillez entrer un entier compris entre 1 et %d."
-#: src/cmdline/cmdline_resolver.cc:227
+#: src/cmdline/cmdline_resolver.cc:244
#, c-format
msgid "Expected at least one package/version pair following '%c'"
msgstr "Vous devez indiquer au moins une paire paquet/version aprs %c"
-#: src/cmdline/cmdline_resolver.cc:241
+#: src/cmdline/cmdline_resolver.cc:258
#, c-format
msgid "Expected a version after \"%s\""
msgstr "%s doit tre suivi d'un numro de version"
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:268
#, c-format
msgid "No such package \"%s\""
msgstr "Le paquet %s n'existe pas"
-#: src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_resolver.cc:284
#, c-format
msgid "%s has no version named \"%s\""
msgstr "il n'y a pas de version de %s appele %s"
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:301
#, c-format
msgid "Allowing the removal of %s"
msgstr "Autorisation de supprimer %s"
-#: src/cmdline/cmdline_resolver.cc:287
+#: src/cmdline/cmdline_resolver.cc:304
#, c-format
msgid "Allowing the installation of %s version %s (%s)"
msgstr "Autorisation d'installer %s, version %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:314
#, c-format
msgid "Rejecting the removal of %s"
msgstr "Rejet de la suppression de %s"
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:317
#, c-format
msgid "Rejecting the installation of %s version %s (%s)"
msgstr "Rejet de l'installation de %s, version %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:330
#, c-format
msgid "No longer requiring the removal of %s"
msgstr "La suppression de %s n'est plus demande"
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:333
#, c-format
msgid "No longer requiring the installation of %s version %s (%s)"
msgstr "L'installation de %s, version %s (%s), n'est plus demande"
-#: src/cmdline/cmdline_resolver.cc:325
+#: src/cmdline/cmdline_resolver.cc:342
#, c-format
msgid "Requiring the removal of %s"
msgstr "Demande de suppression de %s"
-#: src/cmdline/cmdline_resolver.cc:328
+#: src/cmdline/cmdline_resolver.cc:345
#, c-format
msgid "Requiring the installation of %s version %s (%s)"
msgstr "Demande d'installation de %s, version %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:447 src/solution_screen.cc:486
+#: src/cmdline/cmdline_resolver.cc:464 src/solution_screen.cc:495
#, c-format
msgid "open: %d; closed: %d; defer: %d; conflict: %d"
msgstr "ouverts: %d; ferms: %d; reports: %d; en conflit: %d"
-#: src/cmdline/cmdline_resolver.cc:493
+#: src/cmdline/cmdline_resolver.cc:510
msgid "The following actions will resolve these dependencies:"
msgstr "Les actions suivantes permettront de rsoudre ces dpendances:"
-#: src/cmdline/cmdline_resolver.cc:508
+#: src/cmdline/cmdline_resolver.cc:525
msgid "Accept this solution? [Y/n/q/?] "
msgstr "Accepter cette solution? [Y/n/q/?] "
-#: src/cmdline/cmdline_resolver.cc:535 src/cmdline/cmdline_resolver.cc:627
+#: src/cmdline/cmdline_resolver.cc:552 src/cmdline/cmdline_resolver.cc:644
msgid "Abandoning all efforts to resolve these dependencies."
msgstr ""
"Abandon de tous les efforts pour rechercher une solution ces dpendances."
-#: src/cmdline/cmdline_resolver.cc:562
+#: src/cmdline/cmdline_resolver.cc:579
msgid "The following commands are available:"
msgstr "Les commandes suivantes sont disponibles:"
-#: src/cmdline/cmdline_resolver.cc:577
+#: src/cmdline/cmdline_resolver.cc:594
msgid "File to write resolver state to: "
msgstr "Fichier dans lequel sera crit l'tat du solveur:"
-#: src/cmdline/cmdline_resolver.cc:580 src/generic/apt/apt.cc:199
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Impossible d'ouvrir %s en criture"
-
-#: src/cmdline/cmdline_resolver.cc:585
-#, c-format
-msgid "Error writing resolver state to %s"
-msgstr "Erreur lors de l'criture de l'tat du rsolveur vers %s"
-
-#: src/cmdline/cmdline_resolver.cc:587
-msgid "Resolver state successfully written!"
-msgstr "L'tat du solveur a t enregistr avec succs."
-
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:609
msgid "Invalid response; please enter one of the following commands:"
msgstr "Rponse incorrecte. Veuillez entrer une des commandes suivantes:"
-#: src/cmdline/cmdline_resolver.cc:602
+#: src/cmdline/cmdline_resolver.cc:619
msgid "No solution found within the allotted time. Try harder? [Y/n]"
msgstr ""
"Aucune solution n'a t trouve dans le temps allou. Faut-il poursuivre la "
"recherche? [Y/n]"
-#: src/cmdline/cmdline_resolver.cc:630
+#: src/cmdline/cmdline_resolver.cc:647
msgid "Invalid response; please enter 'y' or 'n'."
msgstr "Rponse incorrecte. Veuillez entrer y ou n."
-#: src/cmdline/cmdline_resolver.cc:639
+#: src/cmdline/cmdline_resolver.cc:656
msgid "Unable to resolve dependencies! Giving up..."
msgstr "Impossible de trouver une solution ces dpendances! Abandon..."
-#: src/cmdline/cmdline_resolver.cc:645
+#: src/cmdline/cmdline_resolver.cc:662
msgid "*** No more solutions available ***"
msgstr "*** Aucune autre solution disponible ***"
@@ -1556,67 +1557,67 @@ msgstr "Impossible d'ouvrir le fichier d'tat tendu d'Aptitude"
msgid "Reading extended state information"
msgstr "Lecture de l'information d'tat tendu"
-#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:403
-#: src/generic/apt/aptcache.cc:406
+#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:405
+#: src/generic/apt/aptcache.cc:408
msgid "Initializing package states"
msgstr "Initialisation de l'tat des paquets"
-#: src/generic/apt/aptcache.cc:530
+#: src/generic/apt/aptcache.cc:533
msgid "Cannot open Aptitude state file"
msgstr "Impossible d'ouvrir le fichier d'tat d'Aptitude"
-#: src/generic/apt/aptcache.cc:534 src/generic/apt/aptcache.cc:589
-#: src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:537 src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:595
msgid "Writing extended state information"
msgstr "criture de l'information d'tat tendu"
-#: src/generic/apt/aptcache.cc:571
+#: src/generic/apt/aptcache.cc:574
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr ""
"Dpassement de tampon interne sur le paquet %s lors de l'criture du "
"fichier d'tat"
-#: src/generic/apt/aptcache.cc:580
+#: src/generic/apt/aptcache.cc:583
msgid "Couldn't write state file"
msgstr "Impossible d'crire le fichier d'tat"
-#: src/generic/apt/aptcache.cc:597
+#: src/generic/apt/aptcache.cc:600
msgid "Error writing state file"
msgstr "Erreur lors de l'criture du fichier d'tat"
-#: src/generic/apt/aptcache.cc:615
+#: src/generic/apt/aptcache.cc:618
#, c-format
msgid "failed to remove %s"
msgstr "Impossible de supprimer %s"
-#: src/generic/apt/aptcache.cc:622
+#: src/generic/apt/aptcache.cc:625
#, c-format
msgid "failed to rename %s to %s"
msgstr "impossible de renommer %s en %s"
-#: src/generic/apt/aptcache.cc:630
+#: src/generic/apt/aptcache.cc:633
#, c-format
msgid "couldn't replace %s with %s"
msgstr "Impossible de remplacer %s par %s"
-#: src/generic/apt/aptcache.cc:1122
+#: src/generic/apt/aptcache.cc:1125
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr ""
"Impossible de corriger les dpendances, certains paquets ne peuvent pas tre "
"installs"
-#: src/generic/apt/aptcache.cc:1526
+#: src/generic/apt/aptcache.cc:1600
msgid "The list of sources could not be read."
msgstr "La liste des sources ne peut pas tre lue."
-#: src/generic/apt/aptcache.cc:1533
+#: src/generic/apt/aptcache.cc:1607
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
"Les listes de paquets ou le fichier d'tat ne peuvent pas tre ouverts, ou "
"sont incomprhensibles."
-#: src/generic/apt/aptcache.cc:1536
+#: src/generic/apt/aptcache.cc:1610
msgid "You may want to update the package lists to correct these missing files"
msgstr ""
"Vous devriez mettre jour la liste des paquets pour corriger ces fichiers "
@@ -3979,12 +3980,12 @@ msgstr ""
"%s est un paquet essentiel!%n%ntes-vous sr de vouloir le supprimer?%nSi "
"oui, entrez %s."
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:284
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:291
#, c-format
msgid "Information about %s"
msgstr "Informations propos de %s"
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:282
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:289
#, c-format
msgid "%s info"
msgstr "%s: info"
@@ -4327,7 +4328,7 @@ msgstr ""
"Les paquets suivants dpendent de la version %B%s%b de %B%s%b et seront "
"casss s'il est %s."
-#: src/solution_dialog.cc:91 src/solution_screen.cc:457
+#: src/solution_dialog.cc:91 src/solution_screen.cc:465
msgid "The package cache is not available."
msgstr "Le cache des paquets n'est pas disponible."
@@ -4335,11 +4336,11 @@ msgstr "Le cache des paquets n'est pas disponible."
msgid "No packages are broken."
msgstr "Aucun paquet n'est cass."
-#: src/solution_dialog.cc:108 src/solution_screen.cc:479
+#: src/solution_dialog.cc:108 src/solution_screen.cc:488
msgid "No resolution found."
msgstr "Pas de solution."
-#: src/solution_dialog.cc:114 src/solution_screen.cc:490
+#: src/solution_dialog.cc:114 src/solution_screen.cc:499
msgid "Resolving dependencies..."
msgstr "Rsolution des dpendances..."
@@ -4374,7 +4375,7 @@ msgstr "%s pr-dpend de %s"
msgid "%s suggests %s"
msgstr "%s suggre %s"
-#: src/solution_fragment.cc:113 src/solution_item.cc:583
+#: src/solution_fragment.cc:113 src/solution_item.cc:593
#, c-format
msgid "%s recommends %s"
msgstr "%s recommande %s"
@@ -4478,7 +4479,7 @@ msgstr "Mettre jour %F [%s (%s) -> %s (%s)]"
msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgstr "Rinstaller %F une version antrieure [%s (%s) -> %s (%s)]"
-#: src/solution_item.cc:587
+#: src/solution_item.cc:597
#, c-format
msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
msgstr "-> Conserver la dpendance %s recommande %s non rsolue."
@@ -4511,7 +4512,7 @@ msgstr "Rinstaller une version antrieure les paquets suivants:"
msgid "Leave the following recommendations unresolved:"
msgstr "Les recommandations suivantes n'ont pas t satisfaites:"
-#: src/solution_screen.cc:463
+#: src/solution_screen.cc:472
msgid "No broken packages."
msgstr "Aucun paquet cass."
diff --git a/po/gl.po b/po/gl.po
index be631bf5..3b14c050 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
-"POT-Creation-Date: 2005-11-07 15:22-0800\n"
+"POT-Creation-Date: 2005-11-13 10:12-0800\n"
"PO-Revision-Date: 2005-11-05 16:48+0100\n"
"Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n"
"Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -200,7 +200,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] A resolver as dependencias"
#: src/broken_indicator.cc:273 src/solution_dialog.cc:126
-#: src/solution_screen.cc:513
+#: src/solution_screen.cc:522
msgid "Internal error: unexpected null solution."
msgstr "Erro interno: non se esperaba unha solución nula."
@@ -802,38 +802,38 @@ msgstr ""
"patróns). A acción hase aplicar a tódolos paquetes que liste. As seguintes "
"accións están dispoñibles:"
-#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:167
+#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:184
msgid "'+' to install packages"
msgstr "\"+\" para instalar paquetes"
-#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:186
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
msgstr ""
"\"+M\" para instalar paquetes e marcalos coma instalados automaticamente"
-#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:171
+#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:188
msgid "'-' to remove packages"
msgstr "\"-\" para eliminar paquetes"
-#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:173
+#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:190
msgid "'_' to purge packages"
msgstr "\"_\" para purgar paquetes"
-#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:175
+#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:192
msgid "'=' to place packages on hold"
msgstr "\"=\" para reter paquetes"
-#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:177
+#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:194
msgid ""
"':' to keep packages in their current state without placing them on hold"
msgstr "\":\" para conservar os paquetes no seu estado actual sen os reter"
-#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:179
+#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:196
msgid "'&M' to mark packages as automatically installed"
msgstr "\"&M\" para marcar paquetes coma instalados automaticamente"
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:181
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:198
msgid "'&m' to mark packages as manually installed"
msgstr "\"&m\" para marcar paquetes coma instalados manualmente"
@@ -917,7 +917,22 @@ msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr ""
"Resposta non válida. Introduza unha orde válida ou \"?\" para obter axuda.\n"
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_resolver.cc:124 src/cmdline/cmdline_resolver.cc:597
+#: src/generic/apt/apt.cc:199
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "Non se puido abrir %s para escritura"
+
+#: src/cmdline/cmdline_resolver.cc:130 src/cmdline/cmdline_resolver.cc:602
+#, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Erro ao gravar o estado do resolvedor en %s"
+
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:604
+msgid "Resolver state successfully written!"
+msgstr "Gravouse con éxito o estado do resolvedor"
+
+#: src/cmdline/cmdline_resolver.cc:145
#, c-format
msgid ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
@@ -926,35 +941,35 @@ msgstr ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr ver paq ...: %F%na ver paq ...: %F%"
"n<ACCIÓN> paq... : %F%n%F%F%F%F%F%F%F%F"
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:164
msgid "accept the proposed changes"
msgstr "aceptar os cambios propostos"
-#: src/cmdline/cmdline_resolver.cc:149
+#: src/cmdline/cmdline_resolver.cc:166
msgid "reject the proposed changes and search for another solution"
msgstr "rexeitar os cambios propostos e buscar outra solución"
-#: src/cmdline/cmdline_resolver.cc:151
+#: src/cmdline/cmdline_resolver.cc:168
msgid "give up and quit the program"
msgstr "renderse e saír do programa"
-#: src/cmdline/cmdline_resolver.cc:153
+#: src/cmdline/cmdline_resolver.cc:170
msgid "move to the next solution"
msgstr "moverse á seguinte solución"
-#: src/cmdline/cmdline_resolver.cc:155
+#: src/cmdline/cmdline_resolver.cc:172
msgid "move to the previous solution"
msgstr "moverse á solución anterior"
-#: src/cmdline/cmdline_resolver.cc:157
+#: src/cmdline/cmdline_resolver.cc:174
msgid "view an explanation of the changes in the solution"
msgstr "ver unha explicación dos cambios na solución"
-#: src/cmdline/cmdline_resolver.cc:159
+#: src/cmdline/cmdline_resolver.cc:176
msgid "examine the solution in the visual user interface"
msgstr "examinar a solución na interface de usuario"
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:178
msgid ""
"reject the given package versions; don't display any solutions in which they "
"occur."
@@ -962,7 +977,7 @@ msgstr ""
"rexeitar as versións de paquetes dadas; non amosar ningunha solución na que "
"aparezan."
-#: src/cmdline/cmdline_resolver.cc:163
+#: src/cmdline/cmdline_resolver.cc:180
msgid ""
"accept the given package versions; display only solutions in which they "
"occur."
@@ -970,11 +985,11 @@ msgstr ""
"aceptar as versións de paquetes dadas; amosar só as solucións nas que "
"aparezan."
-#: src/cmdline/cmdline_resolver.cc:165
+#: src/cmdline/cmdline_resolver.cc:182
msgid "adjust the state of the listed packages, where ACTION is one of:"
msgstr "axustar o estado dos paquetes listados, onde ACCIÓN é un de:"
-#: src/cmdline/cmdline_resolver.cc:183
+#: src/cmdline/cmdline_resolver.cc:200
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
@@ -982,137 +997,123 @@ msgstr ""
"Os axustes han facer que a solución actual sexa descartada e recalculada "
"como sexa necesario."
-#: src/cmdline/cmdline_resolver.cc:197
+#: src/cmdline/cmdline_resolver.cc:214
#, c-format
msgid "The version %s is available in the following archives:"
msgstr "A versión %s está dispoñible nos seguintes arquivos:"
-#: src/cmdline/cmdline_resolver.cc:205
+#: src/cmdline/cmdline_resolver.cc:222
#, c-format
msgid "Select the version of %s that should be used: "
msgstr "Seleccionar a versión de %s que se debería empregar: "
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:229
#, c-format
msgid "Invalid response. Please enter an integer between 1 and %d."
msgstr "Resposta non válida. Introduza un enteiro entre 1 e %d."
-#: src/cmdline/cmdline_resolver.cc:227
+#: src/cmdline/cmdline_resolver.cc:244
#, c-format
msgid "Expected at least one package/version pair following '%c'"
msgstr "Esperábase alomenos un par paquete/versión despois de \"%c\""
-#: src/cmdline/cmdline_resolver.cc:241
+#: src/cmdline/cmdline_resolver.cc:258
#, c-format
msgid "Expected a version after \"%s\""
msgstr "Esperábase unha versión despois de \"%s\""
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:268
#, c-format
msgid "No such package \"%s\""
msgstr "Non hai tal paquete \"%s\""
-#: src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_resolver.cc:284
#, c-format
msgid "%s has no version named \"%s\""
msgstr "%s non ten unha versión \"%s\""
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:301
#, c-format
msgid "Allowing the removal of %s"
msgstr "Permítese a eliminación de %s"
-#: src/cmdline/cmdline_resolver.cc:287
+#: src/cmdline/cmdline_resolver.cc:304
#, c-format
msgid "Allowing the installation of %s version %s (%s)"
msgstr "Permítese a instalación de %s versión %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:314
#, c-format
msgid "Rejecting the removal of %s"
msgstr "Rexéitase a eliminación de %s"
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:317
#, c-format
msgid "Rejecting the installation of %s version %s (%s)"
msgstr "Rexéitase a instalación de %s versión %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:330
#, c-format
msgid "No longer requiring the removal of %s"
msgstr "Xa non se require a eliminación de %s"
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:333
#, c-format
msgid "No longer requiring the installation of %s version %s (%s)"
msgstr "Xa non se require a instalación de %s versión %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:325
+#: src/cmdline/cmdline_resolver.cc:342
#, c-format
msgid "Requiring the removal of %s"
msgstr "Requírese a eliminación de %s"
-#: src/cmdline/cmdline_resolver.cc:328
+#: src/cmdline/cmdline_resolver.cc:345
#, c-format
msgid "Requiring the installation of %s version %s (%s)"
msgstr "Requírese a instalación de %s versión %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:447 src/solution_screen.cc:486
+#: src/cmdline/cmdline_resolver.cc:464 src/solution_screen.cc:495
#, c-format
msgid "open: %d; closed: %d; defer: %d; conflict: %d"
msgstr "abertos: %d; pechados: %d; retrasar: %d; conflictos: %d"
-#: src/cmdline/cmdline_resolver.cc:493
+#: src/cmdline/cmdline_resolver.cc:510
msgid "The following actions will resolve these dependencies:"
msgstr "As seguintes accións han resolver estas dependencias:"
-#: src/cmdline/cmdline_resolver.cc:508
+#: src/cmdline/cmdline_resolver.cc:525
msgid "Accept this solution? [Y/n/q/?] "
msgstr "¿Aceptar esta solución? [S/n/q/?] "
-#: src/cmdline/cmdline_resolver.cc:535 src/cmdline/cmdline_resolver.cc:627
+#: src/cmdline/cmdline_resolver.cc:552 src/cmdline/cmdline_resolver.cc:644
msgid "Abandoning all efforts to resolve these dependencies."
msgstr "Abandónanse tódolos esforzos por resolver estas dependencias."
-#: src/cmdline/cmdline_resolver.cc:562
+#: src/cmdline/cmdline_resolver.cc:579
msgid "The following commands are available:"
msgstr "As seguintes ordes están dispoñibles:"
-#: src/cmdline/cmdline_resolver.cc:577
+#: src/cmdline/cmdline_resolver.cc:594
msgid "File to write resolver state to: "
msgstr "Ficheiro no que gravar o estado do resolvedor: "
-#: src/cmdline/cmdline_resolver.cc:580 src/generic/apt/apt.cc:199
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Non se puido abrir %s para escritura"
-
-#: src/cmdline/cmdline_resolver.cc:585
-#, c-format
-msgid "Error writing resolver state to %s"
-msgstr "Erro ao gravar o estado do resolvedor en %s"
-
-#: src/cmdline/cmdline_resolver.cc:587
-msgid "Resolver state successfully written!"
-msgstr "Gravouse con éxito o estado do resolvedor"
-
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:609
msgid "Invalid response; please enter one of the following commands:"
msgstr "Resposta non válida; introdza unha das seguintes ordes:"
-#: src/cmdline/cmdline_resolver.cc:602
+#: src/cmdline/cmdline_resolver.cc:619
msgid "No solution found within the allotted time. Try harder? [Y/n]"
msgstr "Non se atopou unha solución no tempo asignado. ¿Seguir probando? [S/n]"
-#: src/cmdline/cmdline_resolver.cc:630
+#: src/cmdline/cmdline_resolver.cc:647
msgid "Invalid response; please enter 'y' or 'n'."
msgstr "Resposta non válida; introduza \"s\" ou \"n\"."
-#: src/cmdline/cmdline_resolver.cc:639
+#: src/cmdline/cmdline_resolver.cc:656
msgid "Unable to resolve dependencies! Giving up..."
msgstr "¡Non se puideron resolver as dependencias! A desistir..."
-#: src/cmdline/cmdline_resolver.cc:645
+#: src/cmdline/cmdline_resolver.cc:662
msgid "*** No more solutions available ***"
msgstr "*** Non hai máis solucións ***"
@@ -1529,65 +1530,65 @@ msgstr "Non se pode abrir o ficheiro de estado estendido de Aptitude"
msgid "Reading extended state information"
msgstr "A ler a información de estado estendido"
-#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:403
-#: src/generic/apt/aptcache.cc:406
+#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:405
+#: src/generic/apt/aptcache.cc:408
msgid "Initializing package states"
msgstr "A inicializar os estados dos paquetes"
-#: src/generic/apt/aptcache.cc:530
+#: src/generic/apt/aptcache.cc:533
msgid "Cannot open Aptitude state file"
msgstr "Non se pode abrir o ficheiro de estado de Aptitude"
-#: src/generic/apt/aptcache.cc:534 src/generic/apt/aptcache.cc:589
-#: src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:537 src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:595
msgid "Writing extended state information"
msgstr "A gravar a información de estado estendido"
-#: src/generic/apt/aptcache.cc:571
+#: src/generic/apt/aptcache.cc:574
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr ""
"Desbordamento do buffer interno no paquete \"%s\" ao gravar o ficheiro de "
"estado"
-#: src/generic/apt/aptcache.cc:580
+#: src/generic/apt/aptcache.cc:583
msgid "Couldn't write state file"
msgstr "Non se puido gravar o ficheiro de estado"
-#: src/generic/apt/aptcache.cc:597
+#: src/generic/apt/aptcache.cc:600
msgid "Error writing state file"
msgstr "Erro ao gravar o ficheiro de estado"
-#: src/generic/apt/aptcache.cc:615
+#: src/generic/apt/aptcache.cc:618
#, c-format
msgid "failed to remove %s"
msgstr "non se puido eliminar %s"
-#: src/generic/apt/aptcache.cc:622
+#: src/generic/apt/aptcache.cc:625
#, c-format
msgid "failed to rename %s to %s"
msgstr "non se puido cambiar o nome de %s a %s"
-#: src/generic/apt/aptcache.cc:630
+#: src/generic/apt/aptcache.cc:633
#, c-format
msgid "couldn't replace %s with %s"
msgstr "non se puido substituír %s por %s"
-#: src/generic/apt/aptcache.cc:1122
+#: src/generic/apt/aptcache.cc:1125
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr ""
"Non se puido corrixir as dependencias, non se poden instalar algúns paquetes"
-#: src/generic/apt/aptcache.cc:1526
+#: src/generic/apt/aptcache.cc:1600
msgid "The list of sources could not be read."
msgstr "Non se puido ler a lista de orixes."
-#: src/generic/apt/aptcache.cc:1533
+#: src/generic/apt/aptcache.cc:1607
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
"Non se puido analizar ou abrir as listas de ficheiros ou ficheiro de estado."
-#: src/generic/apt/aptcache.cc:1536
+#: src/generic/apt/aptcache.cc:1610
msgid "You may want to update the package lists to correct these missing files"
msgstr ""
"Pode querer actualizar as listas de paquetes para corrixir estes ficheiros"
@@ -3885,12 +3886,12 @@ msgstr ""
"¡%s é un paquete esencial!%n%n¿Está seguro de querer eliminalo?%nEscriba \"%s"
"\" se o está."
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:284
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:291
#, c-format
msgid "Information about %s"
msgstr "Información sobre %s"
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:282
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:289
#, c-format
msgid "%s info"
msgstr "Información de %s"
@@ -4228,7 +4229,7 @@ msgstr ""
"Os seguintes paquetes dependen da versión %B%s%b de %B%s%b, e han romper de "
"se %s."
-#: src/solution_dialog.cc:91 src/solution_screen.cc:457
+#: src/solution_dialog.cc:91 src/solution_screen.cc:465
msgid "The package cache is not available."
msgstr "A caché de paquetes non está dispoñible."
@@ -4236,11 +4237,11 @@ msgstr "A caché de paquetes non está dispoñible."
msgid "No packages are broken."
msgstr "Non hai paquetes rotos."
-#: src/solution_dialog.cc:108 src/solution_screen.cc:479
+#: src/solution_dialog.cc:108 src/solution_screen.cc:488
msgid "No resolution found."
msgstr "Non se atopou unha solución."
-#: src/solution_dialog.cc:114 src/solution_screen.cc:490
+#: src/solution_dialog.cc:114 src/solution_screen.cc:499
msgid "Resolving dependencies..."
msgstr "A resolver as dependencias..."
@@ -4275,7 +4276,7 @@ msgstr "%s pre-depende de %s"
msgid "%s suggests %s"
msgstr "%s suxire %s"
-#: src/solution_fragment.cc:113 src/solution_item.cc:583
+#: src/solution_fragment.cc:113 src/solution_item.cc:593
#, c-format
msgid "%s recommends %s"
msgstr "%s recomenda %s"
@@ -4379,7 +4380,7 @@ msgstr "Actualizar %F [%s (%s) -> %s (%s)]"
msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgstr "Desactualizar %F [%s (%s) -> %s (%s)]"
-#: src/solution_item.cc:587
+#: src/solution_item.cc:597
#, c-format
msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
msgstr "-> Deixar sen resolver a dependencia \"%s recomenda %s\"."
@@ -4412,7 +4413,7 @@ msgstr "Desactualizar os seguintes paquetes:"
msgid "Leave the following recommendations unresolved:"
msgstr "Deixar sen resolver as seguintes recomendacións:"
-#: src/solution_screen.cc:463
+#: src/solution_screen.cc:472
msgid "No broken packages."
msgstr "Non hai paquetes rotos."
diff --git a/po/it.po b/po/it.po
index 1e556560..ae20152e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -43,7 +43,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude 0.2.15.9\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
-"POT-Creation-Date: 2005-11-07 15:22-0800\n"
+"POT-Creation-Date: 2005-11-13 10:12-0800\n"
"PO-Revision-Date: 2005-04-12 22:24+0200\n"
"Last-Translator: Danilo Piazzalunga <danilopiazza@libero.it>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -235,7 +235,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
msgstr "Impossibile aprire %s in scrittura"
#: src/broken_indicator.cc:273 src/solution_dialog.cc:126
-#: src/solution_screen.cc:513
+#: src/solution_screen.cc:522
msgid "Internal error: unexpected null solution."
msgstr ""
@@ -835,43 +835,43 @@ msgid ""
"The following actions are available:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:167
+#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:184
#, fuzzy
msgid "'+' to install packages"
msgstr "^Installa/rimuovi pacchetti"
-#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:186
#, fuzzy
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
msgstr "I seguenti pacchetti NUOVI (NEW) saranno automaticamente installati:"
-#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:171
+#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:188
#, fuzzy
msgid "'-' to remove packages"
msgstr "^Installa/rimuovi pacchetti"
-#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:173
+#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:190
#, fuzzy
msgid "'_' to purge packages"
msgstr "^Dimentica i nuovi pacchetti"
-#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:175
+#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:192
#, fuzzy
msgid "'=' to place packages on hold"
msgstr " hold - Imposta i pacchetti come bloccati\n"
-#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:177
+#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:194
msgid ""
"':' to keep packages in their current state without placing them on hold"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:179
+#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:196
#, fuzzy
msgid "'&M' to mark packages as automatically installed"
msgstr " markauto - Segna i pacchetti come installati automaticamente\n"
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:181
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:198
#, fuzzy
msgid "'&m' to mark packages as manually installed"
msgstr " unmarkauto - Segna i pacchetti come installati manualmente\n"
@@ -956,200 +956,201 @@ msgstr ""
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr "Risposta non ammessa. Immettere un comando valido o «?» per l'aiuto.\n"
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_resolver.cc:124 src/cmdline/cmdline_resolver.cc:597
+#: src/generic/apt/apt.cc:199
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "Impossibile aprire %s in scrittura"
+
+#: src/cmdline/cmdline_resolver.cc:130 src/cmdline/cmdline_resolver.cc:602
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Errore nella scrittura del file di stato"
+
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:604
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:145
#, c-format
msgid ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
"n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:164
msgid "accept the proposed changes"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:149
+#: src/cmdline/cmdline_resolver.cc:166
msgid "reject the proposed changes and search for another solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:151
+#: src/cmdline/cmdline_resolver.cc:168
#, fuzzy
msgid "give up and quit the program"
msgstr "Esce dal programma"
-#: src/cmdline/cmdline_resolver.cc:153
+#: src/cmdline/cmdline_resolver.cc:170
msgid "move to the next solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:155
+#: src/cmdline/cmdline_resolver.cc:172
msgid "move to the previous solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:157
+#: src/cmdline/cmdline_resolver.cc:174
msgid "view an explanation of the changes in the solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:159
+#: src/cmdline/cmdline_resolver.cc:176
#, fuzzy
msgid "examine the solution in the visual user interface"
msgstr "Cambia le impostazioni che riguardano l'interfaccia utente"
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:178
msgid ""
"reject the given package versions; don't display any solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:163
+#: src/cmdline/cmdline_resolver.cc:180
msgid ""
"accept the given package versions; display only solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:165
+#: src/cmdline/cmdline_resolver.cc:182
msgid "adjust the state of the listed packages, where ACTION is one of:"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:183
+#: src/cmdline/cmdline_resolver.cc:200
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:197
+#: src/cmdline/cmdline_resolver.cc:214
#, c-format
msgid "The version %s is available in the following archives:"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:205
+#: src/cmdline/cmdline_resolver.cc:222
#, c-format
msgid "Select the version of %s that should be used: "
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:229
#, fuzzy, c-format
msgid "Invalid response. Please enter an integer between 1 and %d."
msgstr "Risposta non ammessa. Immettere un comando valido o «?» per l'aiuto.\n"
-#: src/cmdline/cmdline_resolver.cc:227
+#: src/cmdline/cmdline_resolver.cc:244
#, c-format
msgid "Expected at least one package/version pair following '%c'"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:241
+#: src/cmdline/cmdline_resolver.cc:258
#, fuzzy, c-format
msgid "Expected a version after \"%s\""
msgstr "Impossibile aprire %s in scrittura"
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:268
#, fuzzy, c-format
msgid "No such package \"%s\""
msgstr "Pacchetto sorgente: "
-#: src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_resolver.cc:284
#, c-format
msgid "%s has no version named \"%s\""
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:301
#, c-format
msgid "Allowing the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:287
+#: src/cmdline/cmdline_resolver.cc:304
#, c-format
msgid "Allowing the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:314
#, c-format
msgid "Rejecting the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:317
#, c-format
msgid "Rejecting the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:330
#, c-format
msgid "No longer requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:333
#, c-format
msgid "No longer requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:325
+#: src/cmdline/cmdline_resolver.cc:342
#, c-format
msgid "Requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:328
+#: src/cmdline/cmdline_resolver.cc:345
#, c-format
msgid "Requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:447 src/solution_screen.cc:486
+#: src/cmdline/cmdline_resolver.cc:464 src/solution_screen.cc:495
#, c-format
msgid "open: %d; closed: %d; defer: %d; conflict: %d"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:493
+#: src/cmdline/cmdline_resolver.cc:510
#, fuzzy
msgid "The following actions will resolve these dependencies:"
msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:\n"
-#: src/cmdline/cmdline_resolver.cc:508
+#: src/cmdline/cmdline_resolver.cc:525
msgid "Accept this solution? [Y/n/q/?] "
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:535 src/cmdline/cmdline_resolver.cc:627
+#: src/cmdline/cmdline_resolver.cc:552 src/cmdline/cmdline_resolver.cc:644
msgid "Abandoning all efforts to resolve these dependencies."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:562
+#: src/cmdline/cmdline_resolver.cc:579
#, fuzzy
msgid "The following commands are available:"
msgstr "I seguenti pacchetti sono DIFETTOSI:"
-#: src/cmdline/cmdline_resolver.cc:577
+#: src/cmdline/cmdline_resolver.cc:594
msgid "File to write resolver state to: "
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:580 src/generic/apt/apt.cc:199
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Impossibile aprire %s in scrittura"
-
-#: src/cmdline/cmdline_resolver.cc:585
-#, fuzzy, c-format
-msgid "Error writing resolver state to %s"
-msgstr "Errore nella scrittura del file di stato"
-
-#: src/cmdline/cmdline_resolver.cc:587
-msgid "Resolver state successfully written!"
-msgstr ""
-
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:609
#, fuzzy
msgid "Invalid response; please enter one of the following commands:"
msgstr "Risposta non ammessa. Immettere un comando valido o «?» per l'aiuto.\n"
-#: src/cmdline/cmdline_resolver.cc:602
+#: src/cmdline/cmdline_resolver.cc:619
msgid "No solution found within the allotted time. Try harder? [Y/n]"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:630
+#: src/cmdline/cmdline_resolver.cc:647
#, fuzzy
msgid "Invalid response; please enter 'y' or 'n'."
msgstr "Risposta non ammessa. Immettere un comando valido o «?» per l'aiuto.\n"
-#: src/cmdline/cmdline_resolver.cc:639
+#: src/cmdline/cmdline_resolver.cc:656
msgid "Unable to resolve dependencies! Giving up..."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:645
+#: src/cmdline/cmdline_resolver.cc:662
msgid "*** No more solutions available ***"
msgstr ""
@@ -1576,65 +1577,65 @@ msgstr "Impossibile aprire il file di stato esteso di Aptitude"
msgid "Reading extended state information"
msgstr "Lettura delle informazioni sullo stato esteso"
-#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:403
-#: src/generic/apt/aptcache.cc:406
+#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:405
+#: src/generic/apt/aptcache.cc:408
msgid "Initializing package states"
msgstr "Inizializzazione dello stato dei pacchetti"
-#: src/generic/apt/aptcache.cc:530
+#: src/generic/apt/aptcache.cc:533
msgid "Cannot open Aptitude state file"
msgstr "Impossibile aprire il file di stato di Aptitude"
-#: src/generic/apt/aptcache.cc:534 src/generic/apt/aptcache.cc:589
-#: src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:537 src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:595
msgid "Writing extended state information"
msgstr "Scrittura delle informazioni sullo stato esteso"
-#: src/generic/apt/aptcache.cc:571
+#: src/generic/apt/aptcache.cc:574
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr ""
"Overflow di un buffer interno nel pacchetto «%s» durante la scrittura del "
"file di stato"
-#: src/generic/apt/aptcache.cc:580
+#: src/generic/apt/aptcache.cc:583
msgid "Couldn't write state file"
msgstr "Impossibile scrivere il file di stato"
-#: src/generic/apt/aptcache.cc:597
+#: src/generic/apt/aptcache.cc:600
msgid "Error writing state file"
msgstr "Errore nella scrittura del file di stato"
-#: src/generic/apt/aptcache.cc:615
+#: src/generic/apt/aptcache.cc:618
#, fuzzy, c-format
msgid "failed to remove %s"
msgstr "Impossibile aprire %s in scrittura"
-#: src/generic/apt/aptcache.cc:622
+#: src/generic/apt/aptcache.cc:625
#, c-format
msgid "failed to rename %s to %s"
msgstr ""
-#: src/generic/apt/aptcache.cc:630
+#: src/generic/apt/aptcache.cc:633
#, fuzzy, c-format
msgid "couldn't replace %s with %s"
msgstr "Impossibile sostituire il vecchio file di stato"
-#: src/generic/apt/aptcache.cc:1122
+#: src/generic/apt/aptcache.cc:1125
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr ""
"Impossibile correggere le dipendenze; alcuni pacchetti non saranno installati"
-#: src/generic/apt/aptcache.cc:1526
+#: src/generic/apt/aptcache.cc:1600
msgid "The list of sources could not be read."
msgstr "Impossibile leggere l'elenco delle sorgenti."
-#: src/generic/apt/aptcache.cc:1533
+#: src/generic/apt/aptcache.cc:1607
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
"Impossibile analizzare o aprire l'elenco dei pacchetti o il file di stato."
-#: src/generic/apt/aptcache.cc:1536
+#: src/generic/apt/aptcache.cc:1610
msgid "You may want to update the package lists to correct these missing files"
msgstr "Aggiornare l'elenco dei pacchetti per correggere questi file mancanti."
@@ -3969,12 +3970,12 @@ msgstr ""
"Se si è certi di volerlo rimuovere, inserire\n"
"«%s»."
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:284
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:291
#, c-format
msgid "Information about %s"
msgstr "Informazioni su %s"
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:282
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:289
#, c-format
msgid "%s info"
msgstr ""
@@ -4323,7 +4324,7 @@ msgstr ""
"I seguenti pacchetti dipendono dalla versione %B%s%b di %B%s%b e, se verrà %"
"s, saranno difettosi."
-#: src/solution_dialog.cc:91 src/solution_screen.cc:457
+#: src/solution_dialog.cc:91 src/solution_screen.cc:465
msgid "The package cache is not available."
msgstr ""
@@ -4332,11 +4333,11 @@ msgstr ""
msgid "No packages are broken."
msgstr "Alcuni pacchetti sono difettosi. Provare a correggerli?"
-#: src/solution_dialog.cc:108 src/solution_screen.cc:479
+#: src/solution_dialog.cc:108 src/solution_screen.cc:488
msgid "No resolution found."
msgstr ""
-#: src/solution_dialog.cc:114 src/solution_screen.cc:490
+#: src/solution_dialog.cc:114 src/solution_screen.cc:499
#, fuzzy
msgid "Resolving dependencies..."
msgstr "Impossibile aprire %s in scrittura"
@@ -4375,7 +4376,7 @@ msgstr "pre-dipende da"
msgid "%s suggests %s"
msgstr "consiglia"
-#: src/solution_fragment.cc:113 src/solution_item.cc:583
+#: src/solution_fragment.cc:113 src/solution_item.cc:593
#, fuzzy, c-format
msgid "%s recommends %s"
msgstr "raccomanda"
@@ -4484,7 +4485,7 @@ msgstr ""
msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgstr "Scaricato %sB in %s (%sB/s)."
-#: src/solution_item.cc:587
+#: src/solution_item.cc:597
#, fuzzy, c-format
msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
msgstr "I seguenti pacchetti sono DIFETTOSI:"
@@ -4524,7 +4525,7 @@ msgstr "Scaricamento dei pacchetti"
msgid "Leave the following recommendations unresolved:"
msgstr "I seguenti pacchetti sono DIFETTOSI:"
-#: src/solution_screen.cc:463
+#: src/solution_screen.cc:472
#, fuzzy
msgid "No broken packages."
msgstr "^Installa/rimuovi pacchetti"
diff --git a/po/ja.po b/po/ja.po
index b6326d0e..9930af9d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude 0.2.15.6-1\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
-"POT-Creation-Date: 2005-11-07 15:22-0800\n"
+"POT-Creation-Date: 2005-11-13 10:12-0800\n"
"PO-Revision-Date: 2004-09-20 11:01+0900\n"
"Last-Translator: YasuoEto <yasuo@etou.org>\n"
"Language-Team: \n"
@@ -197,7 +197,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
msgstr "%s を書き込み可能な状態で開けません"
#: src/broken_indicator.cc:273 src/solution_dialog.cc:126
-#: src/solution_screen.cc:513
+#: src/solution_screen.cc:522
msgid "Internal error: unexpected null solution."
msgstr ""
@@ -792,43 +792,43 @@ msgid ""
"The following actions are available:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:167
+#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:184
#, fuzzy
msgid "'+' to install packages"
msgstr "パッケージのインストールまたは削除"
-#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:186
#, fuzzy
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
msgstr "以下の新しいパッケージが自動的にインストールされます:"
-#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:171
+#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:188
#, fuzzy
msgid "'-' to remove packages"
msgstr "パッケージのインストールまたは削除"
-#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:173
+#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:190
#, fuzzy
msgid "'_' to purge packages"
msgstr "新規パッケージ一覧を消去"
-#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:175
+#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:192
#, fuzzy
msgid "'=' to place packages on hold"
msgstr " hold - パッケージのバージョンを保持する\n"
-#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:177
+#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:194
msgid ""
"':' to keep packages in their current state without placing them on hold"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:179
+#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:196
#, fuzzy
msgid "'&M' to mark packages as automatically installed"
msgstr " markauto - パッケージに自動でインストールの印を付ける\n"
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:181
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:198
#, fuzzy
msgid "'&m' to mark packages as manually installed"
msgstr " unmarkauto - パッケージに手動でインストールの印を付ける\n"
@@ -914,203 +914,204 @@ msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr ""
"不正な応答。正しいコマンドを入力するか '?' でヘルプを参照してください。\n"
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_resolver.cc:124 src/cmdline/cmdline_resolver.cc:597
+#: src/generic/apt/apt.cc:199
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "%s を書き込み可能な状態で開けません"
+
+#: src/cmdline/cmdline_resolver.cc:130 src/cmdline/cmdline_resolver.cc:602
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "ステータスファイルの書き込みの際にエラーが起きました"
+
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:604
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:145
#, c-format
msgid ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
"n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:164
msgid "accept the proposed changes"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:149
+#: src/cmdline/cmdline_resolver.cc:166
msgid "reject the proposed changes and search for another solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:151
+#: src/cmdline/cmdline_resolver.cc:168
#, fuzzy
msgid "give up and quit the program"
msgstr "プログラムの終了"
-#: src/cmdline/cmdline_resolver.cc:153
+#: src/cmdline/cmdline_resolver.cc:170
msgid "move to the next solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:155
+#: src/cmdline/cmdline_resolver.cc:172
msgid "move to the previous solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:157
+#: src/cmdline/cmdline_resolver.cc:174
msgid "view an explanation of the changes in the solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:159
+#: src/cmdline/cmdline_resolver.cc:176
#, fuzzy
msgid "examine the solution in the visual user interface"
msgstr "ユーザインターフェースに影響する設定を変更する。"
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:178
msgid ""
"reject the given package versions; don't display any solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:163
+#: src/cmdline/cmdline_resolver.cc:180
msgid ""
"accept the given package versions; display only solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:165
+#: src/cmdline/cmdline_resolver.cc:182
msgid "adjust the state of the listed packages, where ACTION is one of:"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:183
+#: src/cmdline/cmdline_resolver.cc:200
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:197
+#: src/cmdline/cmdline_resolver.cc:214
#, c-format
msgid "The version %s is available in the following archives:"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:205
+#: src/cmdline/cmdline_resolver.cc:222
#, c-format
msgid "Select the version of %s that should be used: "
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:229
#, fuzzy, c-format
msgid "Invalid response. Please enter an integer between 1 and %d."
msgstr ""
"不正な応答。正しいコマンドを入力するか '?' でヘルプを参照してください。\n"
-#: src/cmdline/cmdline_resolver.cc:227
+#: src/cmdline/cmdline_resolver.cc:244
#, c-format
msgid "Expected at least one package/version pair following '%c'"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:241
+#: src/cmdline/cmdline_resolver.cc:258
#, fuzzy, c-format
msgid "Expected a version after \"%s\""
msgstr "%s を書き込み可能な状態で開けません"
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:268
#, fuzzy, c-format
msgid "No such package \"%s\""
msgstr "ソースパッケージ: "
-#: src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_resolver.cc:284
#, c-format
msgid "%s has no version named \"%s\""
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:301
#, c-format
msgid "Allowing the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:287
+#: src/cmdline/cmdline_resolver.cc:304
#, c-format
msgid "Allowing the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:314
#, c-format
msgid "Rejecting the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:317
#, c-format
msgid "Rejecting the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:330
#, c-format
msgid "No longer requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:333
#, c-format
msgid "No longer requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:325
+#: src/cmdline/cmdline_resolver.cc:342
#, c-format
msgid "Requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:328
+#: src/cmdline/cmdline_resolver.cc:345
#, c-format
msgid "Requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:447 src/solution_screen.cc:486
+#: src/cmdline/cmdline_resolver.cc:464 src/solution_screen.cc:495
#, c-format
msgid "open: %d; closed: %d; defer: %d; conflict: %d"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:493
+#: src/cmdline/cmdline_resolver.cc:510
#, fuzzy
msgid "The following actions will resolve these dependencies:"
msgstr "以下のパッケージには解決できない依存関係があります:\n"
-#: src/cmdline/cmdline_resolver.cc:508
+#: src/cmdline/cmdline_resolver.cc:525
msgid "Accept this solution? [Y/n/q/?] "
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:535 src/cmdline/cmdline_resolver.cc:627
+#: src/cmdline/cmdline_resolver.cc:552 src/cmdline/cmdline_resolver.cc:644
msgid "Abandoning all efforts to resolve these dependencies."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:562
+#: src/cmdline/cmdline_resolver.cc:579
#, fuzzy
msgid "The following commands are available:"
msgstr "以下のパッケージが壊れています:"
-#: src/cmdline/cmdline_resolver.cc:577
+#: src/cmdline/cmdline_resolver.cc:594
msgid "File to write resolver state to: "
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:580 src/generic/apt/apt.cc:199
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "%s を書き込み可能な状態で開けません"
-
-#: src/cmdline/cmdline_resolver.cc:585
-#, fuzzy, c-format
-msgid "Error writing resolver state to %s"
-msgstr "ステータスファイルの書き込みの際にエラーが起きました"
-
-#: src/cmdline/cmdline_resolver.cc:587
-msgid "Resolver state successfully written!"
-msgstr ""
-
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:609
#, fuzzy
msgid "Invalid response; please enter one of the following commands:"
msgstr ""
"不正な応答。正しいコマンドを入力するか '?' でヘルプを参照してください。\n"
-#: src/cmdline/cmdline_resolver.cc:602
+#: src/cmdline/cmdline_resolver.cc:619
msgid "No solution found within the allotted time. Try harder? [Y/n]"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:630
+#: src/cmdline/cmdline_resolver.cc:647
#, fuzzy
msgid "Invalid response; please enter 'y' or 'n'."
msgstr ""
"不正な応答。正しいコマンドを入力するか '?' でヘルプを参照してください。\n"
-#: src/cmdline/cmdline_resolver.cc:639
+#: src/cmdline/cmdline_resolver.cc:656
msgid "Unable to resolve dependencies! Giving up..."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:645
+#: src/cmdline/cmdline_resolver.cc:662
msgid "*** No more solutions available ***"
msgstr ""
@@ -1527,65 +1528,65 @@ msgstr "Aptitudeの拡張ステータスファイルを開けません"
msgid "Reading extended state information"
msgstr "拡張ステータス情報を読み込んでいます"
-#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:403
-#: src/generic/apt/aptcache.cc:406
+#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:405
+#: src/generic/apt/aptcache.cc:408
msgid "Initializing package states"
msgstr "パッケージステータスの初期化"
-#: src/generic/apt/aptcache.cc:530
+#: src/generic/apt/aptcache.cc:533
msgid "Cannot open Aptitude state file"
msgstr "Aptitudeのステータスファイルを開けません"
-#: src/generic/apt/aptcache.cc:534 src/generic/apt/aptcache.cc:589
-#: src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:537 src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:595
msgid "Writing extended state information"
msgstr "拡張ステータス情報を書き込んでいます"
-#: src/generic/apt/aptcache.cc:571
+#: src/generic/apt/aptcache.cc:574
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr ""
" \"%s\" パッケージのステータスファイル書き込み時に内部バッファオーバーフロー"
"が発生しました"
-#: src/generic/apt/aptcache.cc:580
+#: src/generic/apt/aptcache.cc:583
msgid "Couldn't write state file"
msgstr "ステータスファイルに書き込めませんでした"
-#: src/generic/apt/aptcache.cc:597
+#: src/generic/apt/aptcache.cc:600
msgid "Error writing state file"
msgstr "ステータスファイルの書き込みの際にエラーが起きました"
-#: src/generic/apt/aptcache.cc:615
+#: src/generic/apt/aptcache.cc:618
#, fuzzy, c-format
msgid "failed to remove %s"
msgstr "%s を書き込み可能な状態で開けません"
-#: src/generic/apt/aptcache.cc:622
+#: src/generic/apt/aptcache.cc:625
#, c-format
msgid "failed to rename %s to %s"
msgstr ""
-#: src/generic/apt/aptcache.cc:630
+#: src/generic/apt/aptcache.cc:633
#, fuzzy, c-format
msgid "couldn't replace %s with %s"
msgstr "古いステータスファイルを置き替えることができませんでした"
-#: src/generic/apt/aptcache.cc:1122
+#: src/generic/apt/aptcache.cc:1125
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr "依存関係を解決できないため、パッケージをインストールできません"
-#: src/generic/apt/aptcache.cc:1526
+#: src/generic/apt/aptcache.cc:1600
msgid "The list of sources could not be read."
msgstr "ソースの一覧が読めません"
-#: src/generic/apt/aptcache.cc:1533
+#: src/generic/apt/aptcache.cc:1607
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
"パッケージの一覧またはステータスファイルを開くまたはパースすることができませ"
"んでした"
-#: src/generic/apt/aptcache.cc:1536
+#: src/generic/apt/aptcache.cc:1610
msgid "You may want to update the package lists to correct these missing files"
msgstr "見当たらないファイルを補うためにパッケージリストを更新してください"
@@ -3858,12 +3859,12 @@ msgstr ""
"本当に削除したいですか?\n"
"削除する場合ば'%s'と入力してください。"
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:284
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:291
#, c-format
msgid "Information about %s"
msgstr "%s の情報"
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:282
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:289
#, c-format
msgid "%s info"
msgstr ""
@@ -4210,7 +4211,7 @@ msgstr ""
"以下のパッケージは %B%2$s%b のバージョン %B%1$s%b に依存していますので、%s の"
"依存関係を解決できません。"
-#: src/solution_dialog.cc:91 src/solution_screen.cc:457
+#: src/solution_dialog.cc:91 src/solution_screen.cc:465
msgid "The package cache is not available."
msgstr ""
@@ -4219,11 +4220,11 @@ msgstr ""
msgid "No packages are broken."
msgstr "パッケージが壊れています。修復を試みますか?"
-#: src/solution_dialog.cc:108 src/solution_screen.cc:479
+#: src/solution_dialog.cc:108 src/solution_screen.cc:488
msgid "No resolution found."
msgstr ""
-#: src/solution_dialog.cc:114 src/solution_screen.cc:490
+#: src/solution_dialog.cc:114 src/solution_screen.cc:499
#, fuzzy
msgid "Resolving dependencies..."
msgstr "%s を書き込み可能な状態で開けません"
@@ -4262,7 +4263,7 @@ msgstr "に先行依存されている"
msgid "%s suggests %s"
msgstr "に提案されている"
-#: src/solution_fragment.cc:113 src/solution_item.cc:583
+#: src/solution_fragment.cc:113 src/solution_item.cc:593
#, fuzzy, c-format
msgid "%s recommends %s"
msgstr "に推奨されている"
@@ -4372,7 +4373,7 @@ msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgstr ""
"%sB を %s 秒で取得しました。(%sB/s)。続けるには何かキーを押してください。"
-#: src/solution_item.cc:587
+#: src/solution_item.cc:597
#, fuzzy, c-format
msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
msgstr "以下のパッケージが壊れています:"
@@ -4412,7 +4413,7 @@ msgstr "ダウンロード中 "
msgid "Leave the following recommendations unresolved:"
msgstr "以下のパッケージが壊れています:"
-#: src/solution_screen.cc:463
+#: src/solution_screen.cc:472
#, fuzzy
msgid "No broken packages."
msgstr "パッケージのインストールまたは削除"
diff --git a/po/lt.po b/po/lt.po
index 26dad8b5..824a1471 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: lt\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
-"POT-Creation-Date: 2005-11-07 15:22-0800\n"
+"POT-Creation-Date: 2005-11-13 10:12-0800\n"
"PO-Revision-Date: 2005-06-17 07:26+0300\n"
"Last-Translator: Darius Žitkevičius <skystis@splius.lt>\n"
"Language-Team: <komp_lt@konferencijos.lt>\n"
@@ -199,7 +199,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
msgstr "Nepavyksta sutvarkyti priklausomybių."
#: src/broken_indicator.cc:273 src/solution_dialog.cc:126
-#: src/solution_screen.cc:513
+#: src/solution_screen.cc:522
msgid "Internal error: unexpected null solution."
msgstr "Vidinė klaida: netikėtas tuščias sprendimas"
@@ -793,37 +793,37 @@ msgstr ""
"šablonus). Veiksmai bus pritaikyti visiems išvardintiems paketams. Galite "
"naudoti šiuos veiksmus:"
-#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:167
+#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:184
msgid "'+' to install packages"
msgstr "'+' įdiegti paketus"
-#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:186
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
msgstr "'+M' kad įdiegti ir tuoj pat pažymėti kaip automatiškai įdiegtus"
-#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:171
+#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:188
msgid "'-' to remove packages"
msgstr "'-' kad pašalinti paketus"
-#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:173
+#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:190
msgid "'_' to purge packages"
msgstr "'_' kad išvalyti (purge) paketus"
-#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:175
+#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:192
msgid "'=' to place packages on hold"
msgstr "'=' kad užlaykyti paketą"
-#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:177
+#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:194
msgid ""
"':' to keep packages in their current state without placing them on hold"
msgstr "':' kad palikti paketą dabartinėje būklėje neužlaikant"
-#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:179
+#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:196
msgid "'&M' to mark packages as automatically installed"
msgstr "'&M' kad pažymėti kaip automatiška įdiegtus"
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:181
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:198
msgid "'&m' to mark packages as manually installed"
msgstr "'&m' kad pažymėti kaip įdiegti rankiniu būdų"
@@ -906,195 +906,196 @@ msgstr ""
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr "Neteisinga komanda. Įveskite teisingą komandą, arba spauskite „?“.\n"
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_resolver.cc:124 src/cmdline/cmdline_resolver.cc:597
+#: src/generic/apt/apt.cc:199
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "Negaliu atidaryti %s rašymui"
+
+#: src/cmdline/cmdline_resolver.cc:130 src/cmdline/cmdline_resolver.cc:602
+#, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Klaida rašant būsenos bylą %s"
+
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:604
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:145
#, fuzzy, c-format
msgid ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
"n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
msgstr "y: %Fn: %Fq: %F,: %F.: %F<VEIKSMAS> paketas... : %F%n%F%F%F%F%F%F%F%F"
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:164
msgid "accept the proposed changes"
msgstr "priimti siūlomus pakeitimus"
-#: src/cmdline/cmdline_resolver.cc:149
+#: src/cmdline/cmdline_resolver.cc:166
msgid "reject the proposed changes and search for another solution"
msgstr "atmesti siūlomus pakeitimus ir rasti kitą sprendimą"
-#: src/cmdline/cmdline_resolver.cc:151
+#: src/cmdline/cmdline_resolver.cc:168
msgid "give up and quit the program"
msgstr "pasiduoti ir išeiti iš programos"
-#: src/cmdline/cmdline_resolver.cc:153
+#: src/cmdline/cmdline_resolver.cc:170
msgid "move to the next solution"
msgstr "pereiti į sekantį sprendimą"
-#: src/cmdline/cmdline_resolver.cc:155
+#: src/cmdline/cmdline_resolver.cc:172
msgid "move to the previous solution"
msgstr "pereiti į ankstesnį sprendimą"
-#: src/cmdline/cmdline_resolver.cc:157
+#: src/cmdline/cmdline_resolver.cc:174
msgid "view an explanation of the changes in the solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:159
+#: src/cmdline/cmdline_resolver.cc:176
#, fuzzy
msgid "examine the solution in the visual user interface"
msgstr "Pakeisti nustatymus, susijusius su naudotojo aplinka"
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:178
msgid ""
"reject the given package versions; don't display any solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:163
+#: src/cmdline/cmdline_resolver.cc:180
msgid ""
"accept the given package versions; display only solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:165
+#: src/cmdline/cmdline_resolver.cc:182
msgid "adjust the state of the listed packages, where ACTION is one of:"
msgstr "suderinti išvardintų paketų būseną, kur VEIKSMAS yra vienas iš:"
-#: src/cmdline/cmdline_resolver.cc:183
+#: src/cmdline/cmdline_resolver.cc:200
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
msgstr "Derinimas dabartinį sprendimą atmes ir jei būtina pakeis."
-#: src/cmdline/cmdline_resolver.cc:197
+#: src/cmdline/cmdline_resolver.cc:214
#, c-format
msgid "The version %s is available in the following archives:"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:205
+#: src/cmdline/cmdline_resolver.cc:222
#, fuzzy, c-format
msgid "Select the version of %s that should be used: "
msgstr "Byla į kurią įrašyti būseną:"
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:229
#, fuzzy, c-format
msgid "Invalid response. Please enter an integer between 1 and %d."
msgstr "Blogas atsakymas; įveskite „y“ arba „n“."
-#: src/cmdline/cmdline_resolver.cc:227
+#: src/cmdline/cmdline_resolver.cc:244
#, c-format
msgid "Expected at least one package/version pair following '%c'"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:241
+#: src/cmdline/cmdline_resolver.cc:258
#, fuzzy, c-format
msgid "Expected a version after \"%s\""
msgstr "Nepavyko atidaryti %s"
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:268
#, fuzzy, c-format
msgid "No such package \"%s\""
msgstr "Kilęs iš paketo: "
-#: src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_resolver.cc:284
#, c-format
msgid "%s has no version named \"%s\""
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:301
#, c-format
msgid "Allowing the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:287
+#: src/cmdline/cmdline_resolver.cc:304
#, c-format
msgid "Allowing the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:314
#, c-format
msgid "Rejecting the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:317
#, c-format
msgid "Rejecting the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:330
#, c-format
msgid "No longer requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:333
#, c-format
msgid "No longer requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:325
+#: src/cmdline/cmdline_resolver.cc:342
#, c-format
msgid "Requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:328
+#: src/cmdline/cmdline_resolver.cc:345
#, c-format
msgid "Requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:447 src/solution_screen.cc:486
+#: src/cmdline/cmdline_resolver.cc:464 src/solution_screen.cc:495
#, c-format
msgid "open: %d; closed: %d; defer: %d; conflict: %d"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:493
+#: src/cmdline/cmdline_resolver.cc:510
msgid "The following actions will resolve these dependencies:"
msgstr "Šie veiksmai išspręs priklausomybes:"
-#: src/cmdline/cmdline_resolver.cc:508
+#: src/cmdline/cmdline_resolver.cc:525
msgid "Accept this solution? [Y/n/q/?] "
msgstr "Priimti šį sprendimą? [Y/n/q/?] "
-#: src/cmdline/cmdline_resolver.cc:535 src/cmdline/cmdline_resolver.cc:627
+#: src/cmdline/cmdline_resolver.cc:552 src/cmdline/cmdline_resolver.cc:644
msgid "Abandoning all efforts to resolve these dependencies."
msgstr "Atmetami visi bandymai išspręsti priklausomybes."
-#: src/cmdline/cmdline_resolver.cc:562
+#: src/cmdline/cmdline_resolver.cc:579
msgid "The following commands are available:"
msgstr "Galimos šios komandos:"
-#: src/cmdline/cmdline_resolver.cc:577
+#: src/cmdline/cmdline_resolver.cc:594
msgid "File to write resolver state to: "
msgstr "Byla į kurią įrašyti būseną: "
-#: src/cmdline/cmdline_resolver.cc:580 src/generic/apt/apt.cc:199
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Negaliu atidaryti %s rašymui"
-
-#: src/cmdline/cmdline_resolver.cc:585
-#, c-format
-msgid "Error writing resolver state to %s"
-msgstr "Klaida rašant būsenos bylą %s"
-
-#: src/cmdline/cmdline_resolver.cc:587
-msgid "Resolver state successfully written!"
-msgstr ""
-
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:609
msgid "Invalid response; please enter one of the following commands:"
msgstr "Blogas atsakymas; įveskite vieną iš išvardintų komandų:"
-#: src/cmdline/cmdline_resolver.cc:602
+#: src/cmdline/cmdline_resolver.cc:619
msgid "No solution found within the allotted time. Try harder? [Y/n]"
msgstr "Per nurodytą laiką sprendimas nerastas. Pasistengti labiau? [Y/n]"
-#: src/cmdline/cmdline_resolver.cc:630
+#: src/cmdline/cmdline_resolver.cc:647
msgid "Invalid response; please enter 'y' or 'n'."
msgstr "Blogas atsakymas; įveskite „y“ arba „n“."
-#: src/cmdline/cmdline_resolver.cc:639
+#: src/cmdline/cmdline_resolver.cc:656
msgid "Unable to resolve dependencies! Giving up..."
msgstr "Nepavyksta išspręsti priklausomybių! Pasiduodu..."
-#: src/cmdline/cmdline_resolver.cc:645
+#: src/cmdline/cmdline_resolver.cc:662
#, fuzzy
msgid "*** No more solutions available ***"
msgstr "Sprendimų nebėra."
@@ -1517,63 +1518,63 @@ msgstr "Negaliu atidaryti Aptitude išplėstinės būsenos bylos"
msgid "Reading extended state information"
msgstr "Skaitoma išplėstinė būsenos informacija"
-#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:403
-#: src/generic/apt/aptcache.cc:406
+#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:405
+#: src/generic/apt/aptcache.cc:408
msgid "Initializing package states"
msgstr "Ruošiamos paketų būsenos"
-#: src/generic/apt/aptcache.cc:530
+#: src/generic/apt/aptcache.cc:533
msgid "Cannot open Aptitude state file"
msgstr "Negaliu atidaryti Aptitude būsenos bylos"
-#: src/generic/apt/aptcache.cc:534 src/generic/apt/aptcache.cc:589
-#: src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:537 src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:595
msgid "Writing extended state information"
msgstr "Rašoma išplėstinė būsenos informacija"
-#: src/generic/apt/aptcache.cc:571
+#: src/generic/apt/aptcache.cc:574
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr "Vidinis buferis persipildė, bandant įrašyti paketo „%s“ būsenos bylą "
-#: src/generic/apt/aptcache.cc:580
+#: src/generic/apt/aptcache.cc:583
msgid "Couldn't write state file"
msgstr "Negaliu įrašyti būsenos bylos"
-#: src/generic/apt/aptcache.cc:597
+#: src/generic/apt/aptcache.cc:600
msgid "Error writing state file"
msgstr "Klaida rašant būsenos bylą"
-#: src/generic/apt/aptcache.cc:615
+#: src/generic/apt/aptcache.cc:618
#, fuzzy, c-format
msgid "failed to remove %s"
msgstr "Nepavyko atidaryti %s"
-#: src/generic/apt/aptcache.cc:622
+#: src/generic/apt/aptcache.cc:625
#, c-format
msgid "failed to rename %s to %s"
msgstr ""
-#: src/generic/apt/aptcache.cc:630
+#: src/generic/apt/aptcache.cc:633
#, fuzzy, c-format
msgid "couldn't replace %s with %s"
msgstr "negaliu pakeisti senos būsenos bylos"
-#: src/generic/apt/aptcache.cc:1122
+#: src/generic/apt/aptcache.cc:1125
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr ""
"Neįmanoma sutvarkyti priklausomybių, kai kurie paketai negali būti įdiegti"
-#: src/generic/apt/aptcache.cc:1526
+#: src/generic/apt/aptcache.cc:1600
msgid "The list of sources could not be read."
msgstr "Šaltinių sąrašas negali būti perskaitytas."
-#: src/generic/apt/aptcache.cc:1533
+#: src/generic/apt/aptcache.cc:1607
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
"Paketų sąrašas arba būsenos byla negali būti interpretuota arba atidaryta."
-#: src/generic/apt/aptcache.cc:1536
+#: src/generic/apt/aptcache.cc:1610
msgid "You may want to update the package lists to correct these missing files"
msgstr "Trūksta bylų, tikriausiai reikia atnaujinti paketų sąrašą"
@@ -3854,12 +3855,12 @@ msgstr ""
"%s yra esminis paketas!%n%nAr Jūs tikrai norite jį pašalinti?%nJei Jūs "
"tikras įveskite: „%s“."
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:284
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:291
#, c-format
msgid "Information about %s"
msgstr "Informacija apie %s"
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:282
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:289
#, c-format
msgid "%s info"
msgstr "%s info"
@@ -4189,7 +4190,7 @@ msgstr ""
"Šiems paketams reikia versijos %B%s%b paketo %B%s%b, jei tai bus %s paketas "
"bus sugadintas."
-#: src/solution_dialog.cc:91 src/solution_screen.cc:457
+#: src/solution_dialog.cc:91 src/solution_screen.cc:465
msgid "The package cache is not available."
msgstr "Nėra paketų talpyklės"
@@ -4197,11 +4198,11 @@ msgstr "Nėra paketų talpyklės"
msgid "No packages are broken."
msgstr "Bėra blogų paketų."
-#: src/solution_dialog.cc:108 src/solution_screen.cc:479
+#: src/solution_dialog.cc:108 src/solution_screen.cc:488
msgid "No resolution found."
msgstr "Sprendimas nerastas."
-#: src/solution_dialog.cc:114 src/solution_screen.cc:490
+#: src/solution_dialog.cc:114 src/solution_screen.cc:499
#, fuzzy
msgid "Resolving dependencies..."
msgstr "Nepavyksta sutvarkyti priklausomybių."
@@ -4237,7 +4238,7 @@ msgstr "reikia iš anksto"
msgid "%s suggests %s"
msgstr "siūlo"
-#: src/solution_fragment.cc:113 src/solution_item.cc:583
+#: src/solution_fragment.cc:113 src/solution_item.cc:593
#, fuzzy, c-format
msgid "%s recommends %s"
msgstr "rekomenduoja"
@@ -4341,7 +4342,7 @@ msgstr ""
msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgstr "Gauta %sB per %s (%sB/s)."
-#: src/solution_item.cc:587
+#: src/solution_item.cc:597
#, fuzzy, c-format
msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
msgstr "%BPašalinti%b paketus:%n"
@@ -4381,7 +4382,7 @@ msgstr "%BPasendinti%b šiuos paketus:%n"
msgid "Leave the following recommendations unresolved:"
msgstr "%BPašalinti%b paketus:%n"
-#: src/solution_screen.cc:463
+#: src/solution_screen.cc:472
#, fuzzy
msgid "No broken packages."
msgstr "'-' kad pašalinti paketus"
diff --git a/po/nb.po b/po/nb.po
index ac1005c3..65c2d788 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
-"POT-Creation-Date: 2005-11-07 15:22-0800\n"
+"POT-Creation-Date: 2005-11-13 10:12-0800\n"
"PO-Revision-Date: 2005-06-13 21:20+0200\n"
"Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -204,7 +204,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
msgstr "Klarer ikke å løse opp avhengigheter."
#: src/broken_indicator.cc:273 src/solution_dialog.cc:126
-#: src/solution_screen.cc:513
+#: src/solution_screen.cc:522
msgid "Internal error: unexpected null solution."
msgstr "Intern feil: uventet null-løsning."
@@ -798,38 +798,38 @@ msgstr ""
"mønstre). Handlingen vil bli utført for alle pakker du oppgir. Følgende "
"handlinger kan utføres:"
-#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:167
+#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:184
msgid "'+' to install packages"
msgstr "'+' for å installere pakker"
-#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:186
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
msgstr ""
"'+M' for å installere pakker og straks merke dem som installert automatisk"
-#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:171
+#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:188
msgid "'-' to remove packages"
msgstr "'-' for å slette pakker"
-#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:173
+#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:190
msgid "'_' to purge packages"
msgstr "'_' for å fjerne pakker fra systemet"
-#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:175
+#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:192
msgid "'=' to place packages on hold"
msgstr "'=' for å holde pakker tilbake"
-#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:177
+#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:194
msgid ""
"':' to keep packages in their current state without placing them on hold"
msgstr "':' for å holde pakker i nåværende status uten å holde dem tilbake"
-#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:179
+#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:196
msgid "'&M' to mark packages as automatically installed"
msgstr " '&M' for å merke pakker som automatisk installert"
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:181
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:198
msgid "'&m' to mark packages as manually installed"
msgstr " '&m' for å merke pakker som manuelt installert"
@@ -912,59 +912,74 @@ msgstr ""
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr "Ugyldig respons. Skriv inn en gyldig kommando eller «?» for hjelp.\n"
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_resolver.cc:124 src/cmdline/cmdline_resolver.cc:597
+#: src/generic/apt/apt.cc:199
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "Klarer ikke å åpne %s for å skrive til den"
+
+#: src/cmdline/cmdline_resolver.cc:130 src/cmdline/cmdline_resolver.cc:602
+#, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Feil under skriving av tilstand til %s"
+
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:604
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:145
#, fuzzy, c-format
msgid ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
"n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
msgstr "y: %Fn: %Fq: %F,: %F.: %F<HANDLING> pakke... : %F%n%F%F%F%F%F%F%F%F"
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:164
msgid "accept the proposed changes"
msgstr "godta de foreslåtte endringene"
-#: src/cmdline/cmdline_resolver.cc:149
+#: src/cmdline/cmdline_resolver.cc:166
msgid "reject the proposed changes and search for another solution"
msgstr "avvis de foreslåtte endringene og søk etter en annen løsning"
-#: src/cmdline/cmdline_resolver.cc:151
+#: src/cmdline/cmdline_resolver.cc:168
msgid "give up and quit the program"
msgstr "gi opp og avslutt programmet"
-#: src/cmdline/cmdline_resolver.cc:153
+#: src/cmdline/cmdline_resolver.cc:170
msgid "move to the next solution"
msgstr "gå til neste løsning"
-#: src/cmdline/cmdline_resolver.cc:155
+#: src/cmdline/cmdline_resolver.cc:172
msgid "move to the previous solution"
msgstr "gå til forrige løsning"
-#: src/cmdline/cmdline_resolver.cc:157
+#: src/cmdline/cmdline_resolver.cc:174
msgid "view an explanation of the changes in the solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:159
+#: src/cmdline/cmdline_resolver.cc:176
#, fuzzy
msgid "examine the solution in the visual user interface"
msgstr "Gjør om på innstillingene som berører grensesnittet"
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:178
msgid ""
"reject the given package versions; don't display any solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:163
+#: src/cmdline/cmdline_resolver.cc:180
msgid ""
"accept the given package versions; display only solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:165
+#: src/cmdline/cmdline_resolver.cc:182
msgid "adjust the state of the listed packages, where ACTION is one of:"
msgstr "juster status til pakkene i lista, hvor HANDLING er en av:"
-#: src/cmdline/cmdline_resolver.cc:183
+#: src/cmdline/cmdline_resolver.cc:200
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
@@ -972,137 +987,123 @@ msgstr ""
"Justeringer gjør at nåværende løsning forkastes og regnes om på nytt om "
"nødvendig."
-#: src/cmdline/cmdline_resolver.cc:197
+#: src/cmdline/cmdline_resolver.cc:214
#, c-format
msgid "The version %s is available in the following archives:"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:205
+#: src/cmdline/cmdline_resolver.cc:222
#, fuzzy, c-format
msgid "Select the version of %s that should be used: "
msgstr "Fil som løsermotorens tilstand skal dumpes til:"
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:229
#, fuzzy, c-format
msgid "Invalid response. Please enter an integer between 1 and %d."
msgstr "Ugyldig respons. Skriv inn 'y' eller 'n'."
-#: src/cmdline/cmdline_resolver.cc:227
+#: src/cmdline/cmdline_resolver.cc:244
#, c-format
msgid "Expected at least one package/version pair following '%c'"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:241
+#: src/cmdline/cmdline_resolver.cc:258
#, fuzzy, c-format
msgid "Expected a version after \"%s\""
msgstr "Klarer ikke å åpne %s"
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:268
#, fuzzy, c-format
msgid "No such package \"%s\""
msgstr "Kildepakke: "
-#: src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_resolver.cc:284
#, c-format
msgid "%s has no version named \"%s\""
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:301
#, c-format
msgid "Allowing the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:287
+#: src/cmdline/cmdline_resolver.cc:304
#, c-format
msgid "Allowing the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:314
#, c-format
msgid "Rejecting the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:317
#, c-format
msgid "Rejecting the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:330
#, c-format
msgid "No longer requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:333
#, c-format
msgid "No longer requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:325
+#: src/cmdline/cmdline_resolver.cc:342
#, c-format
msgid "Requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:328
+#: src/cmdline/cmdline_resolver.cc:345
#, c-format
msgid "Requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:447 src/solution_screen.cc:486
+#: src/cmdline/cmdline_resolver.cc:464 src/solution_screen.cc:495
#, c-format
msgid "open: %d; closed: %d; defer: %d; conflict: %d"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:493
+#: src/cmdline/cmdline_resolver.cc:510
msgid "The following actions will resolve these dependencies:"
msgstr "Følgende handlinger vil løse opp disse avhengighetene:"
-#: src/cmdline/cmdline_resolver.cc:508
+#: src/cmdline/cmdline_resolver.cc:525
msgid "Accept this solution? [Y/n/q/?] "
msgstr "Godta denne løsningen? [Y/n/q/?]"
-#: src/cmdline/cmdline_resolver.cc:535 src/cmdline/cmdline_resolver.cc:627
+#: src/cmdline/cmdline_resolver.cc:552 src/cmdline/cmdline_resolver.cc:644
msgid "Abandoning all efforts to resolve these dependencies."
msgstr "Gir opp alle forsøk på å løse opp disse avhengighetene."
-#: src/cmdline/cmdline_resolver.cc:562
+#: src/cmdline/cmdline_resolver.cc:579
msgid "The following commands are available:"
msgstr "Følgende kommandoer er tilgjengelige:"
-#: src/cmdline/cmdline_resolver.cc:577
+#: src/cmdline/cmdline_resolver.cc:594
msgid "File to write resolver state to: "
msgstr "Fil som løsningsstatus skal skrives til: "
-#: src/cmdline/cmdline_resolver.cc:580 src/generic/apt/apt.cc:199
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Klarer ikke å åpne %s for å skrive til den"
-
-#: src/cmdline/cmdline_resolver.cc:585
-#, c-format
-msgid "Error writing resolver state to %s"
-msgstr "Feil under skriving av tilstand til %s"
-
-#: src/cmdline/cmdline_resolver.cc:587
-msgid "Resolver state successfully written!"
-msgstr ""
-
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:609
msgid "Invalid response; please enter one of the following commands:"
msgstr "Ugyldig respons. Skriv inn en av følgende kommandoer:"
-#: src/cmdline/cmdline_resolver.cc:602
+#: src/cmdline/cmdline_resolver.cc:619
msgid "No solution found within the allotted time. Try harder? [Y/n]"
msgstr "INgen løsning funnet innen tidsfristen. Arbeide videre? [Y/n]"
-#: src/cmdline/cmdline_resolver.cc:630
+#: src/cmdline/cmdline_resolver.cc:647
msgid "Invalid response; please enter 'y' or 'n'."
msgstr "Ugyldig respons. Skriv inn 'y' eller 'n'."
-#: src/cmdline/cmdline_resolver.cc:639
+#: src/cmdline/cmdline_resolver.cc:656
msgid "Unable to resolve dependencies! Giving up..."
msgstr "Klarer ikke løse opp avhengigheter! Gir opp ..."
-#: src/cmdline/cmdline_resolver.cc:645
+#: src/cmdline/cmdline_resolver.cc:662
#, fuzzy
msgid "*** No more solutions available ***"
msgstr "Ingen flere løsninger."
@@ -1520,62 +1521,62 @@ msgstr "Klarer ikke å åpne Aptitude utvidet tilstandsfil"
msgid "Reading extended state information"
msgstr "Les utvidet tilstandsinformasjon"
-#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:403
-#: src/generic/apt/aptcache.cc:406
+#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:405
+#: src/generic/apt/aptcache.cc:408
msgid "Initializing package states"
msgstr "Oppdater pakkenes status"
-#: src/generic/apt/aptcache.cc:530
+#: src/generic/apt/aptcache.cc:533
msgid "Cannot open Aptitude state file"
msgstr "Klarer ikke åpne Aptitude tilstandsfil"
-#: src/generic/apt/aptcache.cc:534 src/generic/apt/aptcache.cc:589
-#: src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:537 src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:595
msgid "Writing extended state information"
msgstr "Skriv utvidet tilstandsinformasjon"
-#: src/generic/apt/aptcache.cc:571
+#: src/generic/apt/aptcache.cc:574
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr "Intern bufferoverflyt på pakke «%s» under skriving av tilstandsfil"
-#: src/generic/apt/aptcache.cc:580
+#: src/generic/apt/aptcache.cc:583
msgid "Couldn't write state file"
msgstr "Klarte ikke å skrive tilstandsfil"
-#: src/generic/apt/aptcache.cc:597
+#: src/generic/apt/aptcache.cc:600
msgid "Error writing state file"
msgstr "Feil under skriving av tilstandsfil"
-#: src/generic/apt/aptcache.cc:615
+#: src/generic/apt/aptcache.cc:618
#, fuzzy, c-format
msgid "failed to remove %s"
msgstr "Klarer ikke å åpne %s"
-#: src/generic/apt/aptcache.cc:622
+#: src/generic/apt/aptcache.cc:625
#, c-format
msgid "failed to rename %s to %s"
msgstr ""
-#: src/generic/apt/aptcache.cc:630
+#: src/generic/apt/aptcache.cc:633
#, fuzzy, c-format
msgid "couldn't replace %s with %s"
msgstr "klarte ikke å bytte ut tidligere tilstandsfil"
-#: src/generic/apt/aptcache.cc:1122
+#: src/generic/apt/aptcache.cc:1125
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr ""
"Klarte ikke å rette opp avhengigheter, noen pakker kan ikke installeres"
-#: src/generic/apt/aptcache.cc:1526
+#: src/generic/apt/aptcache.cc:1600
msgid "The list of sources could not be read."
msgstr "Kildelista kan ikke leses."
-#: src/generic/apt/aptcache.cc:1533
+#: src/generic/apt/aptcache.cc:1607
msgid "The package lists or status file could not be parsed or opened."
msgstr "Klarte ikke å tolke eller åpne pakkelista eller tilstandsfila."
-#: src/generic/apt/aptcache.cc:1536
+#: src/generic/apt/aptcache.cc:1610
msgid "You may want to update the package lists to correct these missing files"
msgstr "Du vil kanskje oppdatere pakkelista for å rette på de manglende filene"
@@ -3863,12 +3864,12 @@ msgstr ""
"Er du sikker på at du vil fjerne den?%n\n"
"Skriv «%s» hvis du er sikker."
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:284
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:291
#, c-format
msgid "Information about %s"
msgstr "Informasjon om %s"
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:282
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:289
#, c-format
msgid "%s info"
msgstr "%s-informasjon"
@@ -4209,7 +4210,7 @@ msgstr ""
"Følgende pakker er avhengig av versjon %B%s%b av %B%s%b og vil bli skadet "
"hvis den blir %s."
-#: src/solution_dialog.cc:91 src/solution_screen.cc:457
+#: src/solution_dialog.cc:91 src/solution_screen.cc:465
msgid "The package cache is not available."
msgstr "Pakkemellomlageret er ikke tilgjengelig."
@@ -4217,11 +4218,11 @@ msgstr "Pakkemellomlageret er ikke tilgjengelig."
msgid "No packages are broken."
msgstr "Ingen pakker er skadet."
-#: src/solution_dialog.cc:108 src/solution_screen.cc:479
+#: src/solution_dialog.cc:108 src/solution_screen.cc:488
msgid "No resolution found."
msgstr "Fant ingen løsning."
-#: src/solution_dialog.cc:114 src/solution_screen.cc:490
+#: src/solution_dialog.cc:114 src/solution_screen.cc:499
#, fuzzy
msgid "Resolving dependencies..."
msgstr "Klarer ikke å løse opp avhengigheter."
@@ -4257,7 +4258,7 @@ msgstr "krev på forhånd"
msgid "%s suggests %s"
msgstr "anbefaler"
-#: src/solution_fragment.cc:113 src/solution_item.cc:583
+#: src/solution_fragment.cc:113 src/solution_item.cc:593
#, fuzzy, c-format
msgid "%s recommends %s"
msgstr "krever"
@@ -4361,7 +4362,7 @@ msgstr ""
msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgstr "Lasta ned %sB på %s (%sB/s)."
-#: src/solution_item.cc:587
+#: src/solution_item.cc:597
#, fuzzy, c-format
msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
msgstr "%BFjern%b disse pakkene:%n"
@@ -4401,7 +4402,7 @@ msgstr "%BNedgrader%b disse pakkene:%n"
msgid "Leave the following recommendations unresolved:"
msgstr "%BFjern%b disse pakkene:%n"
-#: src/solution_screen.cc:463
+#: src/solution_screen.cc:472
#, fuzzy
msgid "No broken packages."
msgstr "'-' for å slette pakker"
diff --git a/po/nl.po b/po/nl.po
index cf6d7489..9589b2c7 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude 0.4.0-2\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
-"POT-Creation-Date: 2005-11-07 15:22-0800\n"
+"POT-Creation-Date: 2005-11-13 10:12-0800\n"
"PO-Revision-Date: 2005-11-05 13:26+0100\n"
"Last-Translator: Luk Claes <luk@debian.org>\n"
"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -207,7 +207,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] Afhankelijkheden aan het oplossen."
#: src/broken_indicator.cc:273 src/solution_dialog.cc:126
-#: src/solution_screen.cc:513
+#: src/solution_screen.cc:522
msgid "Internal error: unexpected null solution."
msgstr "Interne fout: onverwachte null-oplossing."
@@ -822,41 +822,41 @@ msgstr ""
"(of patronen). De actie zal worden uitgevoerd op alle pakketten die u "
"opgeeft. De volgende acties zijn beschikbaar:"
-#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:167
+#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:184
msgid "'+' to install packages"
msgstr "'+' om pakketten te installeren"
-#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:186
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
msgstr ""
"'+M' om pakketten te installeren en onmiddellijk als automatisch "
"geïnstalleerd markeren"
-#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:171
+#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:188
msgid "'-' to remove packages"
msgstr "'-' om pakketten te verwijderen"
-#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:173
+#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:190
msgid "'_' to purge packages"
msgstr "'_' om pakketten te wissen"
-#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:175
+#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:192
msgid "'=' to place packages on hold"
msgstr "'=' om pakketten te behouden"
-#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:177
+#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:194
msgid ""
"':' to keep packages in their current state without placing them on hold"
msgstr ""
"':' om pakketten in hun huidige toestand te houden zonder ze op houden te "
"zetten"
-#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:179
+#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:196
msgid "'&M' to mark packages as automatically installed"
msgstr " '&M' om pakketten als automatisch geïnstalleerd te markeren"
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:181
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:198
msgid "'&m' to mark packages as manually installed"
msgstr "'&m' om pakketten als handmatig geïnstalleerd te markeren"
@@ -939,7 +939,22 @@ msgstr ""
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr "Ongeldig antwoord. Geef een geldig commando of '?' voor hulp.\n"
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_resolver.cc:124 src/cmdline/cmdline_resolver.cc:597
+#: src/generic/apt/apt.cc:199
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "Kan %s niet openen om te schrijven"
+
+#: src/cmdline/cmdline_resolver.cc:130 src/cmdline/cmdline_resolver.cc:602
+#, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Fout bij het schrijven van de resolver-toestand naar %s"
+
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:604
+msgid "Resolver state successfully written!"
+msgstr "Oplosser-toestand werd met succes weggeschreven!"
+
+#: src/cmdline/cmdline_resolver.cc:145
#, c-format
msgid ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
@@ -948,42 +963,42 @@ msgstr ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
"n<ACTIE> pkg... : %F%n%F%F%F%F%F%F%F%F"
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:164
msgid "accept the proposed changes"
msgstr "aanvaard de voorgestelde wijzigingen"
-#: src/cmdline/cmdline_resolver.cc:149
+#: src/cmdline/cmdline_resolver.cc:166
msgid "reject the proposed changes and search for another solution"
msgstr "wijs de voorgestelde wijzingen af en zoek een andere oplossing"
-#: src/cmdline/cmdline_resolver.cc:151
+#: src/cmdline/cmdline_resolver.cc:168
msgid "give up and quit the program"
msgstr "geef op en sluit het programma af"
-#: src/cmdline/cmdline_resolver.cc:153
+#: src/cmdline/cmdline_resolver.cc:170
msgid "move to the next solution"
msgstr "ga naar de volgende oplossing"
-#: src/cmdline/cmdline_resolver.cc:155
+#: src/cmdline/cmdline_resolver.cc:172
msgid "move to the previous solution"
msgstr "ga naar de vorige oplossing"
-#: src/cmdline/cmdline_resolver.cc:157
+#: src/cmdline/cmdline_resolver.cc:174
msgid "view an explanation of the changes in the solution"
msgstr "bekijk een verklaring van de wijzigingen in de oplossing"
-#: src/cmdline/cmdline_resolver.cc:159
+#: src/cmdline/cmdline_resolver.cc:176
msgid "examine the solution in the visual user interface"
msgstr "onderzoek de oplossing in de visuele gebruikersinterface"
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:178
msgid ""
"reject the given package versions; don't display any solutions in which they "
"occur."
msgstr ""
"verwerp de gegeven pakketversies; toon geen oplossingen waarin ze voorkomen."
-#: src/cmdline/cmdline_resolver.cc:163
+#: src/cmdline/cmdline_resolver.cc:180
msgid ""
"accept the given package versions; display only solutions in which they "
"occur."
@@ -991,11 +1006,11 @@ msgstr ""
"aanvaard de gegeven pakketversies; toon enkel oplossingen waarin ze "
"voorkomen."
-#: src/cmdline/cmdline_resolver.cc:165
+#: src/cmdline/cmdline_resolver.cc:182
msgid "adjust the state of the listed packages, where ACTION is one of:"
msgstr "pas de toestand van de opgegeven pakketten aan, waar ACTIE is één van:"
-#: src/cmdline/cmdline_resolver.cc:183
+#: src/cmdline/cmdline_resolver.cc:200
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
@@ -1003,137 +1018,123 @@ msgstr ""
"Aanpassingen zullen de huidige oplossing doen vergeten en opnieuw berekenen "
"indien nodig."
-#: src/cmdline/cmdline_resolver.cc:197
+#: src/cmdline/cmdline_resolver.cc:214
#, c-format
msgid "The version %s is available in the following archives:"
msgstr "De versie %s is aanwezig in de volgende archieven:"
-#: src/cmdline/cmdline_resolver.cc:205
+#: src/cmdline/cmdline_resolver.cc:222
#, c-format
msgid "Select the version of %s that should be used: "
msgstr "Selecteer de versie van %s die moet gebruikt worden:"
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:229
#, c-format
msgid "Invalid response. Please enter an integer between 1 and %d."
msgstr "Ongeldig antwoord. Geen een geheel getal tussen 1 en %d in."
-#: src/cmdline/cmdline_resolver.cc:227
+#: src/cmdline/cmdline_resolver.cc:244
#, c-format
msgid "Expected at least one package/version pair following '%c'"
msgstr "Verwachtte tenminste één pakket/versie-paar na '%c'"
-#: src/cmdline/cmdline_resolver.cc:241
+#: src/cmdline/cmdline_resolver.cc:258
#, c-format
msgid "Expected a version after \"%s\""
msgstr "Verwachtte een versie na \"%s\""
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:268
#, c-format
msgid "No such package \"%s\""
msgstr "Geen pakket \"%s\""
-#: src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_resolver.cc:284
#, c-format
msgid "%s has no version named \"%s\""
msgstr "%s heeft geen versie \"%s\""
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:301
#, c-format
msgid "Allowing the removal of %s"
msgstr "Staat het verwijderen van %s toe"
-#: src/cmdline/cmdline_resolver.cc:287
+#: src/cmdline/cmdline_resolver.cc:304
#, c-format
msgid "Allowing the installation of %s version %s (%s)"
msgstr "Staat de installatie van %s versie %s (%s) toe"
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:314
#, c-format
msgid "Rejecting the removal of %s"
msgstr "Weigert het verwijderen van %s"
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:317
#, c-format
msgid "Rejecting the installation of %s version %s (%s)"
msgstr "Weigert de installatie van %s versie %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:330
#, c-format
msgid "No longer requiring the removal of %s"
msgstr "Vereist het verwijderen van %s niet langer"
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:333
#, c-format
msgid "No longer requiring the installation of %s version %s (%s)"
msgstr "Vereist niet langer de installatie van %s versie %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:325
+#: src/cmdline/cmdline_resolver.cc:342
#, c-format
msgid "Requiring the removal of %s"
msgstr "Vereist het verwijderen van %s"
-#: src/cmdline/cmdline_resolver.cc:328
+#: src/cmdline/cmdline_resolver.cc:345
#, c-format
msgid "Requiring the installation of %s version %s (%s)"
msgstr "Vereist de installatie van %s versie %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:447 src/solution_screen.cc:486
+#: src/cmdline/cmdline_resolver.cc:464 src/solution_screen.cc:495
#, c-format
msgid "open: %d; closed: %d; defer: %d; conflict: %d"
msgstr "open: %d; gesloten: %d; uitgesteld: %d; conflicten: %d"
-#: src/cmdline/cmdline_resolver.cc:493
+#: src/cmdline/cmdline_resolver.cc:510
msgid "The following actions will resolve these dependencies:"
msgstr "De volgende acties zullen deze afhankelijkheden oplossen:"
-#: src/cmdline/cmdline_resolver.cc:508
+#: src/cmdline/cmdline_resolver.cc:525
msgid "Accept this solution? [Y/n/q/?] "
msgstr "Deze oplossing aanvaarden? [Y/n/q/?]"
-#: src/cmdline/cmdline_resolver.cc:535 src/cmdline/cmdline_resolver.cc:627
+#: src/cmdline/cmdline_resolver.cc:552 src/cmdline/cmdline_resolver.cc:644
msgid "Abandoning all efforts to resolve these dependencies."
msgstr "Alle pogingen staken om deze afhankelijkheden op te lossen."
-#: src/cmdline/cmdline_resolver.cc:562
+#: src/cmdline/cmdline_resolver.cc:579
msgid "The following commands are available:"
msgstr "De volgende commando's zijn beschikbaar:"
-#: src/cmdline/cmdline_resolver.cc:577
+#: src/cmdline/cmdline_resolver.cc:594
msgid "File to write resolver state to: "
msgstr "Bestand om de resolver-toestand in weg te schrijven:"
-#: src/cmdline/cmdline_resolver.cc:580 src/generic/apt/apt.cc:199
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Kan %s niet openen om te schrijven"
-
-#: src/cmdline/cmdline_resolver.cc:585
-#, c-format
-msgid "Error writing resolver state to %s"
-msgstr "Fout bij het schrijven van de resolver-toestand naar %s"
-
-#: src/cmdline/cmdline_resolver.cc:587
-msgid "Resolver state successfully written!"
-msgstr "Oplosser-toestand werd met succes weggeschreven!"
-
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:609
msgid "Invalid response; please enter one of the following commands:"
msgstr "Ongeldig antwoord; geef één van de volgende commando's:"
-#: src/cmdline/cmdline_resolver.cc:602
+#: src/cmdline/cmdline_resolver.cc:619
msgid "No solution found within the allotted time. Try harder? [Y/n]"
msgstr "Geen oplossing gevonden in de toegewezen tijd. Harder proberen? [Y/n]"
-#: src/cmdline/cmdline_resolver.cc:630
+#: src/cmdline/cmdline_resolver.cc:647
msgid "Invalid response; please enter 'y' or 'n'."
msgstr "Ongeldig antwoord; geef 'y' of 'n' in."
-#: src/cmdline/cmdline_resolver.cc:639
+#: src/cmdline/cmdline_resolver.cc:656
msgid "Unable to resolve dependencies! Giving up..."
msgstr "Niet gelukt om de afhankelijkheden op te lossen! Gestopt..."
-#: src/cmdline/cmdline_resolver.cc:645
+#: src/cmdline/cmdline_resolver.cc:662
msgid "*** No more solutions available ***"
msgstr "*** Geen oplossingen meer beschikbaar ***"
@@ -1549,65 +1550,65 @@ msgstr "Kan het uitgebreide statusbestand van Aptitude niet openen"
msgid "Reading extended state information"
msgstr "Uitgebreide statusinformatie aan het lezen"
-#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:403
-#: src/generic/apt/aptcache.cc:406
+#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:405
+#: src/generic/apt/aptcache.cc:408
msgid "Initializing package states"
msgstr "Initialiseren van pakketstatussen"
-#: src/generic/apt/aptcache.cc:530
+#: src/generic/apt/aptcache.cc:533
msgid "Cannot open Aptitude state file"
msgstr "Kan het statusbestand van Aptitude niet openen"
-#: src/generic/apt/aptcache.cc:534 src/generic/apt/aptcache.cc:589
-#: src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:537 src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:595
msgid "Writing extended state information"
msgstr "Schrijven van uitgebreide statusinformatie"
-#: src/generic/apt/aptcache.cc:571
+#: src/generic/apt/aptcache.cc:574
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr ""
"Interne bufferoverloop op pakket \"%s\" bij schrijven naar statusbestand"
-#: src/generic/apt/aptcache.cc:580
+#: src/generic/apt/aptcache.cc:583
msgid "Couldn't write state file"
msgstr "Kon statusbestand niet beschrijven"
-#: src/generic/apt/aptcache.cc:597
+#: src/generic/apt/aptcache.cc:600
msgid "Error writing state file"
msgstr "Fout bij schrijven naar statusbestand"
-#: src/generic/apt/aptcache.cc:615
+#: src/generic/apt/aptcache.cc:618
#, c-format
msgid "failed to remove %s"
msgstr "kon %s niet verwijderen"
-#: src/generic/apt/aptcache.cc:622
+#: src/generic/apt/aptcache.cc:625
#, c-format
msgid "failed to rename %s to %s"
msgstr "kon %s niet naar %s hernoemen"
-#: src/generic/apt/aptcache.cc:630
+#: src/generic/apt/aptcache.cc:633
#, c-format
msgid "couldn't replace %s with %s"
msgstr "kon %s niet vervangen met %s"
-#: src/generic/apt/aptcache.cc:1122
+#: src/generic/apt/aptcache.cc:1125
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr ""
"Kan afhankelijkheden niet corrigeren, enkele pakketten kunnen niet "
"geïnstalleerd worden"
-#: src/generic/apt/aptcache.cc:1526
+#: src/generic/apt/aptcache.cc:1600
msgid "The list of sources could not be read."
msgstr "De bronnenlijst kon niet gelezen worden."
-#: src/generic/apt/aptcache.cc:1533
+#: src/generic/apt/aptcache.cc:1607
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
"De pakketlijst of het statusbestand kon niet worden ontleed of geopend."
-#: src/generic/apt/aptcache.cc:1536
+#: src/generic/apt/aptcache.cc:1610
msgid "You may want to update the package lists to correct these missing files"
msgstr ""
"U wilt misschien de pakketlijsten bijwerken om deze ontbrekende bestanden te "
@@ -3899,12 +3900,12 @@ msgstr ""
"%s is een essentieel pakket!%n%nBent u zeker dat u het wil verwijderen?%nTyp "
"'%s' als u zeker bent."
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:284
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:291
#, c-format
msgid "Information about %s"
msgstr "Informatie over %s"
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:282
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:289
#, c-format
msgid "%s info"
msgstr "%s info"
@@ -4242,7 +4243,7 @@ msgstr ""
"De volgende pakketten hangen af van een versie %B%s%b van %B%s%b en zullen "
"beschadigd worden als het %s is:"
-#: src/solution_dialog.cc:91 src/solution_screen.cc:457
+#: src/solution_dialog.cc:91 src/solution_screen.cc:465
msgid "The package cache is not available."
msgstr "De pakketcache is niet beschikbaar."
@@ -4250,11 +4251,11 @@ msgstr "De pakketcache is niet beschikbaar."
msgid "No packages are broken."
msgstr "Er zijn geen gebroken pakketten."
-#: src/solution_dialog.cc:108 src/solution_screen.cc:479
+#: src/solution_dialog.cc:108 src/solution_screen.cc:488
msgid "No resolution found."
msgstr "Geen oplossing gevonden."
-#: src/solution_dialog.cc:114 src/solution_screen.cc:490
+#: src/solution_dialog.cc:114 src/solution_screen.cc:499
msgid "Resolving dependencies..."
msgstr "Afhankelijkheden aan het oplossen..."
@@ -4289,7 +4290,7 @@ msgstr "%s hangt volledig af van %s"
msgid "%s suggests %s"
msgstr "%s suggereert %s "
-#: src/solution_fragment.cc:113 src/solution_item.cc:583
+#: src/solution_fragment.cc:113 src/solution_item.cc:593
#, c-format
msgid "%s recommends %s"
msgstr "%s beveelt %s aan"
@@ -4393,7 +4394,7 @@ msgstr "Opwaarderen van %F [%s (%s) -> %s (%s)]"
msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgstr "Degradeer %F [%s (%s) -> %s (%s)]"
-#: src/solution_item.cc:587
+#: src/solution_item.cc:597
#, c-format
msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
msgstr "-> Laat de afhankelijkheid \"%s beveelt %s aan\" onopgelost."
@@ -4426,7 +4427,7 @@ msgstr " Degradeer de volgende pakketten:"
msgid "Leave the following recommendations unresolved:"
msgstr "Laat de volgende aanbevelingen onopgelost:"
-#: src/solution_screen.cc:463
+#: src/solution_screen.cc:472
msgid "No broken packages."
msgstr "Geen beschadigde pakketten."
diff --git a/po/nn.po b/po/nn.po
index 4416b06e..11fce69f 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude_nn\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
-"POT-Creation-Date: 2005-11-07 15:22-0800\n"
+"POT-Creation-Date: 2005-11-13 10:12-0800\n"
"PO-Revision-Date: 2005-06-27 21:26+0200\n"
"Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
"Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -204,7 +204,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
msgstr "Klarer ikkje løysa pakkekrav."
#: src/broken_indicator.cc:273 src/solution_dialog.cc:126
-#: src/solution_screen.cc:513
+#: src/solution_screen.cc:522
msgid "Internal error: unexpected null solution."
msgstr "Intern feil: uventa nulløysing."
@@ -800,40 +800,40 @@ msgstr ""
"pakkenamn (eller mønster). Handlinga vil bli utført på alle pakkane du "
"listar opp. Desse handlingane er tilgjengelege:"
-#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:167
+#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:184
msgid "'+' to install packages"
msgstr "+ for å installere pakkar"
-#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:186
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
msgstr ""
"+M for å installere pakkar og merkje dei med det same som automatisk "
"installerte"
-#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:171
+#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:188
msgid "'-' to remove packages"
msgstr "- for å fjerne pakkar"
-#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:173
+#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:190
msgid "'_' to purge packages"
msgstr "_ for å reinske ut pakkar"
-#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:175
+#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:192
msgid "'=' to place packages on hold"
msgstr "= for å leggje pakkar på hald"
-#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:177
+#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:194
msgid ""
"':' to keep packages in their current state without placing them on hold"
msgstr ""
": for å la pakkar vere i deira noverande tilstand utan å leggje dei på hald"
-#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:179
+#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:196
msgid "'&M' to mark packages as automatically installed"
msgstr "&M for å merkje pakkar som automatisk installerte"
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:181
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:198
msgid "'&m' to mark packages as manually installed"
msgstr "&m for å merkje pakkar som manuelt installerte"
@@ -916,59 +916,74 @@ msgstr ""
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr "Ugyldig respons. Skriv inn ein gyldig kommando eller «?» for hjelp.\n"
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_resolver.cc:124 src/cmdline/cmdline_resolver.cc:597
+#: src/generic/apt/apt.cc:199
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "Klarer ikkje opna %s for å skriva til ho"
+
+#: src/cmdline/cmdline_resolver.cc:130 src/cmdline/cmdline_resolver.cc:602
+#, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Feil ved skriving av løysingstilstand til %s"
+
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:604
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:145
#, fuzzy, c-format
msgid ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
"n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
msgstr "y: %Fn: %Fq: %F,: %F.: %F<HANDLING> pakke... : %F%n%F%F%F%F%F%F%F%F"
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:164
msgid "accept the proposed changes"
msgstr "godta dei føreslegne endringane"
-#: src/cmdline/cmdline_resolver.cc:149
+#: src/cmdline/cmdline_resolver.cc:166
msgid "reject the proposed changes and search for another solution"
msgstr "avvis dei føreslegne endringane og søk etter ei anna løysing"
-#: src/cmdline/cmdline_resolver.cc:151
+#: src/cmdline/cmdline_resolver.cc:168
msgid "give up and quit the program"
msgstr "gje opp og avslutt programmet"
-#: src/cmdline/cmdline_resolver.cc:153
+#: src/cmdline/cmdline_resolver.cc:170
msgid "move to the next solution"
msgstr "gå til neste løysing"
-#: src/cmdline/cmdline_resolver.cc:155
+#: src/cmdline/cmdline_resolver.cc:172
msgid "move to the previous solution"
msgstr "gå til førre løysing"
-#: src/cmdline/cmdline_resolver.cc:157
+#: src/cmdline/cmdline_resolver.cc:174
msgid "view an explanation of the changes in the solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:159
+#: src/cmdline/cmdline_resolver.cc:176
#, fuzzy
msgid "examine the solution in the visual user interface"
msgstr "Endrar innstillingane for brukargrenseflata"
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:178
msgid ""
"reject the given package versions; don't display any solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:163
+#: src/cmdline/cmdline_resolver.cc:180
msgid ""
"accept the given package versions; display only solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:165
+#: src/cmdline/cmdline_resolver.cc:182
msgid "adjust the state of the listed packages, where ACTION is one of:"
msgstr "endra tilstanden til dei opplista pakkane der HANDLING er ein av:"
-#: src/cmdline/cmdline_resolver.cc:183
+#: src/cmdline/cmdline_resolver.cc:200
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
@@ -976,138 +991,124 @@ msgstr ""
"Endringar fil føre til at den noverande løysinga vil bli forkasta og ei ny "
"løysing vil bli funne."
-#: src/cmdline/cmdline_resolver.cc:197
+#: src/cmdline/cmdline_resolver.cc:214
#, c-format
msgid "The version %s is available in the following archives:"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:205
+#: src/cmdline/cmdline_resolver.cc:222
#, fuzzy, c-format
msgid "Select the version of %s that should be used: "
msgstr "Fila der løysingstilstanden skal lagrast:"
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:229
#, fuzzy, c-format
msgid "Invalid response. Please enter an integer between 1 and %d."
msgstr "Ugyldig respons. Skriv «j» eller «n»."
-#: src/cmdline/cmdline_resolver.cc:227
+#: src/cmdline/cmdline_resolver.cc:244
#, c-format
msgid "Expected at least one package/version pair following '%c'"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:241
+#: src/cmdline/cmdline_resolver.cc:258
#, fuzzy, c-format
msgid "Expected a version after \"%s\""
msgstr "Klarer ikkje opna %s"
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:268
#, fuzzy, c-format
msgid "No such package \"%s\""
msgstr "Kjeldepakke: "
-#: src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_resolver.cc:284
#, c-format
msgid "%s has no version named \"%s\""
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:301
#, c-format
msgid "Allowing the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:287
+#: src/cmdline/cmdline_resolver.cc:304
#, c-format
msgid "Allowing the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:314
#, c-format
msgid "Rejecting the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:317
#, c-format
msgid "Rejecting the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:330
#, c-format
msgid "No longer requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:333
#, c-format
msgid "No longer requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:325
+#: src/cmdline/cmdline_resolver.cc:342
#, c-format
msgid "Requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:328
+#: src/cmdline/cmdline_resolver.cc:345
#, c-format
msgid "Requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:447 src/solution_screen.cc:486
+#: src/cmdline/cmdline_resolver.cc:464 src/solution_screen.cc:495
#, c-format
msgid "open: %d; closed: %d; defer: %d; conflict: %d"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:493
+#: src/cmdline/cmdline_resolver.cc:510
msgid "The following actions will resolve these dependencies:"
msgstr "Desse handlingane vil løyse desse pakkekrava:"
# Hugs [J]a, [n]ei, [a]vslutt
-#: src/cmdline/cmdline_resolver.cc:508
+#: src/cmdline/cmdline_resolver.cc:525
msgid "Accept this solution? [Y/n/q/?] "
msgstr "Vil du godta denne løysinga? [J/n/a/?] "
-#: src/cmdline/cmdline_resolver.cc:535 src/cmdline/cmdline_resolver.cc:627
+#: src/cmdline/cmdline_resolver.cc:552 src/cmdline/cmdline_resolver.cc:644
msgid "Abandoning all efforts to resolve these dependencies."
msgstr "Avbryt alt arbeid med å løyse desse pakkekrava."
-#: src/cmdline/cmdline_resolver.cc:562
+#: src/cmdline/cmdline_resolver.cc:579
msgid "The following commands are available:"
msgstr "Desse kommandoane er tilgjengelege:"
-#: src/cmdline/cmdline_resolver.cc:577
+#: src/cmdline/cmdline_resolver.cc:594
msgid "File to write resolver state to: "
msgstr "Fil for å skrive løysingstilstanden i: "
-#: src/cmdline/cmdline_resolver.cc:580 src/generic/apt/apt.cc:199
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Klarer ikkje opna %s for å skriva til ho"
-
-#: src/cmdline/cmdline_resolver.cc:585
-#, c-format
-msgid "Error writing resolver state to %s"
-msgstr "Feil ved skriving av løysingstilstand til %s"
-
-#: src/cmdline/cmdline_resolver.cc:587
-msgid "Resolver state successfully written!"
-msgstr ""
-
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:609
msgid "Invalid response; please enter one of the following commands:"
msgstr "Ugyldig respons. Skriv inn ein av dei følgjande kommandoane:"
-#: src/cmdline/cmdline_resolver.cc:602
+#: src/cmdline/cmdline_resolver.cc:619
msgid "No solution found within the allotted time. Try harder? [Y/n]"
msgstr "Inga løysing funne innanfor den tildelte tida. Prøve hardare? [J/n]"
-#: src/cmdline/cmdline_resolver.cc:630
+#: src/cmdline/cmdline_resolver.cc:647
msgid "Invalid response; please enter 'y' or 'n'."
msgstr "Ugyldig respons. Skriv «j» eller «n»."
-#: src/cmdline/cmdline_resolver.cc:639
+#: src/cmdline/cmdline_resolver.cc:656
msgid "Unable to resolve dependencies! Giving up..."
msgstr "Klarer ikkje løyse pakkekrava! Gjev opp ..."
-#: src/cmdline/cmdline_resolver.cc:645
+#: src/cmdline/cmdline_resolver.cc:662
#, fuzzy
msgid "*** No more solutions available ***"
msgstr "Ingen fleire løysingar."
@@ -1525,61 +1526,61 @@ msgstr "Klarer ikkje opna Aptitude utvida tilstandsfil"
msgid "Reading extended state information"
msgstr "Les utvida tilstandsinformasjon"
-#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:403
-#: src/generic/apt/aptcache.cc:406
+#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:405
+#: src/generic/apt/aptcache.cc:408
msgid "Initializing package states"
msgstr "Oppdaterer pakkestatus"
-#: src/generic/apt/aptcache.cc:530
+#: src/generic/apt/aptcache.cc:533
msgid "Cannot open Aptitude state file"
msgstr "Klarer ikkje opna Aptitude tilstandsfil"
-#: src/generic/apt/aptcache.cc:534 src/generic/apt/aptcache.cc:589
-#: src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:537 src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:595
msgid "Writing extended state information"
msgstr "Skriv utvida tilstandsinformasjon"
-#: src/generic/apt/aptcache.cc:571
+#: src/generic/apt/aptcache.cc:574
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr "Intern bufferoverflyt på pakke «%s» under skriving av tilstandsfil"
-#: src/generic/apt/aptcache.cc:580
+#: src/generic/apt/aptcache.cc:583
msgid "Couldn't write state file"
msgstr "Klarte ikkje skriva tilstandsfil"
-#: src/generic/apt/aptcache.cc:597
+#: src/generic/apt/aptcache.cc:600
msgid "Error writing state file"
msgstr "Feil under skriving av tilstandsfil"
-#: src/generic/apt/aptcache.cc:615
+#: src/generic/apt/aptcache.cc:618
#, fuzzy, c-format
msgid "failed to remove %s"
msgstr "Klarer ikkje opna %s"
-#: src/generic/apt/aptcache.cc:622
+#: src/generic/apt/aptcache.cc:625
#, c-format
msgid "failed to rename %s to %s"
msgstr ""
-#: src/generic/apt/aptcache.cc:630
+#: src/generic/apt/aptcache.cc:633
#, fuzzy, c-format
msgid "couldn't replace %s with %s"
msgstr "klarte ikkje byta ut gamal tilstandsfil"
-#: src/generic/apt/aptcache.cc:1122
+#: src/generic/apt/aptcache.cc:1125
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr "Klarte ikkje rette opp pakkekrav, nokre pakkar kan ikkje installerast"
-#: src/generic/apt/aptcache.cc:1526
+#: src/generic/apt/aptcache.cc:1600
msgid "The list of sources could not be read."
msgstr "Kjeldelista kan ikkje lesast."
-#: src/generic/apt/aptcache.cc:1533
+#: src/generic/apt/aptcache.cc:1607
msgid "The package lists or status file could not be parsed or opened."
msgstr "Klarte ikkje tolka eller opna pakkelista eller tilstandsfila."
-#: src/generic/apt/aptcache.cc:1536
+#: src/generic/apt/aptcache.cc:1610
msgid "You may want to update the package lists to correct these missing files"
msgstr ""
"Du vil kanskje oppdatere pakkelista for å retta på dei manglande filene"
@@ -3873,12 +3874,12 @@ msgstr ""
"%s er ein vesentleg pakke!%n%nEr du sikker på at du vil fjerna han?%nSkriv «%"
"s» viss du er det."
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:284
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:291
#, c-format
msgid "Information about %s"
msgstr "Informasjon om %s"
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:282
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:289
#, c-format
msgid "%s info"
msgstr "%s-info"
@@ -4210,7 +4211,7 @@ msgstr ""
"Desse pakkane krev versjon %B%s%b av %B%s%b, og dei vil bli øydelagde viss "
"han blir %s."
-#: src/solution_dialog.cc:91 src/solution_screen.cc:457
+#: src/solution_dialog.cc:91 src/solution_screen.cc:465
msgid "The package cache is not available."
msgstr "Pakkemellomlageret er ikkje tilgjengeleg."
@@ -4218,11 +4219,11 @@ msgstr "Pakkemellomlageret er ikkje tilgjengeleg."
msgid "No packages are broken."
msgstr "Ingen pakkar er øydelagde."
-#: src/solution_dialog.cc:108 src/solution_screen.cc:479
+#: src/solution_dialog.cc:108 src/solution_screen.cc:488
msgid "No resolution found."
msgstr "Inga løysing funne."
-#: src/solution_dialog.cc:114 src/solution_screen.cc:490
+#: src/solution_dialog.cc:114 src/solution_screen.cc:499
#, fuzzy
msgid "Resolving dependencies..."
msgstr "Klarer ikkje løysa pakkekrav."
@@ -4258,7 +4259,7 @@ msgstr "krev på førehand"
msgid "%s suggests %s"
msgstr "føreslår"
-#: src/solution_fragment.cc:113 src/solution_item.cc:583
+#: src/solution_fragment.cc:113 src/solution_item.cc:593
#, fuzzy, c-format
msgid "%s recommends %s"
msgstr "tilrår"
@@ -4362,7 +4363,7 @@ msgstr ""
msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgstr "Lasta ned %sB på %s (%sB/s)."
-#: src/solution_item.cc:587
+#: src/solution_item.cc:597
#, fuzzy, c-format
msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
msgstr "%BFjern%b desse pakkane: %n"
@@ -4402,7 +4403,7 @@ msgstr "%BNedgrader%b desse pakkane: %n"
msgid "Leave the following recommendations unresolved:"
msgstr "%BFjern%b desse pakkane: %n"
-#: src/solution_screen.cc:463
+#: src/solution_screen.cc:472
#, fuzzy
msgid "No broken packages."
msgstr "- for å fjerne pakkar"
diff --git a/po/pl.po b/po/pl.po
index 2cf59a9f..9c2f876f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude 0.3.2\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
-"POT-Creation-Date: 2005-11-07 15:22-0800\n"
+"POT-Creation-Date: 2005-11-13 10:12-0800\n"
"PO-Revision-Date: 2005-06-22 15:19+0200\n"
"Last-Translator: Micha Politowski <l10n@mp.pl.eu.org>\n"
"Language-Team: Polish\n"
@@ -196,7 +196,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
msgstr "Nie mona naprawi zalenoci."
#: src/broken_indicator.cc:273 src/solution_dialog.cc:126
-#: src/solution_screen.cc:513
+#: src/solution_screen.cc:522
msgid "Internal error: unexpected null solution."
msgstr "Bd wewntrzny: niespodziewane puste rozwizanie."
@@ -784,41 +784,41 @@ msgstr ""
"znak okrelajcy akcj, a po nim nazwy pakietw (lub wzorce). Akcja bdzie "
"dotyczy wszystkich podanych pakietw. Dostpne s nastpujce akcje:"
-#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:167
+#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:184
msgid "'+' to install packages"
msgstr "\"+\": instalacja pakietw"
-#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:186
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
msgstr ""
"\"+M\": instalacja pakietw i oznaczenie ich jako zainstalowanych "
"automatycznie"
-#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:171
+#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:188
msgid "'-' to remove packages"
msgstr "\"-\": usunicie pakietw"
-#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:173
+#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:190
msgid "'_' to purge packages"
msgstr "\"_\": wyczyszczenie pakietw"
-#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:175
+#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:192
msgid "'=' to place packages on hold"
msgstr "\"=\": zatrzymanie pakietw"
-#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:177
+#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:194
msgid ""
"':' to keep packages in their current state without placing them on hold"
msgstr ""
"\":\": pozostawienie pakietw w biecym stanie bez trwaego zatrzymywania "
"ich"
-#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:179
+#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:196
msgid "'&M' to mark packages as automatically installed"
msgstr "\"&M\": oznaczenie pakietw jako automatycznie zainstalowanych"
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:181
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:198
msgid "'&m' to mark packages as manually installed"
msgstr "\"&m\": oznaczenie pakietw jako rcznie zainstalowanych"
@@ -903,59 +903,74 @@ msgstr ""
"Nieprawidowe polecenie. Prosz poda polecenie, lub \"?\" dla uzyskania "
"pomocy.\n"
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_resolver.cc:124 src/cmdline/cmdline_resolver.cc:597
+#: src/generic/apt/apt.cc:199
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "Nie mona otworzy %s do zapisu"
+
+#: src/cmdline/cmdline_resolver.cc:130 src/cmdline/cmdline_resolver.cc:602
+#, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Bd w czasie zapisu stanu procedury naprawy zalenoci do %s"
+
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:604
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:145
#, fuzzy, c-format
msgid ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
"n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
msgstr "y: %Fn: %Fq: %F,: %F.: %F<AKCJA> pakiet... : %F%n%F%F%F%F%F%F%F%F"
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:164
msgid "accept the proposed changes"
msgstr "przyjcie proponowanych zmian"
-#: src/cmdline/cmdline_resolver.cc:149
+#: src/cmdline/cmdline_resolver.cc:166
msgid "reject the proposed changes and search for another solution"
msgstr "odrzucenie proponowanych zmian, poszukiwanie innego rozwizania"
-#: src/cmdline/cmdline_resolver.cc:151
+#: src/cmdline/cmdline_resolver.cc:168
msgid "give up and quit the program"
msgstr "zakoczenie programu"
-#: src/cmdline/cmdline_resolver.cc:153
+#: src/cmdline/cmdline_resolver.cc:170
msgid "move to the next solution"
msgstr "przejcie do nastpnego rozwizania"
-#: src/cmdline/cmdline_resolver.cc:155
+#: src/cmdline/cmdline_resolver.cc:172
msgid "move to the previous solution"
msgstr "przejcie do poprzedniego rozwizania"
-#: src/cmdline/cmdline_resolver.cc:157
+#: src/cmdline/cmdline_resolver.cc:174
msgid "view an explanation of the changes in the solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:159
+#: src/cmdline/cmdline_resolver.cc:176
#, fuzzy
msgid "examine the solution in the visual user interface"
msgstr "Zmienia opcje dotyczce interfejsu uytkownika"
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:178
msgid ""
"reject the given package versions; don't display any solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:163
+#: src/cmdline/cmdline_resolver.cc:180
msgid ""
"accept the given package versions; display only solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:165
+#: src/cmdline/cmdline_resolver.cc:182
msgid "adjust the state of the listed packages, where ACTION is one of:"
msgstr "zmiana stanu podanych pakietw; dostpne AKCJE:"
-#: src/cmdline/cmdline_resolver.cc:183
+#: src/cmdline/cmdline_resolver.cc:200
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
@@ -963,138 +978,124 @@ msgstr ""
"Wprowadzenie zmian spowoduje odrzucenie i ponowne przeliczenie biecego "
"rozwizania."
-#: src/cmdline/cmdline_resolver.cc:197
+#: src/cmdline/cmdline_resolver.cc:214
#, c-format
msgid "The version %s is available in the following archives:"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:205
+#: src/cmdline/cmdline_resolver.cc:222
#, fuzzy, c-format
msgid "Select the version of %s that should be used: "
msgstr "Plik do zapisu stanu procedury naprawy zalenoci:"
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:229
#, fuzzy, c-format
msgid "Invalid response. Please enter an integer between 1 and %d."
msgstr "Nieprawidowa odpowied. Prosz wpisa \"y\" lub \"n\"."
-#: src/cmdline/cmdline_resolver.cc:227
+#: src/cmdline/cmdline_resolver.cc:244
#, c-format
msgid "Expected at least one package/version pair following '%c'"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:241
+#: src/cmdline/cmdline_resolver.cc:258
#, fuzzy, c-format
msgid "Expected a version after \"%s\""
msgstr "Nie mona otworzy %s"
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:268
#, fuzzy, c-format
msgid "No such package \"%s\""
msgstr "Pakiet rdowy: "
-#: src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_resolver.cc:284
#, c-format
msgid "%s has no version named \"%s\""
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:301
#, c-format
msgid "Allowing the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:287
+#: src/cmdline/cmdline_resolver.cc:304
#, c-format
msgid "Allowing the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:314
#, c-format
msgid "Rejecting the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:317
#, c-format
msgid "Rejecting the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:330
#, c-format
msgid "No longer requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:333
#, c-format
msgid "No longer requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:325
+#: src/cmdline/cmdline_resolver.cc:342
#, c-format
msgid "Requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:328
+#: src/cmdline/cmdline_resolver.cc:345
#, c-format
msgid "Requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:447 src/solution_screen.cc:486
+#: src/cmdline/cmdline_resolver.cc:464 src/solution_screen.cc:495
#, c-format
msgid "open: %d; closed: %d; defer: %d; conflict: %d"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:493
+#: src/cmdline/cmdline_resolver.cc:510
msgid "The following actions will resolve these dependencies:"
msgstr "Nastpujce dziaania rozwi problemy z zalenociami:"
-#: src/cmdline/cmdline_resolver.cc:508
+#: src/cmdline/cmdline_resolver.cc:525
msgid "Accept this solution? [Y/n/q/?] "
msgstr "Zaakceptowa rozwizanie? [Y/n/q/?] "
-#: src/cmdline/cmdline_resolver.cc:535 src/cmdline/cmdline_resolver.cc:627
+#: src/cmdline/cmdline_resolver.cc:552 src/cmdline/cmdline_resolver.cc:644
msgid "Abandoning all efforts to resolve these dependencies."
msgstr "Porzucono prby rozwizania problemw z zalenociami."
-#: src/cmdline/cmdline_resolver.cc:562
+#: src/cmdline/cmdline_resolver.cc:579
msgid "The following commands are available:"
msgstr "Dostpne s nastpujce polecenia:"
-#: src/cmdline/cmdline_resolver.cc:577
+#: src/cmdline/cmdline_resolver.cc:594
msgid "File to write resolver state to: "
msgstr "Plik do zapisu stanu procedury naprawy zalenoci: "
-#: src/cmdline/cmdline_resolver.cc:580 src/generic/apt/apt.cc:199
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Nie mona otworzy %s do zapisu"
-
-#: src/cmdline/cmdline_resolver.cc:585
-#, c-format
-msgid "Error writing resolver state to %s"
-msgstr "Bd w czasie zapisu stanu procedury naprawy zalenoci do %s"
-
-#: src/cmdline/cmdline_resolver.cc:587
-msgid "Resolver state successfully written!"
-msgstr ""
-
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:609
msgid "Invalid response; please enter one of the following commands:"
msgstr "Nieprawidowa odpowied. Prosz poda jedno z nastpujcych polece:"
-#: src/cmdline/cmdline_resolver.cc:602
+#: src/cmdline/cmdline_resolver.cc:619
msgid "No solution found within the allotted time. Try harder? [Y/n]"
msgstr ""
"Nie znaleziono rozwiza przed upywem limitu czasu. Prbowa dalej? [Y/n]"
-#: src/cmdline/cmdline_resolver.cc:630
+#: src/cmdline/cmdline_resolver.cc:647
msgid "Invalid response; please enter 'y' or 'n'."
msgstr "Nieprawidowa odpowied. Prosz wpisa \"y\" lub \"n\"."
-#: src/cmdline/cmdline_resolver.cc:639
+#: src/cmdline/cmdline_resolver.cc:656
msgid "Unable to resolve dependencies! Giving up..."
msgstr "Nie mona rozwiza problemw z zalenociami!"
-#: src/cmdline/cmdline_resolver.cc:645
+#: src/cmdline/cmdline_resolver.cc:662
#, fuzzy
msgid "*** No more solutions available ***"
msgstr "Nie ma wicej rozwiza."
@@ -1515,62 +1516,62 @@ msgstr "Nie mona otworzy dodatkowych informacji o stanie"
msgid "Reading extended state information"
msgstr "Odczyt dodatkowych informacji o stanie"
-#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:403
-#: src/generic/apt/aptcache.cc:406
+#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:405
+#: src/generic/apt/aptcache.cc:408
msgid "Initializing package states"
msgstr "Inicjalizacja stanw pakietw"
-#: src/generic/apt/aptcache.cc:530
+#: src/generic/apt/aptcache.cc:533
msgid "Cannot open Aptitude state file"
msgstr "Nie mona otworzy informacji o stanie"
-#: src/generic/apt/aptcache.cc:534 src/generic/apt/aptcache.cc:589
-#: src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:537 src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:595
msgid "Writing extended state information"
msgstr "Zapisywanie dodatkowych informacji o stanie"
-#: src/generic/apt/aptcache.cc:571
+#: src/generic/apt/aptcache.cc:574
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr "Przepenienie bufora przy zapisie informacji o stanie pakietu \"%s\""
-#: src/generic/apt/aptcache.cc:580
+#: src/generic/apt/aptcache.cc:583
msgid "Couldn't write state file"
msgstr "Nie mona zapisa informacji o stanie"
-#: src/generic/apt/aptcache.cc:597
+#: src/generic/apt/aptcache.cc:600
msgid "Error writing state file"
msgstr "Bd w czasie zapisu informacji o stanie"
-#: src/generic/apt/aptcache.cc:615
+#: src/generic/apt/aptcache.cc:618
#, fuzzy, c-format
msgid "failed to remove %s"
msgstr "Nie mona otworzy %s"
-#: src/generic/apt/aptcache.cc:622
+#: src/generic/apt/aptcache.cc:625
#, c-format
msgid "failed to rename %s to %s"
msgstr ""
-#: src/generic/apt/aptcache.cc:630
+#: src/generic/apt/aptcache.cc:633
#, fuzzy, c-format
msgid "couldn't replace %s with %s"
msgstr "nie mona zastpi starego pliku stanu"
-#: src/generic/apt/aptcache.cc:1122
+#: src/generic/apt/aptcache.cc:1125
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr ""
"Nie mona poprawi zalenoci, cz pakietw nie moe by zainstalowana"
-#: src/generic/apt/aptcache.cc:1526
+#: src/generic/apt/aptcache.cc:1600
msgid "The list of sources could not be read."
msgstr "Nie mona odczyta listy rde."
-#: src/generic/apt/aptcache.cc:1533
+#: src/generic/apt/aptcache.cc:1607
msgid "The package lists or status file could not be parsed or opened."
msgstr "Nie udao si odczyta lub przetworzy list pakietw lub pliku stanu."
-#: src/generic/apt/aptcache.cc:1536
+#: src/generic/apt/aptcache.cc:1610
msgid "You may want to update the package lists to correct these missing files"
msgstr "Mona uaktualni listy pakietw aby uzupeni brakujce pliki"
@@ -3854,12 +3855,12 @@ msgstr ""
"%s jest istotnym pakietem!%n%nCzy na pewno chcesz go usun?%nJeli tak, "
"wpisz '%s'."
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:284
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:291
#, c-format
msgid "Information about %s"
msgstr "Informacje o %s"
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:282
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:289
#, c-format
msgid "%s info"
msgstr "Informacje o %s"
@@ -4201,7 +4202,7 @@ msgstr ""
"Nastpujce pakiety wymagaj wersji %B%s%b pakietu %B%s%b i bd miay "
"niespenione zalenoci jeli zostanie %s."
-#: src/solution_dialog.cc:91 src/solution_screen.cc:457
+#: src/solution_dialog.cc:91 src/solution_screen.cc:465
msgid "The package cache is not available."
msgstr "Informacje o pakietach s niedostpne."
@@ -4209,11 +4210,11 @@ msgstr "Informacje o pakietach s niedostpne."
msgid "No packages are broken."
msgstr "Nie ma pakietw z niespenionymi zalenociami."
-#: src/solution_dialog.cc:108 src/solution_screen.cc:479
+#: src/solution_dialog.cc:108 src/solution_screen.cc:488
msgid "No resolution found."
msgstr "Nie znaleziono rozwizania."
-#: src/solution_dialog.cc:114 src/solution_screen.cc:490
+#: src/solution_dialog.cc:114 src/solution_screen.cc:499
#, fuzzy
msgid "Resolving dependencies..."
msgstr "Nie mona naprawi zalenoci."
@@ -4249,7 +4250,7 @@ msgstr "wymaga wstpnie"
msgid "%s suggests %s"
msgstr "sugeruje"
-#: src/solution_fragment.cc:113 src/solution_item.cc:583
+#: src/solution_fragment.cc:113 src/solution_item.cc:593
#, fuzzy, c-format
msgid "%s recommends %s"
msgstr "poleca"
@@ -4353,7 +4354,7 @@ msgstr ""
msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgstr "Pobrano %sB w %s (%sB/s)."
-#: src/solution_item.cc:587
+#: src/solution_item.cc:597
#, fuzzy, c-format
msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
msgstr "%BUsunicie%b nastpujcych pakietw:%n"
@@ -4393,7 +4394,7 @@ msgstr "%BCofnicie%b nastpujcych pakietw do wczeniejszych wersji:%n"
msgid "Leave the following recommendations unresolved:"
msgstr "%BUsunicie%b nastpujcych pakietw:%n"
-#: src/solution_screen.cc:463
+#: src/solution_screen.cc:472
#, fuzzy
msgid "No broken packages."
msgstr "\"-\": usunicie pakietw"
diff --git a/po/pt.po b/po/pt.po
index ae575be8..f53bce9e 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
-"POT-Creation-Date: 2005-11-07 15:22-0800\n"
+"POT-Creation-Date: 2005-11-13 10:12-0800\n"
"PO-Revision-Date: 2005-09-04 16:23+0200\n"
"Last-Translator: Miguel Figueiredo <elmig@debianPT.org>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -210,7 +210,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
msgstr "Resolver Dependências."
#: src/broken_indicator.cc:273 src/solution_dialog.cc:126
-#: src/solution_screen.cc:513
+#: src/solution_screen.cc:522
msgid "Internal error: unexpected null solution."
msgstr "Erro interno: solução nula não esperada."
@@ -812,39 +812,39 @@ msgstr ""
"pacotes (ou padrões). A acção será aplicada a todos os pacotes que você "
"listar. Estão disponíveis as seguintes acções:"
-#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:167
+#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:184
msgid "'+' to install packages"
msgstr "'+' para instalar pacotes"
-#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:186
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
msgstr ""
"'+M' para instalar pacotes e imediatamente marca-los como automaticamente "
"instalados"
-#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:171
+#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:188
msgid "'-' to remove packages"
msgstr "'-' para remover pacotes"
-#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:173
+#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:190
msgid "'_' to purge packages"
msgstr "'_' para purgar pacotes"
-#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:175
+#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:192
msgid "'=' to place packages on hold"
msgstr "'=' para colocar pacotes em hold"
-#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:177
+#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:194
msgid ""
"':' to keep packages in their current state without placing them on hold"
msgstr "':' para manter os pacotes no seu estado actual sem os colocar em hold"
-#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:179
+#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:196
msgid "'&M' to mark packages as automatically installed"
msgstr "'&M' para marcar pacotes como automaticamente instalados"
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:181
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:198
msgid "'&m' to mark packages as manually installed"
msgstr "'&m' para marcar pacotes como manualmente instalados"
@@ -929,7 +929,22 @@ msgstr ""
"Resposta inválida. Por favor, introduza um comando válido ou '?' para "
"ajuda.\n"
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_resolver.cc:124 src/cmdline/cmdline_resolver.cc:597
+#: src/generic/apt/apt.cc:199
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "Não foi possível abrir %s para gravação"
+
+#: src/cmdline/cmdline_resolver.cc:130 src/cmdline/cmdline_resolver.cc:602
+#, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Erro ao escrever o estado do resolver para %s"
+
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:604
+msgid "Resolver state successfully written!"
+msgstr "Estado do resolver escrito com sucesso!"
+
+#: src/cmdline/cmdline_resolver.cc:145
#, c-format
msgid ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
@@ -938,35 +953,35 @@ msgstr ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %fr: pkg ver ...: %F%na pkg ver ...: %F%"
"n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:164
msgid "accept the proposed changes"
msgstr "aceitar as alterações propostas"
-#: src/cmdline/cmdline_resolver.cc:149
+#: src/cmdline/cmdline_resolver.cc:166
msgid "reject the proposed changes and search for another solution"
msgstr "rejeitar as alterações propostas e pesquisar por outra solução"
-#: src/cmdline/cmdline_resolver.cc:151
+#: src/cmdline/cmdline_resolver.cc:168
msgid "give up and quit the program"
msgstr "desisitir e sair do programa"
-#: src/cmdline/cmdline_resolver.cc:153
+#: src/cmdline/cmdline_resolver.cc:170
msgid "move to the next solution"
msgstr "ir para a próxima solução"
-#: src/cmdline/cmdline_resolver.cc:155
+#: src/cmdline/cmdline_resolver.cc:172
msgid "move to the previous solution"
msgstr "ir para a solução anterior"
-#: src/cmdline/cmdline_resolver.cc:157
+#: src/cmdline/cmdline_resolver.cc:174
msgid "view an explanation of the changes in the solution"
msgstr "ver uma explicação das mudanças na solução"
-#: src/cmdline/cmdline_resolver.cc:159
+#: src/cmdline/cmdline_resolver.cc:176
msgid "examine the solution in the visual user interface"
msgstr "examinar a solução no interface visual do utilizador"
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:178
msgid ""
"reject the given package versions; don't display any solutions in which they "
"occur."
@@ -974,7 +989,7 @@ msgstr ""
"rejeitar as dadas versões do pacote; não mostrar qualquer solução na qual "
"elas ocorram."
-#: src/cmdline/cmdline_resolver.cc:163
+#: src/cmdline/cmdline_resolver.cc:180
msgid ""
"accept the given package versions; display only solutions in which they "
"occur."
@@ -982,11 +997,11 @@ msgstr ""
"aceitar as dadas versões do pacote; mostrar apenas soluções nas quais estas "
"ocorram."
-#: src/cmdline/cmdline_resolver.cc:165
+#: src/cmdline/cmdline_resolver.cc:182
msgid "adjust the state of the listed packages, where ACTION is one of:"
msgstr "ajustar o estado dos pacotes listados, onde ACÇÃO é um de:"
-#: src/cmdline/cmdline_resolver.cc:183
+#: src/cmdline/cmdline_resolver.cc:200
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
@@ -994,137 +1009,123 @@ msgstr ""
"Ajustes irão causar que a solução actual seja descartada e recalculada "
"conforme necessário."
-#: src/cmdline/cmdline_resolver.cc:197
+#: src/cmdline/cmdline_resolver.cc:214
#, c-format
msgid "The version %s is available in the following archives:"
msgstr "A versão %s está disponível nos seguintes arquivos:"
-#: src/cmdline/cmdline_resolver.cc:205
+#: src/cmdline/cmdline_resolver.cc:222
#, c-format
msgid "Select the version of %s that should be used: "
msgstr "Escolha a versão de %s que deve ser utilizada: "
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:229
#, c-format
msgid "Invalid response. Please enter an integer between 1 and %d."
msgstr "Resposta inválida; Por favor introduza um inteiro entre 1 e %d."
-#: src/cmdline/cmdline_resolver.cc:227
+#: src/cmdline/cmdline_resolver.cc:244
#, c-format
msgid "Expected at least one package/version pair following '%c'"
msgstr "É esperado pelo menos um par pacote/versão seguindo '%c'"
-#: src/cmdline/cmdline_resolver.cc:241
+#: src/cmdline/cmdline_resolver.cc:258
#, c-format
msgid "Expected a version after \"%s\""
msgstr "Nãperada uma versão após \"%s\""
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:268
#, c-format
msgid "No such package \"%s\""
msgstr "Sem nenhum pacote \"%s\""
-#: src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_resolver.cc:284
#, c-format
msgid "%s has no version named \"%s\""
msgstr "%s não tem nenhuma versão chamada \"%s\""
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:301
#, c-format
msgid "Allowing the removal of %s"
msgstr "Permitir a remoção de %s"
-#: src/cmdline/cmdline_resolver.cc:287
+#: src/cmdline/cmdline_resolver.cc:304
#, c-format
msgid "Allowing the installation of %s version %s (%s)"
msgstr "Permitir a instalação de %s versão %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:314
#, c-format
msgid "Rejecting the removal of %s"
msgstr "Rejeitar a remoção de %s"
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:317
#, c-format
msgid "Rejecting the installation of %s version %s (%s)"
msgstr "Rejeitar a instalação de %s versão %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:330
#, c-format
msgid "No longer requiring the removal of %s"
msgstr "Já não é necessária a remoção de %s"
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:333
#, c-format
msgid "No longer requiring the installation of %s version %s (%s)"
msgstr "Já não é necessária a instalação de %s versão %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:325
+#: src/cmdline/cmdline_resolver.cc:342
#, c-format
msgid "Requiring the removal of %s"
msgstr "Requer a remoção de %s"
-#: src/cmdline/cmdline_resolver.cc:328
+#: src/cmdline/cmdline_resolver.cc:345
#, c-format
msgid "Requiring the installation of %s version %s (%s)"
msgstr "Requer a instalação de %s versão %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:447 src/solution_screen.cc:486
+#: src/cmdline/cmdline_resolver.cc:464 src/solution_screen.cc:495
#, c-format
msgid "open: %d; closed: %d; defer: %d; conflict: %d"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:493
+#: src/cmdline/cmdline_resolver.cc:510
msgid "The following actions will resolve these dependencies:"
msgstr "As seguintes acções irão resolver estas dependências:"
-#: src/cmdline/cmdline_resolver.cc:508
+#: src/cmdline/cmdline_resolver.cc:525
msgid "Accept this solution? [Y/n/q/?] "
msgstr "Aceitar esta solução? [Y/n/q?] "
-#: src/cmdline/cmdline_resolver.cc:535 src/cmdline/cmdline_resolver.cc:627
+#: src/cmdline/cmdline_resolver.cc:552 src/cmdline/cmdline_resolver.cc:644
msgid "Abandoning all efforts to resolve these dependencies."
msgstr "Abandonar todos os esforços para resolver estas dependências."
-#: src/cmdline/cmdline_resolver.cc:562
+#: src/cmdline/cmdline_resolver.cc:579
msgid "The following commands are available:"
msgstr "Estão disponíveis os seguintes comandos:"
-#: src/cmdline/cmdline_resolver.cc:577
+#: src/cmdline/cmdline_resolver.cc:594
msgid "File to write resolver state to: "
msgstr "Ficheiro para onde escrever o estado: "
-#: src/cmdline/cmdline_resolver.cc:580 src/generic/apt/apt.cc:199
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Não foi possível abrir %s para gravação"
-
-#: src/cmdline/cmdline_resolver.cc:585
-#, c-format
-msgid "Error writing resolver state to %s"
-msgstr "Erro ao escrever o estado do resolver para %s"
-
-#: src/cmdline/cmdline_resolver.cc:587
-msgid "Resolver state successfully written!"
-msgstr "Estado do resolver escrito com sucesso!"
-
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:609
msgid "Invalid response; please enter one of the following commands:"
msgstr "Resposta inválida; por favor introduza um dos seguintes comandos:"
-#: src/cmdline/cmdline_resolver.cc:602
+#: src/cmdline/cmdline_resolver.cc:619
msgid "No solution found within the allotted time. Try harder? [Y/n]"
msgstr "Sem solução encontrada dentro do tempo alocado. Tentar melhor? [Y/n]"
-#: src/cmdline/cmdline_resolver.cc:630
+#: src/cmdline/cmdline_resolver.cc:647
msgid "Invalid response; please enter 'y' or 'n'."
msgstr "Resposta inválida; por favor introduza 'y' ou 'n'."
-#: src/cmdline/cmdline_resolver.cc:639
+#: src/cmdline/cmdline_resolver.cc:656
msgid "Unable to resolve dependencies! Giving up..."
msgstr "Não foi possível resolver dependências! A desistir..."
-#: src/cmdline/cmdline_resolver.cc:645
+#: src/cmdline/cmdline_resolver.cc:662
#, fuzzy
msgid "*** No more solutions available ***"
msgstr "Sem mais soluções."
@@ -1543,66 +1544,66 @@ msgstr "Não foi possível abrir o ficheiro de estados extendido do Aptitude"
msgid "Reading extended state information"
msgstr "A ler informações extendidas de estado"
-#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:403
-#: src/generic/apt/aptcache.cc:406
+#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:405
+#: src/generic/apt/aptcache.cc:408
msgid "Initializing package states"
msgstr "A inicializar os estados dos pacotes"
-#: src/generic/apt/aptcache.cc:530
+#: src/generic/apt/aptcache.cc:533
msgid "Cannot open Aptitude state file"
msgstr "Não foi possível abrir o ficheiro de estados do Aptitude"
-#: src/generic/apt/aptcache.cc:534 src/generic/apt/aptcache.cc:589
-#: src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:537 src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:595
msgid "Writing extended state information"
msgstr "A gravar informações extendidas de estado"
-#: src/generic/apt/aptcache.cc:571
+#: src/generic/apt/aptcache.cc:574
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr ""
"Buffer overflow interno no pacote \"%s\" ao escrever o ficheiro de estado"
-#: src/generic/apt/aptcache.cc:580
+#: src/generic/apt/aptcache.cc:583
msgid "Couldn't write state file"
msgstr "Não foi possível escrever o ficheiro de estado"
-#: src/generic/apt/aptcache.cc:597
+#: src/generic/apt/aptcache.cc:600
msgid "Error writing state file"
msgstr "Erro ao escrever o ficheiro do estado"
-#: src/generic/apt/aptcache.cc:615
+#: src/generic/apt/aptcache.cc:618
#, fuzzy, c-format
msgid "failed to remove %s"
msgstr "Não foi possível abrir %ls"
-#: src/generic/apt/aptcache.cc:622
+#: src/generic/apt/aptcache.cc:625
#, c-format
msgid "failed to rename %s to %s"
msgstr ""
-#: src/generic/apt/aptcache.cc:630
+#: src/generic/apt/aptcache.cc:633
#, fuzzy, c-format
msgid "couldn't replace %s with %s"
msgstr "não foi possível substituir o antigo ficheiro de estado"
-#: src/generic/apt/aptcache.cc:1122
+#: src/generic/apt/aptcache.cc:1125
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr ""
"Não foi possível corrigir as dependências, alguns pacotes não podem ser "
"instalados"
-#: src/generic/apt/aptcache.cc:1526
+#: src/generic/apt/aptcache.cc:1600
msgid "The list of sources could not be read."
msgstr "A lista de fontes não pode ser lida."
-#: src/generic/apt/aptcache.cc:1533
+#: src/generic/apt/aptcache.cc:1607
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
"As listas de pacotes ou o ficheiro de estado não pode ser interpretado ou "
"aberto."
-#: src/generic/apt/aptcache.cc:1536
+#: src/generic/apt/aptcache.cc:1610
msgid "You may want to update the package lists to correct these missing files"
msgstr ""
"Pode querer actualizar as listas de pacotes para corrigir os ficheiros em "
@@ -3912,12 +3913,12 @@ msgstr ""
"%s é um pacote essencial!%n%nTem certeza de que deseja removê-lo?%nDigite '%"
"s' se tiver a certeza."
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:284
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:291
#, c-format
msgid "Information about %s"
msgstr "Informação sobre %s"
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:282
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:289
#, c-format
msgid "%s info"
msgstr "info %s"
@@ -4255,7 +4256,7 @@ msgstr ""
"Os pacotes seguintes dependem da versão %B%s%b de %B%s%b, e ficarão "
"quebrados se for %s."
-#: src/solution_dialog.cc:91 src/solution_screen.cc:457
+#: src/solution_dialog.cc:91 src/solution_screen.cc:465
msgid "The package cache is not available."
msgstr "Não está disponível a cache de pacotes."
@@ -4263,11 +4264,11 @@ msgstr "Não está disponível a cache de pacotes."
msgid "No packages are broken."
msgstr "Nenhum pacote está estragado."
-#: src/solution_dialog.cc:108 src/solution_screen.cc:479
+#: src/solution_dialog.cc:108 src/solution_screen.cc:488
msgid "No resolution found."
msgstr "Não foi encontrada nenhuma resolução."
-#: src/solution_dialog.cc:114 src/solution_screen.cc:490
+#: src/solution_dialog.cc:114 src/solution_screen.cc:499
#, fuzzy
msgid "Resolving dependencies..."
msgstr "Resolver Dependências."
@@ -4303,7 +4304,7 @@ msgstr "%s pré-depende de %s"
msgid "%s suggests %s"
msgstr "%s sugere %s"
-#: src/solution_fragment.cc:113 src/solution_item.cc:583
+#: src/solution_fragment.cc:113 src/solution_item.cc:593
#, c-format
msgid "%s recommends %s"
msgstr "%s recomenda %s"
@@ -4407,7 +4408,7 @@ msgstr ""
msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgstr "Foi feito o download de %sB em %s (%sB/s)."
-#: src/solution_item.cc:587
+#: src/solution_item.cc:597
#, fuzzy, c-format
msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
msgstr "Deixar as seguintes dependências não resolvidas:%n"
@@ -4447,7 +4448,7 @@ msgstr "%BDowngrade%b dos seguintes pacotes:%n"
msgid "Leave the following recommendations unresolved:"
msgstr "Deixar as seguintes dependências não resolvidas:%n"
-#: src/solution_screen.cc:463
+#: src/solution_screen.cc:472
#, fuzzy
msgid "No broken packages."
msgstr "'-' para remover pacotes"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 53f44ad9..03306eae 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
-"POT-Creation-Date: 2005-11-07 15:22-0800\n"
+"POT-Creation-Date: 2005-11-13 10:12-0800\n"
"PO-Revision-Date: 2005-05-18 11:23-0300\n"
"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -208,7 +208,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
msgstr "Não foi possível abrir %s para gravação"
#: src/broken_indicator.cc:273 src/solution_dialog.cc:126
-#: src/solution_screen.cc:513
+#: src/solution_screen.cc:522
msgid "Internal error: unexpected null solution."
msgstr ""
@@ -810,44 +810,44 @@ msgid ""
"The following actions are available:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:167
+#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:184
#, fuzzy
msgid "'+' to install packages"
msgstr "^Instalar/remover pacotes"
-#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:186
#, fuzzy
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
msgstr "Os NOVOS pacotes a seguir serão automaticamente instalados:"
-#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:171
+#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:188
#, fuzzy
msgid "'-' to remove packages"
msgstr "^Instalar/remover pacotes"
-#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:173
+#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:190
#, fuzzy
msgid "'_' to purge packages"
msgstr "^F Esquecer novos pacotes"
-#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:175
+#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:192
#, fuzzy
msgid "'=' to place packages on hold"
msgstr " hold - Manter pacotes na versão atual\n"
-#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:177
+#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:194
msgid ""
"':' to keep packages in their current state without placing them on hold"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:179
+#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:196
#, fuzzy
msgid "'&M' to mark packages as automatically installed"
msgstr ""
" markauto - Marcar pacotes como tendo sido automaticamente instalados\n"
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:181
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:198
#, fuzzy
msgid "'&m' to mark packages as manually installed"
msgstr ""
@@ -934,203 +934,204 @@ msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr ""
"Resposta inválida. Por favor, informe um comando válido ou '?' para ajuda.\n"
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_resolver.cc:124 src/cmdline/cmdline_resolver.cc:597
+#: src/generic/apt/apt.cc:199
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "Não foi possível abrir %s para gravação"
+
+#: src/cmdline/cmdline_resolver.cc:130 src/cmdline/cmdline_resolver.cc:602
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Erro ao gravar o arquivo de estado"
+
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:604
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:145
#, c-format
msgid ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
"n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:164
msgid "accept the proposed changes"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:149
+#: src/cmdline/cmdline_resolver.cc:166
msgid "reject the proposed changes and search for another solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:151
+#: src/cmdline/cmdline_resolver.cc:168
#, fuzzy
msgid "give up and quit the program"
msgstr "Sair do programa"
-#: src/cmdline/cmdline_resolver.cc:153
+#: src/cmdline/cmdline_resolver.cc:170
msgid "move to the next solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:155
+#: src/cmdline/cmdline_resolver.cc:172
msgid "move to the previous solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:157
+#: src/cmdline/cmdline_resolver.cc:174
msgid "view an explanation of the changes in the solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:159
+#: src/cmdline/cmdline_resolver.cc:176
#, fuzzy
msgid "examine the solution in the visual user interface"
msgstr "Muda as configurações que afetam a interface do usuário"
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:178
msgid ""
"reject the given package versions; don't display any solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:163
+#: src/cmdline/cmdline_resolver.cc:180
msgid ""
"accept the given package versions; display only solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:165
+#: src/cmdline/cmdline_resolver.cc:182
msgid "adjust the state of the listed packages, where ACTION is one of:"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:183
+#: src/cmdline/cmdline_resolver.cc:200
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:197
+#: src/cmdline/cmdline_resolver.cc:214
#, c-format
msgid "The version %s is available in the following archives:"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:205
+#: src/cmdline/cmdline_resolver.cc:222
#, c-format
msgid "Select the version of %s that should be used: "
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:229
#, fuzzy, c-format
msgid "Invalid response. Please enter an integer between 1 and %d."
msgstr ""
"Resposta inválida. Por favor, informe um comando válido ou '?' para ajuda.\n"
-#: src/cmdline/cmdline_resolver.cc:227
+#: src/cmdline/cmdline_resolver.cc:244
#, c-format
msgid "Expected at least one package/version pair following '%c'"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:241
+#: src/cmdline/cmdline_resolver.cc:258
#, fuzzy, c-format
msgid "Expected a version after \"%s\""
msgstr "Não foi possível abrir %s para gravação"
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:268
#, fuzzy, c-format
msgid "No such package \"%s\""
msgstr "Pacote Fonte: "
-#: src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_resolver.cc:284
#, c-format
msgid "%s has no version named \"%s\""
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:301
#, c-format
msgid "Allowing the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:287
+#: src/cmdline/cmdline_resolver.cc:304
#, c-format
msgid "Allowing the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:314
#, c-format
msgid "Rejecting the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:317
#, c-format
msgid "Rejecting the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:330
#, c-format
msgid "No longer requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:333
#, c-format
msgid "No longer requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:325
+#: src/cmdline/cmdline_resolver.cc:342
#, c-format
msgid "Requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:328
+#: src/cmdline/cmdline_resolver.cc:345
#, c-format
msgid "Requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:447 src/solution_screen.cc:486
+#: src/cmdline/cmdline_resolver.cc:464 src/solution_screen.cc:495
#, c-format
msgid "open: %d; closed: %d; defer: %d; conflict: %d"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:493
+#: src/cmdline/cmdline_resolver.cc:510
#, fuzzy
msgid "The following actions will resolve these dependencies:"
msgstr "Os pacotes a seguir possuem dependências não satisfeitas :\n"
-#: src/cmdline/cmdline_resolver.cc:508
+#: src/cmdline/cmdline_resolver.cc:525
msgid "Accept this solution? [Y/n/q/?] "
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:535 src/cmdline/cmdline_resolver.cc:627
+#: src/cmdline/cmdline_resolver.cc:552 src/cmdline/cmdline_resolver.cc:644
msgid "Abandoning all efforts to resolve these dependencies."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:562
+#: src/cmdline/cmdline_resolver.cc:579
#, fuzzy
msgid "The following commands are available:"
msgstr "Os pacotes a seguir estão QUEBRADOS :"
-#: src/cmdline/cmdline_resolver.cc:577
+#: src/cmdline/cmdline_resolver.cc:594
msgid "File to write resolver state to: "
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:580 src/generic/apt/apt.cc:199
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Não foi possível abrir %s para gravação"
-
-#: src/cmdline/cmdline_resolver.cc:585
-#, fuzzy, c-format
-msgid "Error writing resolver state to %s"
-msgstr "Erro ao gravar o arquivo de estado"
-
-#: src/cmdline/cmdline_resolver.cc:587
-msgid "Resolver state successfully written!"
-msgstr ""
-
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:609
#, fuzzy
msgid "Invalid response; please enter one of the following commands:"
msgstr ""
"Resposta inválida. Por favor, informe um comando válido ou '?' para ajuda.\n"
-#: src/cmdline/cmdline_resolver.cc:602
+#: src/cmdline/cmdline_resolver.cc:619
msgid "No solution found within the allotted time. Try harder? [Y/n]"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:630
+#: src/cmdline/cmdline_resolver.cc:647
#, fuzzy
msgid "Invalid response; please enter 'y' or 'n'."
msgstr ""
"Resposta inválida. Por favor, informe um comando válido ou '?' para ajuda.\n"
-#: src/cmdline/cmdline_resolver.cc:639
+#: src/cmdline/cmdline_resolver.cc:656
msgid "Unable to resolve dependencies! Giving up..."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:645
+#: src/cmdline/cmdline_resolver.cc:662
msgid "*** No more solutions available ***"
msgstr ""
@@ -1550,66 +1551,66 @@ msgstr "Não foi possível abrir o arquivo de estado extendido do Aptitude"
msgid "Reading extended state information"
msgstr "Lendo informações extendidas de estado"
-#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:403
-#: src/generic/apt/aptcache.cc:406
+#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:405
+#: src/generic/apt/aptcache.cc:408
msgid "Initializing package states"
msgstr "Inicializando estados de pacotes"
-#: src/generic/apt/aptcache.cc:530
+#: src/generic/apt/aptcache.cc:533
msgid "Cannot open Aptitude state file"
msgstr "Não foi possível abrir o arquivo de estado do Aptitude"
-#: src/generic/apt/aptcache.cc:534 src/generic/apt/aptcache.cc:589
-#: src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:537 src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:595
msgid "Writing extended state information"
msgstr "Gravando informações extendidas de estado"
-#: src/generic/apt/aptcache.cc:571
+#: src/generic/apt/aptcache.cc:574
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr ""
"Estouro de pilha interno no pacote \"%s\" na gravação do arquivo de estado"
-#: src/generic/apt/aptcache.cc:580
+#: src/generic/apt/aptcache.cc:583
msgid "Couldn't write state file"
msgstr "Não foi possível gravar o arquivo de estado"
-#: src/generic/apt/aptcache.cc:597
+#: src/generic/apt/aptcache.cc:600
msgid "Error writing state file"
msgstr "Erro ao gravar o arquivo de estado"
-#: src/generic/apt/aptcache.cc:615
+#: src/generic/apt/aptcache.cc:618
#, fuzzy, c-format
msgid "failed to remove %s"
msgstr "Não foi possível abrir %s para gravação"
-#: src/generic/apt/aptcache.cc:622
+#: src/generic/apt/aptcache.cc:625
#, c-format
msgid "failed to rename %s to %s"
msgstr ""
-#: src/generic/apt/aptcache.cc:630
+#: src/generic/apt/aptcache.cc:633
#, fuzzy, c-format
msgid "couldn't replace %s with %s"
msgstr "não foi possível substituir o antigo arquivo de estado"
-#: src/generic/apt/aptcache.cc:1122
+#: src/generic/apt/aptcache.cc:1125
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr ""
"Não foi possível corrigir as dependências, alguns pacotes não puderam ser "
"instalados"
-#: src/generic/apt/aptcache.cc:1526
+#: src/generic/apt/aptcache.cc:1600
msgid "The list of sources could not be read."
msgstr "A lista de fontes não pôde ser lida."
-#: src/generic/apt/aptcache.cc:1533
+#: src/generic/apt/aptcache.cc:1607
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
"As listas de pacote ou o arquivo de estado não pode ser interpretado ou "
"aberto."
-#: src/generic/apt/aptcache.cc:1536
+#: src/generic/apt/aptcache.cc:1610
msgid "You may want to update the package lists to correct these missing files"
msgstr ""
"Você precisa atualizar as listas de pacotes para corrigir esses arquivos que "
@@ -3934,12 +3935,12 @@ msgstr ""
"Você tem certeza de que deseja removê-lo?\n"
"Digite '%s' caso você tenha certeza disso."
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:284
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:291
#, c-format
msgid "Information about %s"
msgstr "Informação sobre %s"
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:282
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:289
#, c-format
msgid "%s info"
msgstr ""
@@ -4282,7 +4283,7 @@ msgstr ""
"Os pacotes a seguir dependem da versão %B%s%b de %B%s%b e serã quebrados "
"caso a mesma seja %s."
-#: src/solution_dialog.cc:91 src/solution_screen.cc:457
+#: src/solution_dialog.cc:91 src/solution_screen.cc:465
msgid "The package cache is not available."
msgstr ""
@@ -4291,11 +4292,11 @@ msgstr ""
msgid "No packages are broken."
msgstr "Alguns pacotes estão quebrados. Deseja tentar consertá-los?"
-#: src/solution_dialog.cc:108 src/solution_screen.cc:479
+#: src/solution_dialog.cc:108 src/solution_screen.cc:488
msgid "No resolution found."
msgstr ""
-#: src/solution_dialog.cc:114 src/solution_screen.cc:490
+#: src/solution_dialog.cc:114 src/solution_screen.cc:499
#, fuzzy
msgid "Resolving dependencies..."
msgstr "Não foi possível abrir %s para gravação"
@@ -4334,7 +4335,7 @@ msgstr "pré-depende de"
msgid "%s suggests %s"
msgstr "sugere"
-#: src/solution_fragment.cc:113 src/solution_item.cc:583
+#: src/solution_fragment.cc:113 src/solution_item.cc:593
#, fuzzy, c-format
msgid "%s recommends %s"
msgstr "recomenda"
@@ -4443,7 +4444,7 @@ msgstr ""
msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgstr "Baixados %sB em %s (%sB/s)."
-#: src/solution_item.cc:587
+#: src/solution_item.cc:597
#, fuzzy, c-format
msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
msgstr "Os pacotes a seguir estão QUEBRADOS :"
@@ -4483,7 +4484,7 @@ msgstr "Fazendo download de pacotes"
msgid "Leave the following recommendations unresolved:"
msgstr "Os pacotes a seguir estão QUEBRADOS :"
-#: src/solution_screen.cc:463
+#: src/solution_screen.cc:472
#, fuzzy
msgid "No broken packages."
msgstr "^Instalar/remover pacotes"
diff --git a/po/ro.po b/po/ro.po
index cdda6bef..17895b20 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ro\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
-"POT-Creation-Date: 2005-11-07 15:22-0800\n"
+"POT-Creation-Date: 2005-11-13 10:12-0800\n"
"PO-Revision-Date: 2005-10-24 17:16+0300\n"
"Last-Translator: Sorin Batariuc <sorin@bonbon.net>\n"
"Language-Team: Romanian <debian-l10-romanian@lists.debian.org>\n"
@@ -208,7 +208,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] Se rezolvă dependenţele"
#: src/broken_indicator.cc:273 src/solution_dialog.cc:126
-#: src/solution_screen.cc:513
+#: src/solution_screen.cc:522
msgid "Internal error: unexpected null solution."
msgstr "Eroare internă: soluţie nulă neaşteptată"
@@ -817,41 +817,41 @@ msgstr ""
"de pachete (sau căi). Acţiunea va fi aplicată tuturor pachetelor pe care le-"
"aţi listat. Sunt disponibile următoarele acţiuni:"
-#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:167
+#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:184
msgid "'+' to install packages"
msgstr "'+' pentru a instala pachete"
-#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:186
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
msgstr ""
"'+M' pentru a instala pachetele şi a le marca imediat ca fiind instalate "
"automat"
-#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:171
+#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:188
msgid "'-' to remove packages"
msgstr "'-' pentru a şterge pachete"
-#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:173
+#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:190
msgid "'_' to purge packages"
msgstr "'-' pentru a curăţa pachete"
-#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:175
+#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:192
msgid "'=' to place packages on hold"
msgstr "'=' pentru a pune pachetele în aşteptare"
-#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:177
+#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:194
msgid ""
"':' to keep packages in their current state without placing them on hold"
msgstr ""
"':' pentru a ţine pachetele în starea lor curentă fără a le marca în "
"aşteptare"
-#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:179
+#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:196
msgid "'&M' to mark packages as automatically installed"
msgstr "'&M' pentru a marca pachetele ca fiind automat instalate"
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:181
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:198
msgid "'&m' to mark packages as manually installed"
msgstr "'&m'pentru a marca pachetele ca fiind instalate manual"
@@ -936,7 +936,22 @@ msgstr ""
"Răspuns nevalabil. Vă rog introduceţi o comandă valabilă sau '?' pentru "
"ajutor.\n"
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_resolver.cc:124 src/cmdline/cmdline_resolver.cc:597
+#: src/generic/apt/apt.cc:199
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "Nu pot deschide %s pentru scriere"
+
+#: src/cmdline/cmdline_resolver.cc:130 src/cmdline/cmdline_resolver.cc:602
+#, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Eroare în timpul scrierii fişierului de stare resolver în %s"
+
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:604
+msgid "Resolver state successfully written!"
+msgstr "S-a scris cu succes starea resolver!"
+
+#: src/cmdline/cmdline_resolver.cc:145
#, c-format
msgid ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
@@ -945,36 +960,36 @@ msgstr ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
"n<ACŢIUNE> pkg... : %F%n%F%F%F%F%F%F%F%F"
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:164
msgid "accept the proposed changes"
msgstr "acceptare a modificărilor propuse"
-#: src/cmdline/cmdline_resolver.cc:149
+#: src/cmdline/cmdline_resolver.cc:166
msgid "reject the proposed changes and search for another solution"
msgstr ""
"respingere a modificărilor propuse şi căutare pentru soluţie alternativă"
-#: src/cmdline/cmdline_resolver.cc:151
+#: src/cmdline/cmdline_resolver.cc:168
msgid "give up and quit the program"
msgstr "renunţare şi ieşire din program"
-#: src/cmdline/cmdline_resolver.cc:153
+#: src/cmdline/cmdline_resolver.cc:170
msgid "move to the next solution"
msgstr "mutare la soluţia următoare"
-#: src/cmdline/cmdline_resolver.cc:155
+#: src/cmdline/cmdline_resolver.cc:172
msgid "move to the previous solution"
msgstr "mutare la soluţia precedentă"
-#: src/cmdline/cmdline_resolver.cc:157
+#: src/cmdline/cmdline_resolver.cc:174
msgid "view an explanation of the changes in the solution"
msgstr "vizualizare în soluţie o detaliere a modificărilor"
-#: src/cmdline/cmdline_resolver.cc:159
+#: src/cmdline/cmdline_resolver.cc:176
msgid "examine the solution in the visual user interface"
msgstr "examinare a soluţiei în interfaţa utilizatorului vizuală"
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:178
msgid ""
"reject the given package versions; don't display any solutions in which they "
"occur."
@@ -982,7 +997,7 @@ msgstr ""
"respingerea versiunilor de pachete oferite; nu se afişează nici o soluţie în "
"care ele apar."
-#: src/cmdline/cmdline_resolver.cc:163
+#: src/cmdline/cmdline_resolver.cc:180
msgid ""
"accept the given package versions; display only solutions in which they "
"occur."
@@ -990,11 +1005,11 @@ msgstr ""
"se acceptă versiunile pachetelor oferite; se afişează doar soluţii în care "
"ele apar."
-#: src/cmdline/cmdline_resolver.cc:165
+#: src/cmdline/cmdline_resolver.cc:182
msgid "adjust the state of the listed packages, where ACTION is one of:"
msgstr "ajustarea stării pachetelor listate, unde ACŢIUNE este una din:"
-#: src/cmdline/cmdline_resolver.cc:183
+#: src/cmdline/cmdline_resolver.cc:200
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
@@ -1002,139 +1017,125 @@ msgstr ""
"Ajustarea va determina renunţarea soluţiei curente şi recalcularea acolo "
"unde este cazul."
-#: src/cmdline/cmdline_resolver.cc:197
+#: src/cmdline/cmdline_resolver.cc:214
#, c-format
msgid "The version %s is available in the following archives:"
msgstr "Versiunea %s este disponibilă în următoarele arhive:"
-#: src/cmdline/cmdline_resolver.cc:205
+#: src/cmdline/cmdline_resolver.cc:222
#, c-format
msgid "Select the version of %s that should be used: "
msgstr "Selectaţi versiunea lui %s care ar trebui folosită: "
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:229
#, c-format
msgid "Invalid response. Please enter an integer between 1 and %d."
msgstr "Răspuns nevalid. Vă rog introduceţi un număr întreg între 1 şi %d."
-#: src/cmdline/cmdline_resolver.cc:227
+#: src/cmdline/cmdline_resolver.cc:244
#, c-format
msgid "Expected at least one package/version pair following '%c'"
msgstr ""
"Se aşteaptă cel puţin o pereche pachet/versiune care să urmeze după '%c'"
-#: src/cmdline/cmdline_resolver.cc:241
+#: src/cmdline/cmdline_resolver.cc:258
#, c-format
msgid "Expected a version after \"%s\""
msgstr "Se aşteaptă o versiune după \"%s\""
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:268
#, c-format
msgid "No such package \"%s\""
msgstr "Nu există un astfel de pachet \"%s\""
-#: src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_resolver.cc:284
#, c-format
msgid "%s has no version named \"%s\""
msgstr "%s nu are nici o versiune numită \"%s\""
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:301
#, c-format
msgid "Allowing the removal of %s"
msgstr "Se permite ştergerea lui %s"
-#: src/cmdline/cmdline_resolver.cc:287
+#: src/cmdline/cmdline_resolver.cc:304
#, c-format
msgid "Allowing the installation of %s version %s (%s)"
msgstr "Se permite instalarea lui %s versiunea %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:314
#, c-format
msgid "Rejecting the removal of %s"
msgstr "Se respinge ştergerea lui %s"
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:317
#, c-format
msgid "Rejecting the installation of %s version %s (%s)"
msgstr "Se respinge instalarea lui %s versiunea %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:330
#, c-format
msgid "No longer requiring the removal of %s"
msgstr "Nu mai este nevoie de ştergerea lui %s"
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:333
#, c-format
msgid "No longer requiring the installation of %s version %s (%s)"
msgstr "Nu mai este nevoie de instalarea lui %s versiunea %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:325
+#: src/cmdline/cmdline_resolver.cc:342
#, c-format
msgid "Requiring the removal of %s"
msgstr "Se cere ştergerea lui %s"
-#: src/cmdline/cmdline_resolver.cc:328
+#: src/cmdline/cmdline_resolver.cc:345
#, c-format
msgid "Requiring the installation of %s version %s (%s)"
msgstr "Se cere instalarea lui %s versiunea %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:447 src/solution_screen.cc:486
+#: src/cmdline/cmdline_resolver.cc:464 src/solution_screen.cc:495
#, c-format
msgid "open: %d; closed: %d; defer: %d; conflict: %d"
msgstr "deschis: %d; închis: %d; amânat: %d; conflict: %d"
-#: src/cmdline/cmdline_resolver.cc:493
+#: src/cmdline/cmdline_resolver.cc:510
msgid "The following actions will resolve these dependencies:"
msgstr "Următoarele acţiuni vor rezolva aceste dependenţe:"
-#: src/cmdline/cmdline_resolver.cc:508
+#: src/cmdline/cmdline_resolver.cc:525
msgid "Accept this solution? [Y/n/q/?] "
msgstr "Acceptaţi această soluţie? [Y/n/q/?] "
-#: src/cmdline/cmdline_resolver.cc:535 src/cmdline/cmdline_resolver.cc:627
+#: src/cmdline/cmdline_resolver.cc:552 src/cmdline/cmdline_resolver.cc:644
msgid "Abandoning all efforts to resolve these dependencies."
msgstr "Se abandonează toate eforturile de a rezolva aceste dependenţe."
-#: src/cmdline/cmdline_resolver.cc:562
+#: src/cmdline/cmdline_resolver.cc:579
msgid "The following commands are available:"
msgstr "Următoarele comenzi sunt disponibile:"
-#: src/cmdline/cmdline_resolver.cc:577
+#: src/cmdline/cmdline_resolver.cc:594
msgid "File to write resolver state to: "
msgstr "Fişierul de scris starea resolver: "
-#: src/cmdline/cmdline_resolver.cc:580 src/generic/apt/apt.cc:199
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Nu pot deschide %s pentru scriere"
-
-#: src/cmdline/cmdline_resolver.cc:585
-#, c-format
-msgid "Error writing resolver state to %s"
-msgstr "Eroare în timpul scrierii fişierului de stare resolver în %s"
-
-#: src/cmdline/cmdline_resolver.cc:587
-msgid "Resolver state successfully written!"
-msgstr "S-a scris cu succes starea resolver!"
-
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:609
msgid "Invalid response; please enter one of the following commands:"
msgstr "Răspuns nevalabil; vă rog introduceţi una din următoarele comenzi:"
-#: src/cmdline/cmdline_resolver.cc:602
+#: src/cmdline/cmdline_resolver.cc:619
msgid "No solution found within the allotted time. Try harder? [Y/n]"
msgstr ""
"Nu s-a găsit nici o soluţie în timpul acordat. Încerc mai hotărât? [Y/n]"
-#: src/cmdline/cmdline_resolver.cc:630
+#: src/cmdline/cmdline_resolver.cc:647
msgid "Invalid response; please enter 'y' or 'n'."
msgstr "Răspuns nevalabil; vă rog introduceţi 'y' sau 'n'."
-#: src/cmdline/cmdline_resolver.cc:639
+#: src/cmdline/cmdline_resolver.cc:656
msgid "Unable to resolve dependencies! Giving up..."
msgstr "Nu pot rezolva dependenţele! Renunţ..."
-#: src/cmdline/cmdline_resolver.cc:645
+#: src/cmdline/cmdline_resolver.cc:662
msgid "*** No more solutions available ***"
msgstr "*** Nu mai sunt soluţii disponibile ***"
@@ -1551,64 +1552,64 @@ msgstr "Nu pot deschide fişierul extins de stare Aptitude"
msgid "Reading extended state information"
msgstr "Citire informaţii de stare extinsă"
-#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:403
-#: src/generic/apt/aptcache.cc:406
+#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:405
+#: src/generic/apt/aptcache.cc:408
msgid "Initializing package states"
msgstr "Iniţializarea stării pachetelor"
-#: src/generic/apt/aptcache.cc:530
+#: src/generic/apt/aptcache.cc:533
msgid "Cannot open Aptitude state file"
msgstr "Nu pot deschide fişierul de stare Aptitude"
-#: src/generic/apt/aptcache.cc:534 src/generic/apt/aptcache.cc:589
-#: src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:537 src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:595
msgid "Writing extended state information"
msgstr "Scriere informaţii de stare extinse"
-#: src/generic/apt/aptcache.cc:571
+#: src/generic/apt/aptcache.cc:574
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr ""
"Inundaţie internă la memoria tampon în pachetul \"%s\" în timp ce era scris "
"fişierul de stare"
-#: src/generic/apt/aptcache.cc:580
+#: src/generic/apt/aptcache.cc:583
msgid "Couldn't write state file"
msgstr "Nu pot scrie fişierul de stare"
-#: src/generic/apt/aptcache.cc:597
+#: src/generic/apt/aptcache.cc:600
msgid "Error writing state file"
msgstr "Eroare în timpul scrierii fişierului de stare"
-#: src/generic/apt/aptcache.cc:615
+#: src/generic/apt/aptcache.cc:618
#, c-format
msgid "failed to remove %s"
msgstr "eşuare în ştergerea %s"
-#: src/generic/apt/aptcache.cc:622
+#: src/generic/apt/aptcache.cc:625
#, c-format
msgid "failed to rename %s to %s"
msgstr "eşuare în redenumirea lui %s în %s"
-#: src/generic/apt/aptcache.cc:630
+#: src/generic/apt/aptcache.cc:633
#, c-format
msgid "couldn't replace %s with %s"
msgstr "nu pot înlocui %s cu %s"
-#: src/generic/apt/aptcache.cc:1122
+#: src/generic/apt/aptcache.cc:1125
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr "Nu pot sa corectez dependenţele, unele pachete nu pot fi instalate"
-#: src/generic/apt/aptcache.cc:1526
+#: src/generic/apt/aptcache.cc:1600
msgid "The list of sources could not be read."
msgstr "Lista cu sursele nu poate fi citită."
-#: src/generic/apt/aptcache.cc:1533
+#: src/generic/apt/aptcache.cc:1607
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
"Listele cu pachete sau fişierul de stări nu pot fi analizate sau deschise."
-#: src/generic/apt/aptcache.cc:1536
+#: src/generic/apt/aptcache.cc:1610
msgid "You may want to update the package lists to correct these missing files"
msgstr ""
"Aţi putea dori să actualizaţi listele cu pachete pentru a corecta aceste "
@@ -3900,12 +3901,12 @@ msgstr ""
"%s este un pachet esenţial!%n%nSunteţi sigur că vreţi să-l ştergeţi?%"
"nTastaţi '%s' dacă sunteţi."
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:284
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:291
#, c-format
msgid "Information about %s"
msgstr "Informaţii despre %s"
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:282
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:289
#, c-format
msgid "%s info"
msgstr "%s info"
@@ -4242,7 +4243,7 @@ msgstr ""
"Următoarele pachete depind de versiunea %B%s%b a lui %B%s%b şi se vor "
"deteriora dacă este %s."
-#: src/solution_dialog.cc:91 src/solution_screen.cc:457
+#: src/solution_dialog.cc:91 src/solution_screen.cc:465
msgid "The package cache is not available."
msgstr "Cache-le pachetului nu este disponibil."
@@ -4250,11 +4251,11 @@ msgstr "Cache-le pachetului nu este disponibil."
msgid "No packages are broken."
msgstr "Nici un pachet nu este deteriorat."
-#: src/solution_dialog.cc:108 src/solution_screen.cc:479
+#: src/solution_dialog.cc:108 src/solution_screen.cc:488
msgid "No resolution found."
msgstr "Nici o rezoluţie găsită."
-#: src/solution_dialog.cc:114 src/solution_screen.cc:490
+#: src/solution_dialog.cc:114 src/solution_screen.cc:499
msgid "Resolving dependencies..."
msgstr "Se rezolvă dependenţele..."
@@ -4289,7 +4290,7 @@ msgstr "%s pre-depinde de %s"
msgid "%s suggests %s"
msgstr "%s sugerează %s"
-#: src/solution_fragment.cc:113 src/solution_item.cc:583
+#: src/solution_fragment.cc:113 src/solution_item.cc:593
#, c-format
msgid "%s recommends %s"
msgstr "%s recomandă %s"
@@ -4393,7 +4394,7 @@ msgstr "Se înnoieşte %F [%s (%s) -> %s (%s)]"
msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgstr "Se retrogradează %F [%s (%s) -> %s (%s)]"
-#: src/solution_item.cc:587
+#: src/solution_item.cc:597
#, c-format
msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
msgstr "-> Se lasă dependinţele nerezolvate \"%s recomandă %s\"."
@@ -4426,7 +4427,7 @@ msgstr "Se retrogradează următoarele pachetele:"
msgid "Leave the following recommendations unresolved:"
msgstr "Se lasă nerezolvate următoarele recomandări:"
-#: src/solution_screen.cc:463
+#: src/solution_screen.cc:472
msgid "No broken packages."
msgstr "Nici un pachet deteriorat."
diff --git a/po/ru.po b/po/ru.po
index 4fc429fb..652a1086 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude_po_ru\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
-"POT-Creation-Date: 2005-11-07 15:22-0800\n"
+"POT-Creation-Date: 2005-11-13 10:12-0800\n"
"PO-Revision-Date: 2005-10-24 19:38+0400\n"
"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -205,7 +205,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] Разрешение зависимостей"
#: src/broken_indicator.cc:273 src/solution_dialog.cc:126
-#: src/solution_screen.cc:513
+#: src/solution_screen.cc:522
msgid "Internal error: unexpected null solution."
msgstr "Внутренняя ошибка: неожиданно нет решения."
@@ -806,38 +806,38 @@ msgstr ""
"шаблоны). Действие будет выполнено ко всем пакетам этого списка. Возможные "
"действия:"
-#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:167
+#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:184
msgid "'+' to install packages"
msgstr "'+' установить пакеты"
-#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:186
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
msgstr ""
"'+M' установить пакеты и сразу пометить их как автоматически установленные"
-#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:171
+#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:188
msgid "'-' to remove packages"
msgstr "'-' удалить пакеты"
-#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:173
+#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:190
msgid "'_' to purge packages"
msgstr "'_' вычистить пакеты"
-#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:175
+#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:192
msgid "'=' to place packages on hold"
msgstr "'=' зафиксировать пакеты"
-#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:177
+#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:194
msgid ""
"':' to keep packages in their current state without placing them on hold"
msgstr "':' сохранить пакеты в их текущем состоянии без фиксации"
-#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:179
+#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:196
msgid "'&M' to mark packages as automatically installed"
msgstr "'&M' пометить пакеты как автоматически установленные"
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:181
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:198
msgid "'&m' to mark packages as manually installed"
msgstr "'&m' пометить пакеты как установленные вручную"
@@ -920,7 +920,22 @@ msgstr ""
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr "Неверный ответ. Введите допустимую команду или '?' для справки.\n"
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_resolver.cc:124 src/cmdline/cmdline_resolver.cc:597
+#: src/generic/apt/apt.cc:199
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "Не удаётся открыть %s для записи"
+
+#: src/cmdline/cmdline_resolver.cc:130 src/cmdline/cmdline_resolver.cc:602
+#, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Ошибка записи состояния разрешателя в %s"
+
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:604
+msgid "Resolver state successfully written!"
+msgstr "Состояние разрешателя записано!"
+
+#: src/cmdline/cmdline_resolver.cc:145
#, c-format
msgid ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
@@ -929,35 +944,35 @@ msgstr ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
"n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:164
msgid "accept the proposed changes"
msgstr "принять предложенные изменения"
-#: src/cmdline/cmdline_resolver.cc:149
+#: src/cmdline/cmdline_resolver.cc:166
msgid "reject the proposed changes and search for another solution"
msgstr "отвергнуть предложенные изменения и поискать другое решение"
-#: src/cmdline/cmdline_resolver.cc:151
+#: src/cmdline/cmdline_resolver.cc:168
msgid "give up and quit the program"
msgstr "завершить работу программы"
-#: src/cmdline/cmdline_resolver.cc:153
+#: src/cmdline/cmdline_resolver.cc:170
msgid "move to the next solution"
msgstr "перейти к следующему решению"
-#: src/cmdline/cmdline_resolver.cc:155
+#: src/cmdline/cmdline_resolver.cc:172
msgid "move to the previous solution"
msgstr "перейти к предыдущему решению"
-#: src/cmdline/cmdline_resolver.cc:157
+#: src/cmdline/cmdline_resolver.cc:174
msgid "view an explanation of the changes in the solution"
msgstr "посмотреть объяснение изменений в решении"
-#: src/cmdline/cmdline_resolver.cc:159
+#: src/cmdline/cmdline_resolver.cc:176
msgid "examine the solution in the visual user interface"
msgstr "рассмотреть решение в визуальном интерфейсе пользователя"
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:178
msgid ""
"reject the given package versions; don't display any solutions in which they "
"occur."
@@ -965,7 +980,7 @@ msgstr ""
"отвергнуть версии данных пакетов; не показывать решения, в которые они "
"входят."
-#: src/cmdline/cmdline_resolver.cc:163
+#: src/cmdline/cmdline_resolver.cc:180
msgid ""
"accept the given package versions; display only solutions in which they "
"occur."
@@ -973,11 +988,11 @@ msgstr ""
"принять версии данных пакетов; показывать только решения, в которые они "
"входят."
-#: src/cmdline/cmdline_resolver.cc:165
+#: src/cmdline/cmdline_resolver.cc:182
msgid "adjust the state of the listed packages, where ACTION is one of:"
msgstr "выверить состояние данных пакетов, где ACTION может быть:"
-#: src/cmdline/cmdline_resolver.cc:183
+#: src/cmdline/cmdline_resolver.cc:200
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
@@ -985,138 +1000,124 @@ msgstr ""
"Сверка приведёт к отмене текущего решения и вычислении его заново, если это "
"понадобиться."
-#: src/cmdline/cmdline_resolver.cc:197
+#: src/cmdline/cmdline_resolver.cc:214
#, c-format
msgid "The version %s is available in the following archives:"
msgstr "Версия %s доступна в следующих архивах:"
-#: src/cmdline/cmdline_resolver.cc:205
+#: src/cmdline/cmdline_resolver.cc:222
#, c-format
msgid "Select the version of %s that should be used: "
msgstr "Выберите версию для %s, которую нужно использовать: "
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:229
#, c-format
msgid "Invalid response. Please enter an integer between 1 and %d."
msgstr "Неверный ответ. Введите целое значение в пределах от 1 до %d."
-#: src/cmdline/cmdline_resolver.cc:227
+#: src/cmdline/cmdline_resolver.cc:244
#, c-format
msgid "Expected at least one package/version pair following '%c'"
msgstr "Ожидается как минимум одна пара пакет/версия после '%c'"
-#: src/cmdline/cmdline_resolver.cc:241
+#: src/cmdline/cmdline_resolver.cc:258
#, c-format
msgid "Expected a version after \"%s\""
msgstr "Ожидается версия после \"%s\""
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:268
#, c-format
msgid "No such package \"%s\""
msgstr "Пакет не найден \"%s\""
-#: src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_resolver.cc:284
#, c-format
msgid "%s has no version named \"%s\""
msgstr "%s не имеет версии \"%s\""
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:301
#, c-format
msgid "Allowing the removal of %s"
msgstr "Допускается удаление %s"
-#: src/cmdline/cmdline_resolver.cc:287
+#: src/cmdline/cmdline_resolver.cc:304
#, c-format
msgid "Allowing the installation of %s version %s (%s)"
msgstr "Допускается установка %s версии %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:314
#, c-format
msgid "Rejecting the removal of %s"
msgstr "Отвергается удаление %s"
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:317
#, c-format
msgid "Rejecting the installation of %s version %s (%s)"
msgstr "Отвергается установка %s версии %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:330
#, c-format
msgid "No longer requiring the removal of %s"
msgstr "Удаление %s больше не требуется"
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:333
#, c-format
msgid "No longer requiring the installation of %s version %s (%s)"
msgstr "Установка %s версии %s (%s) больше не требуется"
-#: src/cmdline/cmdline_resolver.cc:325
+#: src/cmdline/cmdline_resolver.cc:342
#, c-format
msgid "Requiring the removal of %s"
msgstr "Требуется удаление %s"
-#: src/cmdline/cmdline_resolver.cc:328
+#: src/cmdline/cmdline_resolver.cc:345
#, c-format
msgid "Requiring the installation of %s version %s (%s)"
msgstr "Требуется установка %s версии %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:447 src/solution_screen.cc:486
+#: src/cmdline/cmdline_resolver.cc:464 src/solution_screen.cc:495
#, c-format
msgid "open: %d; closed: %d; defer: %d; conflict: %d"
msgstr "открыто: %d; закрыто: %d; отброшено: %d; конфликтует: %d"
-#: src/cmdline/cmdline_resolver.cc:493
+#: src/cmdline/cmdline_resolver.cc:510
msgid "The following actions will resolve these dependencies:"
msgstr "Следующие действия разрешат зависимости:"
-#: src/cmdline/cmdline_resolver.cc:508
+#: src/cmdline/cmdline_resolver.cc:525
msgid "Accept this solution? [Y/n/q/?] "
msgstr "Принять данное решение? [Y/n/q/?] "
-#: src/cmdline/cmdline_resolver.cc:535 src/cmdline/cmdline_resolver.cc:627
+#: src/cmdline/cmdline_resolver.cc:552 src/cmdline/cmdline_resolver.cc:644
msgid "Abandoning all efforts to resolve these dependencies."
msgstr "Отмена всех результов по разрешению данных зависимостей."
-#: src/cmdline/cmdline_resolver.cc:562
+#: src/cmdline/cmdline_resolver.cc:579
msgid "The following commands are available:"
msgstr "Возможны следующие команды:"
-#: src/cmdline/cmdline_resolver.cc:577
+#: src/cmdline/cmdline_resolver.cc:594
msgid "File to write resolver state to: "
msgstr "Файл для записи состояния разрешателя в:"
-#: src/cmdline/cmdline_resolver.cc:580 src/generic/apt/apt.cc:199
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Не удаётся открыть %s для записи"
-
-#: src/cmdline/cmdline_resolver.cc:585
-#, c-format
-msgid "Error writing resolver state to %s"
-msgstr "Ошибка записи состояния разрешателя в %s"
-
-#: src/cmdline/cmdline_resolver.cc:587
-msgid "Resolver state successfully written!"
-msgstr "Состояние разрешателя записано!"
-
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:609
msgid "Invalid response; please enter one of the following commands:"
msgstr "Неверный ответ; можно вводить одну из следующих команд:"
-#: src/cmdline/cmdline_resolver.cc:602
+#: src/cmdline/cmdline_resolver.cc:619
msgid "No solution found within the allotted time. Try harder? [Y/n]"
msgstr ""
"За отведённое время решения не было найдено. Попытаться тщательнее? [Y/n]"
-#: src/cmdline/cmdline_resolver.cc:630
+#: src/cmdline/cmdline_resolver.cc:647
msgid "Invalid response; please enter 'y' or 'n'."
msgstr "Неверный ответ; можно ввести 'y' или 'n'."
-#: src/cmdline/cmdline_resolver.cc:639
+#: src/cmdline/cmdline_resolver.cc:656
msgid "Unable to resolve dependencies! Giving up..."
msgstr "Не удалось разрешить зависимости! Ничего не получается..."
-#: src/cmdline/cmdline_resolver.cc:645
+#: src/cmdline/cmdline_resolver.cc:662
msgid "*** No more solutions available ***"
msgstr "*** Больше решений нет ***"
@@ -1533,65 +1534,65 @@ msgstr "Не удаётся открыть файл расширенных со
msgid "Reading extended state information"
msgstr "Чтение информации о расширенных состояниях"
-#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:403
-#: src/generic/apt/aptcache.cc:406
+#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:405
+#: src/generic/apt/aptcache.cc:408
msgid "Initializing package states"
msgstr "Инициализация состояний пакетов"
-#: src/generic/apt/aptcache.cc:530
+#: src/generic/apt/aptcache.cc:533
msgid "Cannot open Aptitude state file"
msgstr "Не удаётся открыть файл состояний Aptitude"
-#: src/generic/apt/aptcache.cc:534 src/generic/apt/aptcache.cc:589
-#: src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:537 src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:595
msgid "Writing extended state information"
msgstr "Запись информации расширенных состояний"
-#: src/generic/apt/aptcache.cc:571
+#: src/generic/apt/aptcache.cc:574
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr ""
"Внутреннее переполнение буфера на пакете \"%s\" во время записи файла "
"состояний"
-#: src/generic/apt/aptcache.cc:580
+#: src/generic/apt/aptcache.cc:583
msgid "Couldn't write state file"
msgstr "Не удалось записать файл состояний"
-#: src/generic/apt/aptcache.cc:597
+#: src/generic/apt/aptcache.cc:600
msgid "Error writing state file"
msgstr "Ошибка записи файла состояний"
-#: src/generic/apt/aptcache.cc:615
+#: src/generic/apt/aptcache.cc:618
#, c-format
msgid "failed to remove %s"
msgstr "не удалось удалить %s"
-#: src/generic/apt/aptcache.cc:622
+#: src/generic/apt/aptcache.cc:625
#, c-format
msgid "failed to rename %s to %s"
msgstr "не удалось переименовать %s в %s"
-#: src/generic/apt/aptcache.cc:630
+#: src/generic/apt/aptcache.cc:633
#, c-format
msgid "couldn't replace %s with %s"
msgstr "не удалось заменить %s на %s"
-#: src/generic/apt/aptcache.cc:1122
+#: src/generic/apt/aptcache.cc:1125
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr ""
"Не удаётся откорректировать зависимости; некоторые пакеты не могут быть "
"установлены"
-#: src/generic/apt/aptcache.cc:1526
+#: src/generic/apt/aptcache.cc:1600
msgid "The list of sources could not be read."
msgstr "Не удалось прочитать sources.list"
-#: src/generic/apt/aptcache.cc:1533
+#: src/generic/apt/aptcache.cc:1607
msgid "The package lists or status file could not be parsed or opened."
msgstr "Не удалось обработать или открыть список пакетов или файл состояний."
-#: src/generic/apt/aptcache.cc:1536
+#: src/generic/apt/aptcache.cc:1610
msgid "You may want to update the package lists to correct these missing files"
msgstr ""
"Возможно, вы захотите обновить список пакетов, чтобы не было этих "
@@ -3861,12 +3862,12 @@ msgstr ""
"%s это пакет первой необходимости!%n%nВы действительно хотите его удалить?%"
"nВведите '%s' если да."
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:284
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:291
#, c-format
msgid "Information about %s"
msgstr "Информация о %s"
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:282
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:289
#, c-format
msgid "%s info"
msgstr "%s info"
@@ -4195,7 +4196,7 @@ msgstr ""
"Следующие пакеты зависят от версии %B%s%b of %B%s%b, и будут испорчены если %"
"s."
-#: src/solution_dialog.cc:91 src/solution_screen.cc:457
+#: src/solution_dialog.cc:91 src/solution_screen.cc:465
msgid "The package cache is not available."
msgstr "Недоступен кэш пакетов."
@@ -4203,11 +4204,11 @@ msgstr "Недоступен кэш пакетов."
msgid "No packages are broken."
msgstr "Все пакеты работоспособны."
-#: src/solution_dialog.cc:108 src/solution_screen.cc:479
+#: src/solution_dialog.cc:108 src/solution_screen.cc:488
msgid "No resolution found."
msgstr "Решения не найдено."
-#: src/solution_dialog.cc:114 src/solution_screen.cc:490
+#: src/solution_dialog.cc:114 src/solution_screen.cc:499
msgid "Resolving dependencies..."
msgstr "Разрешение зависимостей..."
@@ -4242,7 +4243,7 @@ msgstr "%s сначала зависит от %s"
msgid "%s suggests %s"
msgstr "%s предлагает %s"
-#: src/solution_fragment.cc:113 src/solution_item.cc:583
+#: src/solution_fragment.cc:113 src/solution_item.cc:593
#, c-format
msgid "%s recommends %s"
msgstr "%s рекомендует %s"
@@ -4346,7 +4347,7 @@ msgstr "Обновить %F [%s (%s) -> %s (%s)]"
msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgstr "Вернуть старую версию %F [%s (%s) -> %s (%s)]"
-#: src/solution_item.cc:587
+#: src/solution_item.cc:597
#, c-format
msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
msgstr "-> Невозможно решить оставление зависимости \"%s рекомендует %s\"."
@@ -4379,7 +4380,7 @@ msgstr "Установить более старую версию для сле
msgid "Leave the following recommendations unresolved:"
msgstr "Оставить следующие рекомендации нерешёнными:"
-#: src/solution_screen.cc:463
+#: src/solution_screen.cc:472
msgid "No broken packages."
msgstr "Нет неработоспособных пакетов."
diff --git a/po/sk.po b/po/sk.po
index 163032cf..e144b24b 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
-"POT-Creation-Date: 2005-11-07 15:22-0800\n"
+"POT-Creation-Date: 2005-11-13 10:12-0800\n"
"PO-Revision-Date: 2005-11-10 21:30+0100\n"
"Last-Translator: Stanislav Valášek <valasek@fastmail.fm>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -198,7 +198,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] Riešenie závislostí"
#: src/broken_indicator.cc:273 src/solution_dialog.cc:126
-#: src/solution_screen.cc:513
+#: src/solution_screen.cc:522
msgid "Internal error: unexpected null solution."
msgstr "Interná chyba: neočakávané null riešenie"
@@ -794,41 +794,41 @@ msgstr ""
"alebo viac názvami balíčkov (alebo vzorov). Akcia sa vykoná na všetkých "
"balíčkoch, ktoré ste uviedli. Nasledujúce akcie sú dostupné:"
-#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:167
+#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:184
msgid "'+' to install packages"
msgstr "'+' na inštaláciu balíčkov"
-#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:186
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
msgstr ""
"'+M' na inštaláciu balíčkov a ich okamžité označenie ako automaticky "
"inštalované"
-#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:171
+#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:188
msgid "'-' to remove packages"
msgstr "'-' na odstránenie balíčkov"
-#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:173
+#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:190
msgid "'_' to purge packages"
msgstr "'_' na zabudnutie balíčkov"
-#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:175
+#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:192
msgid "'=' to place packages on hold"
msgstr "'=' na nastavenie balíka na stav podržať"
-#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:177
+#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:194
msgid ""
"':' to keep packages in their current state without placing them on hold"
msgstr ""
"':' na uchovanie balíčkov v ich aktuálnom stave bez zmeny ich stavu na "
"Podržať"
-#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:179
+#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:196
msgid "'&M' to mark packages as automatically installed"
msgstr "'&M' na označenie balíkov ako automatiky inštalovaných"
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:181
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:198
msgid "'&m' to mark packages as manually installed"
msgstr "'&m' na označenie balíky, ako manuálne inštalovaných"
@@ -911,7 +911,22 @@ msgstr ""
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr "Chybná odpoveď. Zadajte platný príkaz alebo '?' na pomoc.\n"
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_resolver.cc:124 src/cmdline/cmdline_resolver.cc:597
+#: src/generic/apt/apt.cc:199
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "Nemôžem otvoriť %s na zápis"
+
+#: src/cmdline/cmdline_resolver.cc:130 src/cmdline/cmdline_resolver.cc:602
+#, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Chyba pri zápise stavu riešenia do %s"
+
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:604
+msgid "Resolver state successfully written!"
+msgstr "Stav úspešne uložený!"
+
+#: src/cmdline/cmdline_resolver.cc:145
#, c-format
msgid ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
@@ -920,35 +935,35 @@ msgstr ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
"n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:164
msgid "accept the proposed changes"
msgstr "akceptovať navrhované zmeny"
-#: src/cmdline/cmdline_resolver.cc:149
+#: src/cmdline/cmdline_resolver.cc:166
msgid "reject the proposed changes and search for another solution"
msgstr "zamietnuť navrhované zmeny a hľadať iné riešenie"
-#: src/cmdline/cmdline_resolver.cc:151
+#: src/cmdline/cmdline_resolver.cc:168
msgid "give up and quit the program"
msgstr "vzdať sa a ukončiť program"
-#: src/cmdline/cmdline_resolver.cc:153
+#: src/cmdline/cmdline_resolver.cc:170
msgid "move to the next solution"
msgstr "presun na ďalšie riešenie"
-#: src/cmdline/cmdline_resolver.cc:155
+#: src/cmdline/cmdline_resolver.cc:172
msgid "move to the previous solution"
msgstr "presun na predchádzajúce riešenie"
-#: src/cmdline/cmdline_resolver.cc:157
+#: src/cmdline/cmdline_resolver.cc:174
msgid "view an explanation of the changes in the solution"
msgstr "zobraziť vysvetlenie zmien v riešení"
-#: src/cmdline/cmdline_resolver.cc:159
+#: src/cmdline/cmdline_resolver.cc:176
msgid "examine the solution in the visual user interface"
msgstr "skúsiť riešenie v grafickom používateľskom prostredí"
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:178
msgid ""
"reject the given package versions; don't display any solutions in which they "
"occur."
@@ -956,7 +971,7 @@ msgstr ""
"zamietnuť ponúknuté verzie balíkov;nezobrazovať žiadne riešenia, v ktorých "
"sa vyskytujú"
-#: src/cmdline/cmdline_resolver.cc:163
+#: src/cmdline/cmdline_resolver.cc:180
msgid ""
"accept the given package versions; display only solutions in which they "
"occur."
@@ -964,150 +979,136 @@ msgstr ""
"akceptovať ponúknuté verzie balíkov; zobrazovať iba riešenia, v ktorých sa "
"vyskytujú"
-#: src/cmdline/cmdline_resolver.cc:165
+#: src/cmdline/cmdline_resolver.cc:182
msgid "adjust the state of the listed packages, where ACTION is one of:"
msgstr "uprav stav uvedených balíčkov tam, kde je AKCIA jedna z:"
-#: src/cmdline/cmdline_resolver.cc:183
+#: src/cmdline/cmdline_resolver.cc:200
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
msgstr ""
"Úprava spôsobí, že súčasné riešenie bude zahodené a nutná rekalkulácia."
-#: src/cmdline/cmdline_resolver.cc:197
+#: src/cmdline/cmdline_resolver.cc:214
#, c-format
msgid "The version %s is available in the following archives:"
msgstr "Verzia·%s·je dostupná iba v nasledovných archívoch:"
-#: src/cmdline/cmdline_resolver.cc:205
+#: src/cmdline/cmdline_resolver.cc:222
#, c-format
msgid "Select the version of %s that should be used: "
msgstr "Vyberte verziu %s ktorá má byť použitá: "
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:229
#, c-format
msgid "Invalid response. Please enter an integer between 1 and %d."
msgstr "Chybná odpoveď; prosím zadajte 'y' alebo 'n'."
-#: src/cmdline/cmdline_resolver.cc:227
+#: src/cmdline/cmdline_resolver.cc:244
#, c-format
msgid "Expected at least one package/version pair following '%c'"
msgstr "Očakávaný je minimálne jeden pár balík/verzia·nasledujúci '%c'"
-#: src/cmdline/cmdline_resolver.cc:241
+#: src/cmdline/cmdline_resolver.cc:258
#, c-format
msgid "Expected a version after \"%s\""
msgstr "Očakávaná verzia po \"%s\""
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:268
#, c-format
msgid "No such package \"%s\""
msgstr "Neexistuje balík \"%s\""
-#: src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_resolver.cc:284
#, c-format
msgid "%s has no version named \"%s\""
msgstr "%s·nemá žiadnu verziu nazvanú \"%s\""
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:301
#, c-format
msgid "Allowing the removal of %s"
msgstr "Povoľovanie odstránenia %s"
-#: src/cmdline/cmdline_resolver.cc:287
+#: src/cmdline/cmdline_resolver.cc:304
#, c-format
msgid "Allowing the installation of %s version %s (%s)"
msgstr "Povoľovanie inštalácie %s verzie %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:314
#, c-format
msgid "Rejecting the removal of %s"
msgstr "Zakazovanie odstránenia %s"
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:317
#, c-format
msgid "Rejecting the installation of %s version %s (%s)"
msgstr "Zamietanie inštalácie %s·verzie·%s·(%s)"
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:330
#, c-format
msgid "No longer requiring the removal of %s"
msgstr "Dlhšie nepožadované odstránenie %s"
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:333
#, c-format
msgid "No longer requiring the installation of %s version %s (%s)"
msgstr "Dlhšie nepožadovaná inštalácia %s·verzie·%s·(%s)"
-#: src/cmdline/cmdline_resolver.cc:325
+#: src/cmdline/cmdline_resolver.cc:342
#, c-format
msgid "Requiring the removal of %s"
msgstr "Požadovanie odstránenia %s"
-#: src/cmdline/cmdline_resolver.cc:328
+#: src/cmdline/cmdline_resolver.cc:345
#, c-format
msgid "Requiring the installation of %s version %s (%s)"
msgstr "Požadovanie inštalácie %s·verzie·%s·(%s)"
-#: src/cmdline/cmdline_resolver.cc:447 src/solution_screen.cc:486
+#: src/cmdline/cmdline_resolver.cc:464 src/solution_screen.cc:495
#, c-format
msgid "open: %d; closed: %d; defer: %d; conflict: %d"
msgstr "otvorené:·%d;·uzavreté:·%d;·odložené:·%d;·konfliktné:·%d"
-#: src/cmdline/cmdline_resolver.cc:493
+#: src/cmdline/cmdline_resolver.cc:510
msgid "The following actions will resolve these dependencies:"
msgstr "Nasledujúce akcie vyriešia tieto závislosti:"
-#: src/cmdline/cmdline_resolver.cc:508
+#: src/cmdline/cmdline_resolver.cc:525
msgid "Accept this solution? [Y/n/q/?] "
msgstr "Potvrdiť toto riešenie? [Y/n/q/?] "
-#: src/cmdline/cmdline_resolver.cc:535 src/cmdline/cmdline_resolver.cc:627
+#: src/cmdline/cmdline_resolver.cc:552 src/cmdline/cmdline_resolver.cc:644
msgid "Abandoning all efforts to resolve these dependencies."
msgstr "Ukončovanie všetkého úsilia na vyriešenie týchto závislostí."
-#: src/cmdline/cmdline_resolver.cc:562
+#: src/cmdline/cmdline_resolver.cc:579
msgid "The following commands are available:"
msgstr "Nasledujúce príkazy sú dostupné:"
-#: src/cmdline/cmdline_resolver.cc:577
+#: src/cmdline/cmdline_resolver.cc:594
msgid "File to write resolver state to: "
msgstr "Súbor, kde má byť zapísaný stav riešenia:"
-#: src/cmdline/cmdline_resolver.cc:580 src/generic/apt/apt.cc:199
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Nemôžem otvoriť %s na zápis"
-
-#: src/cmdline/cmdline_resolver.cc:585
-#, c-format
-msgid "Error writing resolver state to %s"
-msgstr "Chyba pri zápise stavu riešenia do %s"
-
-#: src/cmdline/cmdline_resolver.cc:587
-msgid "Resolver state successfully written!"
-msgstr "Stav úspešne uložený!"
-
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:609
msgid "Invalid response; please enter one of the following commands:"
msgstr "Chybná odpoveď; prosím zadajte jeden z nasledujúcich príkazov:"
-#: src/cmdline/cmdline_resolver.cc:602
+#: src/cmdline/cmdline_resolver.cc:619
msgid "No solution found within the allotted time. Try harder? [Y/n]"
msgstr ""
"Počas prideleného času nebolo nájdené žiadne riešenie. Skúsiť dôkladnejšie? "
"[Y/n]"
-#: src/cmdline/cmdline_resolver.cc:630
+#: src/cmdline/cmdline_resolver.cc:647
msgid "Invalid response; please enter 'y' or 'n'."
msgstr "Chybná odpoveď; prosím zadajte 'y' alebo 'n'."
-#: src/cmdline/cmdline_resolver.cc:639
+#: src/cmdline/cmdline_resolver.cc:656
msgid "Unable to resolve dependencies! Giving up..."
msgstr "Nemožnosť vyriešenia závislostí! Vzdávam sa..."
-#: src/cmdline/cmdline_resolver.cc:645
+#: src/cmdline/cmdline_resolver.cc:662
msgid "*** No more solutions available ***"
msgstr "*** Žiadne ďalšie riešenia ***"
@@ -1524,61 +1525,61 @@ msgstr "Nemôžem otvoriť rozšírený stavový súbor programu Aptitude"
msgid "Reading extended state information"
msgstr "Čítam rozšírené stavové informácie"
-#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:403
-#: src/generic/apt/aptcache.cc:406
+#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:405
+#: src/generic/apt/aptcache.cc:408
msgid "Initializing package states"
msgstr "Inicializujem stavy balíkov"
-#: src/generic/apt/aptcache.cc:530
+#: src/generic/apt/aptcache.cc:533
msgid "Cannot open Aptitude state file"
msgstr "Nemôžem otvoriť stavový súbor programu Aptitude"
-#: src/generic/apt/aptcache.cc:534 src/generic/apt/aptcache.cc:589
-#: src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:537 src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:595
msgid "Writing extended state information"
msgstr "Zapisujem rozšírené stavové informácie"
-#: src/generic/apt/aptcache.cc:571
+#: src/generic/apt/aptcache.cc:574
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr "Pri zápise stavového súboru pretiekol interný buffer na balíku \"%s\""
-#: src/generic/apt/aptcache.cc:580
+#: src/generic/apt/aptcache.cc:583
msgid "Couldn't write state file"
msgstr "Nemôžem zapísať stavový súbor"
-#: src/generic/apt/aptcache.cc:597
+#: src/generic/apt/aptcache.cc:600
msgid "Error writing state file"
msgstr "Chyba pri zápise stavového súboru"
-#: src/generic/apt/aptcache.cc:615
+#: src/generic/apt/aptcache.cc:618
#, c-format
msgid "failed to remove %s"
msgstr "zlyhalo odstránenie %s"
-#: src/generic/apt/aptcache.cc:622
+#: src/generic/apt/aptcache.cc:625
#, c-format
msgid "failed to rename %s to %s"
msgstr "zlyhalo premenovanie %s·na·%s"
-#: src/generic/apt/aptcache.cc:630
+#: src/generic/apt/aptcache.cc:633
#, c-format
msgid "couldn't replace %s with %s"
msgstr "nemôžem vymeniť %s za %s"
-#: src/generic/apt/aptcache.cc:1122
+#: src/generic/apt/aptcache.cc:1125
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr "Nemôžem opraviť závislosti, niektoré balíky nemôžu byť nainštalované"
-#: src/generic/apt/aptcache.cc:1526
+#: src/generic/apt/aptcache.cc:1600
msgid "The list of sources could not be read."
msgstr "Nedá sa prečítať zoznam zdrojov."
-#: src/generic/apt/aptcache.cc:1533
+#: src/generic/apt/aptcache.cc:1607
msgid "The package lists or status file could not be parsed or opened."
msgstr "Zoznamy balíkov alebo stavový súbor nemožno otvoriť alebo spracovať."
-#: src/generic/apt/aptcache.cc:1536
+#: src/generic/apt/aptcache.cc:1610
msgid "You may want to update the package lists to correct these missing files"
msgstr "Na opravenie chýbajúcich súborov skúste aktualizovať zoznamy balíkov"
@@ -3817,12 +3818,12 @@ msgstr ""
"%s je nutný balík!%n%nSte si istý, že ho chcete odstrániť?%nAk ste, napíšte "
"'%s'."
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:284
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:291
#, c-format
msgid "Information about %s"
msgstr "Informácie o %s"
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:282
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:289
#, c-format
msgid "%s info"
msgstr "%s info"
@@ -4151,7 +4152,7 @@ msgstr ""
"Nasledujúce balíky sú závisia na verzii %B%s%b balíku %B%s%b. Ak bude balík %"
"s, budú tieto balíky porušené."
-#: src/solution_dialog.cc:91 src/solution_screen.cc:457
+#: src/solution_dialog.cc:91 src/solution_screen.cc:465
msgid "The package cache is not available."
msgstr "Vyrovnávacia pamäť balíčka nie je k dispozícií."
@@ -4159,11 +4160,11 @@ msgstr "Vyrovnávacia pamäť balíčka nie je k dispozícií."
msgid "No packages are broken."
msgstr "Žiadne balíky nie sú poškodené."
-#: src/solution_dialog.cc:108 src/solution_screen.cc:479
+#: src/solution_dialog.cc:108 src/solution_screen.cc:488
msgid "No resolution found."
msgstr "Žiadne riešenie nebolo nájdené."
-#: src/solution_dialog.cc:114 src/solution_screen.cc:490
+#: src/solution_dialog.cc:114 src/solution_screen.cc:499
msgid "Resolving dependencies..."
msgstr "Riešenie závislostí..."
@@ -4198,7 +4199,7 @@ msgstr "%s pred-závisí na %s"
msgid "%s suggests %s"
msgstr "%s navrhuje %s"
-#: src/solution_fragment.cc:113 src/solution_item.cc:583
+#: src/solution_fragment.cc:113 src/solution_item.cc:593
#, c-format
msgid "%s recommends %s"
msgstr "%s doporučuje %s"
@@ -4302,7 +4303,7 @@ msgstr "Aktualizovať %F [%s (%s) -> %s (%s)]"
msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgstr "Znížiť verziu %F [%s (%s) -> %s (%s)]"
-#: src/solution_item.cc:587
+#: src/solution_item.cc:597
#, c-format
msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
msgstr "-> Ponechať závislosť \"%s navrhuje %s\" nevyriešenú."
@@ -4335,7 +4336,7 @@ msgstr "Degradovať nasledujúce balíky:"
msgid "Leave the following recommendations unresolved:"
msgstr "Ponechať nasledujúce návrhy nevyriešené:"
-#: src/solution_screen.cc:463
+#: src/solution_screen.cc:472
msgid "No broken packages."
msgstr "Žiadne pokazené balíky"
diff --git a/po/sv.po b/po/sv.po
index b43208c3..49ed919f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude devel\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
-"POT-Creation-Date: 2005-11-07 15:22-0800\n"
+"POT-Creation-Date: 2005-11-13 10:12-0800\n"
"PO-Revision-Date: 2005-11-06 01:24+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -199,7 +199,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] Tar fram bereoenden"
#: src/broken_indicator.cc:273 src/solution_dialog.cc:126
-#: src/solution_screen.cc:513
+#: src/solution_screen.cc:522
msgid "Internal error: unexpected null solution."
msgstr "Internt fel: ovntad noll lsning."
@@ -803,41 +803,41 @@ msgstr ""
"(eller mnster). tgrden kommer att genomfras p alla paket som du har "
"listat. Fljande tgrder r tillgngliga:"
-#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:167
+#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:184
msgid "'+' to install packages"
msgstr "'+' fr att installera paket"
-#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:186
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
msgstr ""
"'+M' fr att installera paket och omedelbart flagga dom som automatiskt "
"installerade"
-#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:171
+#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:188
msgid "'-' to remove packages"
msgstr "'-' fr att ta bort paket"
-#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:173
+#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:190
msgid "'_' to purge packages"
msgstr "'_' fr att rensa paket"
-#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:175
+#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:192
msgid "'=' to place packages on hold"
msgstr "'=' fr att hlla tillbaka paket"
-#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:177
+#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:194
msgid ""
"':' to keep packages in their current state without placing them on hold"
msgstr ""
"':' fr att behlla paketen i deras nuvarande status utan att placera dom p "
"kvarhllning"
-#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:179
+#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:196
msgid "'&M' to mark packages as automatically installed"
msgstr "'&M' fr att markera paket som automatiskt installerade"
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:181
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:198
msgid "'&m' to mark packages as manually installed"
msgstr "'&m' fr att markera paket som manuellt installerade"
@@ -920,7 +920,22 @@ msgstr ""
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr "Ogiltigt svar. Ange ett giltigt kommando eller '?' fr hjlp.\n"
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_resolver.cc:124 src/cmdline/cmdline_resolver.cc:597
+#: src/generic/apt/apt.cc:199
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "Kunde inte ppna %s fr skrivning"
+
+#: src/cmdline/cmdline_resolver.cc:130 src/cmdline/cmdline_resolver.cc:602
+#, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Fel vid skrivning av lsningsstatus till %s"
+
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:604
+msgid "Resolver state successfully written!"
+msgstr "Skrivning av status fr problemlsaren lyckades!"
+
+#: src/cmdline/cmdline_resolver.cc:145
#, c-format
msgid ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
@@ -929,35 +944,35 @@ msgstr ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pak ver ...: %F%na pak ver ...: %F%"
"n<TGRD> pak... : %F%n%F%F%F%F%F%F%F%F"
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:164
msgid "accept the proposed changes"
msgstr "acceptera de freslagna ndringarna"
-#: src/cmdline/cmdline_resolver.cc:149
+#: src/cmdline/cmdline_resolver.cc:166
msgid "reject the proposed changes and search for another solution"
msgstr "vgra de freslagna ndringarna och sk efter en annan lsning"
-#: src/cmdline/cmdline_resolver.cc:151
+#: src/cmdline/cmdline_resolver.cc:168
msgid "give up and quit the program"
msgstr "ge upp och avsluta programmet"
-#: src/cmdline/cmdline_resolver.cc:153
+#: src/cmdline/cmdline_resolver.cc:170
msgid "move to the next solution"
msgstr "g till nsta lsning"
-#: src/cmdline/cmdline_resolver.cc:155
+#: src/cmdline/cmdline_resolver.cc:172
msgid "move to the previous solution"
msgstr "g till fregende lsning"
-#: src/cmdline/cmdline_resolver.cc:157
+#: src/cmdline/cmdline_resolver.cc:174
msgid "view an explanation of the changes in the solution"
msgstr "visa en frklarning fr ndringarna i lsningen"
-#: src/cmdline/cmdline_resolver.cc:159
+#: src/cmdline/cmdline_resolver.cc:176
msgid "examine the solution in the visual user interface"
msgstr "undersk lsningen i det visuella anvndargrnssnittet"
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:178
msgid ""
"reject the given package versions; don't display any solutions in which they "
"occur."
@@ -965,18 +980,18 @@ msgstr ""
"vgra de angivna paketversionerna, visa inte ngra lsningar i vilka de "
"ingr."
-#: src/cmdline/cmdline_resolver.cc:163
+#: src/cmdline/cmdline_resolver.cc:180
msgid ""
"accept the given package versions; display only solutions in which they "
"occur."
msgstr ""
"acceptera de angivna paketversionerna, visa bara lsningar i vilka de ingr."
-#: src/cmdline/cmdline_resolver.cc:165
+#: src/cmdline/cmdline_resolver.cc:182
msgid "adjust the state of the listed packages, where ACTION is one of:"
msgstr "justera status fr de listade paketen dr TGRD r en av:"
-#: src/cmdline/cmdline_resolver.cc:183
+#: src/cmdline/cmdline_resolver.cc:200
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
@@ -984,138 +999,124 @@ msgstr ""
"Justeringar kommer att orsaka att nuvarande lsning kommer att kastas bort "
"och utrknad igen om ndvndigt."
-#: src/cmdline/cmdline_resolver.cc:197
+#: src/cmdline/cmdline_resolver.cc:214
#, c-format
msgid "The version %s is available in the following archives:"
msgstr "Versionen %s r tillgnglig i fljande arkiv:"
-#: src/cmdline/cmdline_resolver.cc:205
+#: src/cmdline/cmdline_resolver.cc:222
#, c-format
msgid "Select the version of %s that should be used: "
msgstr "Vlj den version av %s som ska anvndas: "
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:229
#, c-format
msgid "Invalid response. Please enter an integer between 1 and %d."
msgstr "Ogiltigt svar, ange en integer mellan 1 och %d."
-#: src/cmdline/cmdline_resolver.cc:227
+#: src/cmdline/cmdline_resolver.cc:244
#, c-format
msgid "Expected at least one package/version pair following '%c'"
msgstr "Frvntade tminstone ett paket/versionspar efterfljandes '%c'"
-#: src/cmdline/cmdline_resolver.cc:241
+#: src/cmdline/cmdline_resolver.cc:258
#, c-format
msgid "Expected a version after \"%s\""
msgstr "Frvntade en version efter \"%s\""
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:268
#, c-format
msgid "No such package \"%s\""
msgstr "Finns inget sdant paket \"%s\""
-#: src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_resolver.cc:284
#, c-format
msgid "%s has no version named \"%s\""
msgstr "%s har ingen version kallad \"%s\""
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:301
#, c-format
msgid "Allowing the removal of %s"
msgstr "Tillter borttagningen av %s"
-#: src/cmdline/cmdline_resolver.cc:287
+#: src/cmdline/cmdline_resolver.cc:304
#, c-format
msgid "Allowing the installation of %s version %s (%s)"
msgstr "Tillt installationen av %s version %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:314
#, c-format
msgid "Rejecting the removal of %s"
msgstr "Vgrar borttagningen av %s"
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:317
#, c-format
msgid "Rejecting the installation of %s version %s (%s)"
msgstr "Vgrar installationen av %s version %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:330
#, c-format
msgid "No longer requiring the removal of %s"
msgstr "Krver inte lngre borttagningen av %s"
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:333
#, c-format
msgid "No longer requiring the installation of %s version %s (%s)"
msgstr "Krver inte lngre installationen av %s version %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:325
+#: src/cmdline/cmdline_resolver.cc:342
#, c-format
msgid "Requiring the removal of %s"
msgstr "Krver borttagning av %s"
-#: src/cmdline/cmdline_resolver.cc:328
+#: src/cmdline/cmdline_resolver.cc:345
#, c-format
msgid "Requiring the installation of %s version %s (%s)"
msgstr "Krver installation av %s version %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:447 src/solution_screen.cc:486
+#: src/cmdline/cmdline_resolver.cc:464 src/solution_screen.cc:495
#, c-format
msgid "open: %d; closed: %d; defer: %d; conflict: %d"
msgstr "ppen: %d; stngd: %d; framskjutna: %d; konflikter: %d"
-#: src/cmdline/cmdline_resolver.cc:493
+#: src/cmdline/cmdline_resolver.cc:510
msgid "The following actions will resolve these dependencies:"
msgstr "Fljande tgrder kommer att lsa dessa beroenden:"
-#: src/cmdline/cmdline_resolver.cc:508
+#: src/cmdline/cmdline_resolver.cc:525
msgid "Accept this solution? [Y/n/q/?] "
msgstr "Acceptera denna lsning? [J/n/q/?] "
-#: src/cmdline/cmdline_resolver.cc:535 src/cmdline/cmdline_resolver.cc:627
+#: src/cmdline/cmdline_resolver.cc:552 src/cmdline/cmdline_resolver.cc:644
msgid "Abandoning all efforts to resolve these dependencies."
msgstr "Avbryter alla frsk att lsa dessa beroenden."
-#: src/cmdline/cmdline_resolver.cc:562
+#: src/cmdline/cmdline_resolver.cc:579
msgid "The following commands are available:"
msgstr "Fljande kommandon r tillgngliga:"
-#: src/cmdline/cmdline_resolver.cc:577
+#: src/cmdline/cmdline_resolver.cc:594
msgid "File to write resolver state to: "
msgstr "Fil att skriva status fr problemlsaren till: "
-#: src/cmdline/cmdline_resolver.cc:580 src/generic/apt/apt.cc:199
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Kunde inte ppna %s fr skrivning"
-
-#: src/cmdline/cmdline_resolver.cc:585
-#, c-format
-msgid "Error writing resolver state to %s"
-msgstr "Fel vid skrivning av lsningsstatus till %s"
-
-#: src/cmdline/cmdline_resolver.cc:587
-msgid "Resolver state successfully written!"
-msgstr "Skrivning av status fr problemlsaren lyckades!"
-
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:609
msgid "Invalid response; please enter one of the following commands:"
msgstr "Ogiltigt svar, ange ngon av fljande kommandon:"
-#: src/cmdline/cmdline_resolver.cc:602
+#: src/cmdline/cmdline_resolver.cc:619
msgid "No solution found within the allotted time. Try harder? [Y/n]"
msgstr ""
"Ingen lsning hittades inom den tilldelade tiden. Frska hrdare? [J/n]"
-#: src/cmdline/cmdline_resolver.cc:630
+#: src/cmdline/cmdline_resolver.cc:647
msgid "Invalid response; please enter 'y' or 'n'."
msgstr "Ogiltigt svar, ange 'j' eller 'n'."
-#: src/cmdline/cmdline_resolver.cc:639
+#: src/cmdline/cmdline_resolver.cc:656
msgid "Unable to resolve dependencies! Giving up..."
msgstr "Kunde inte lsa beroenden! Ger upp..."
-#: src/cmdline/cmdline_resolver.cc:645
+#: src/cmdline/cmdline_resolver.cc:662
msgid "*** No more solutions available ***"
msgstr "*** Inga fler lsningar tillgngliga ***"
@@ -1533,61 +1534,61 @@ msgstr "Kan inte ppna Aptitude's utkade statusfil"
msgid "Reading extended state information"
msgstr "Lser utkad statusinformation"
-#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:403
-#: src/generic/apt/aptcache.cc:406
+#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:405
+#: src/generic/apt/aptcache.cc:408
msgid "Initializing package states"
msgstr "Initierar paketstatus"
-#: src/generic/apt/aptcache.cc:530
+#: src/generic/apt/aptcache.cc:533
msgid "Cannot open Aptitude state file"
msgstr "Kan inte ppna Aptitude's statusfil"
-#: src/generic/apt/aptcache.cc:534 src/generic/apt/aptcache.cc:589
-#: src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:537 src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:595
msgid "Writing extended state information"
msgstr "Skriver utkad statusinformation"
-#: src/generic/apt/aptcache.cc:571
+#: src/generic/apt/aptcache.cc:574
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr "Internt buffert verflde i paket \"%s\" under skrivning av statusfil"
-#: src/generic/apt/aptcache.cc:580
+#: src/generic/apt/aptcache.cc:583
msgid "Couldn't write state file"
msgstr "Kunde inte skriva statusfil"
-#: src/generic/apt/aptcache.cc:597
+#: src/generic/apt/aptcache.cc:600
msgid "Error writing state file"
msgstr "Fel vid skrivning av statusfil"
-#: src/generic/apt/aptcache.cc:615
+#: src/generic/apt/aptcache.cc:618
#, c-format
msgid "failed to remove %s"
msgstr "misslyckades att ta bort %s"
-#: src/generic/apt/aptcache.cc:622
+#: src/generic/apt/aptcache.cc:625
#, c-format
msgid "failed to rename %s to %s"
msgstr "misslyckades att byta namn p %s till %s"
-#: src/generic/apt/aptcache.cc:630
+#: src/generic/apt/aptcache.cc:633
#, c-format
msgid "couldn't replace %s with %s"
msgstr "kunde inte byta ut %s med %s"
-#: src/generic/apt/aptcache.cc:1122
+#: src/generic/apt/aptcache.cc:1125
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr "Kunde inte rtta till beroenden, ngra paket kunde inte installeras"
-#: src/generic/apt/aptcache.cc:1526
+#: src/generic/apt/aptcache.cc:1600
msgid "The list of sources could not be read."
msgstr "Listan ver kllor kunde inte lsas."
-#: src/generic/apt/aptcache.cc:1533
+#: src/generic/apt/aptcache.cc:1607
msgid "The package lists or status file could not be parsed or opened."
msgstr "Paketlistorna eller statusfilen kunde inte lsas eller ppnas."
-#: src/generic/apt/aptcache.cc:1536
+#: src/generic/apt/aptcache.cc:1610
msgid "You may want to update the package lists to correct these missing files"
msgstr ""
"Du kanske vill uppdatera paketlistan fr att rtta till dessa saknade filer"
@@ -3845,12 +3846,12 @@ msgstr ""
"%s r ett vsentligt paket!%n%nr du sker att du vill ta bort det?%nSkriv "
"in '%s' om du r det."
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:284
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:291
#, c-format
msgid "Information about %s"
msgstr "Information om %s"
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:282
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:289
#, c-format
msgid "%s info"
msgstr "%s info"
@@ -4192,7 +4193,7 @@ msgstr ""
"Fljande paket r beroende av version %B%s%b av %B%s%b och kommer att bli "
"brutna om det r %s."
-#: src/solution_dialog.cc:91 src/solution_screen.cc:457
+#: src/solution_dialog.cc:91 src/solution_screen.cc:465
msgid "The package cache is not available."
msgstr "Mellanlagring av paket r inte tillgnglig."
@@ -4200,11 +4201,11 @@ msgstr "Mellanlagring av paket r inte tillgnglig."
msgid "No packages are broken."
msgstr "Inga paket r brutna."
-#: src/solution_dialog.cc:108 src/solution_screen.cc:479
+#: src/solution_dialog.cc:108 src/solution_screen.cc:488
msgid "No resolution found."
msgstr "Ingen lsning hittades."
-#: src/solution_dialog.cc:114 src/solution_screen.cc:490
+#: src/solution_dialog.cc:114 src/solution_screen.cc:499
msgid "Resolving dependencies..."
msgstr "Lser beroenden..."
@@ -4239,7 +4240,7 @@ msgstr "%s r fr-beroende av %s"
msgid "%s suggests %s"
msgstr "%s freslr %s"
-#: src/solution_fragment.cc:113 src/solution_item.cc:583
+#: src/solution_fragment.cc:113 src/solution_item.cc:593
#, c-format
msgid "%s recommends %s"
msgstr "%s rekommenderar %s"
@@ -4343,7 +4344,7 @@ msgstr "Uppgradera %F [%s (%s) -> %s (%s)]"
msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgstr "Nedgradera %F [%s (%s) -> %s (%s)]"
-#: src/solution_item.cc:587
+#: src/solution_item.cc:597
#, c-format
msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
msgstr "-> Lmna beroendet \"%s rekommenderar %s\" olst."
@@ -4376,7 +4377,7 @@ msgstr "Nedgradera fljande paket:"
msgid "Leave the following recommendations unresolved:"
msgstr "Lmna fljande rekommendationer utan tgrd:"
-#: src/solution_screen.cc:463
+#: src/solution_screen.cc:472
msgid "No broken packages."
msgstr "Inga brutna paket."
diff --git a/po/tl.po b/po/tl.po
index 1e182f7f..6e1dade4 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
-"POT-Creation-Date: 2005-11-07 15:22-0800\n"
+"POT-Creation-Date: 2005-11-13 10:12-0800\n"
"PO-Revision-Date: 2005-03-30 16:02+0800\n"
"Last-Translator: Ryan Escarez <rescarez@gmail.com>\n"
"Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -211,7 +211,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
msgstr "Hindi ma-buksan ang %s para sulatan"
#: src/broken_indicator.cc:273 src/solution_dialog.cc:126
-#: src/solution_screen.cc:513
+#: src/solution_screen.cc:522
msgid "Internal error: unexpected null solution."
msgstr ""
@@ -811,43 +811,43 @@ msgid ""
"The following actions are available:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:167
+#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:184
#, fuzzy
msgid "'+' to install packages"
msgstr "^Iluklok/tanggalin ang mga pakete"
-#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:186
#, fuzzy
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
msgstr "Ang mga sumusunod na BAGONG mga pakete ay awtomatikong iinstolahin:"
-#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:171
+#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:188
#, fuzzy
msgid "'-' to remove packages"
msgstr "^Iluklok/tanggalin ang mga pakete"
-#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:173
+#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:190
#, fuzzy
msgid "'_' to purge packages"
msgstr "^Kalimutan ang mga bagong pakete"
-#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:175
+#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:192
#, fuzzy
msgid "'=' to place packages on hold"
msgstr " hold - ilagay ang pakete sa pag kakahawak\n"
-#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:177
+#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:194
msgid ""
"':' to keep packages in their current state without placing them on hold"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:179
+#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:196
#, fuzzy
msgid "'&M' to mark packages as automatically installed"
msgstr " markahanlagi - Markahan ang pakete para kusang mag instal\n"
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:181
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:198
#, fuzzy
msgid "'&m' to mark packages as manually installed"
msgstr " alisin-ang-marka-lagi - Markahan ang pakete para i-manual instal\n"
@@ -933,203 +933,204 @@ msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr ""
"Di tanggap na sagot. Pakibigay ng tanggap na utos o '?' para sa tulong.\n"
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_resolver.cc:124 src/cmdline/cmdline_resolver.cc:597
+#: src/generic/apt/apt.cc:199
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "Hindi ma-buksan ang %s para sulatan"
+
+#: src/cmdline/cmdline_resolver.cc:130 src/cmdline/cmdline_resolver.cc:602
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Error sa pagsulat ng state file"
+
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:604
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:145
#, c-format
msgid ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
"n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:164
msgid "accept the proposed changes"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:149
+#: src/cmdline/cmdline_resolver.cc:166
msgid "reject the proposed changes and search for another solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:151
+#: src/cmdline/cmdline_resolver.cc:168
#, fuzzy
msgid "give up and quit the program"
msgstr "Lumabas sa programa"
-#: src/cmdline/cmdline_resolver.cc:153
+#: src/cmdline/cmdline_resolver.cc:170
msgid "move to the next solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:155
+#: src/cmdline/cmdline_resolver.cc:172
msgid "move to the previous solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:157
+#: src/cmdline/cmdline_resolver.cc:174
msgid "view an explanation of the changes in the solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:159
+#: src/cmdline/cmdline_resolver.cc:176
#, fuzzy
msgid "examine the solution in the visual user interface"
msgstr "Baguhin ang settings na maapektuhan ang user interface"
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:178
msgid ""
"reject the given package versions; don't display any solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:163
+#: src/cmdline/cmdline_resolver.cc:180
msgid ""
"accept the given package versions; display only solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:165
+#: src/cmdline/cmdline_resolver.cc:182
msgid "adjust the state of the listed packages, where ACTION is one of:"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:183
+#: src/cmdline/cmdline_resolver.cc:200
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:197
+#: src/cmdline/cmdline_resolver.cc:214
#, c-format
msgid "The version %s is available in the following archives:"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:205
+#: src/cmdline/cmdline_resolver.cc:222
#, c-format
msgid "Select the version of %s that should be used: "
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:229
#, fuzzy, c-format
msgid "Invalid response. Please enter an integer between 1 and %d."
msgstr ""
"Di tanggap na sagot. Pakibigay ng tanggap na utos o '?' para sa tulong.\n"
-#: src/cmdline/cmdline_resolver.cc:227
+#: src/cmdline/cmdline_resolver.cc:244
#, c-format
msgid "Expected at least one package/version pair following '%c'"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:241
+#: src/cmdline/cmdline_resolver.cc:258
#, fuzzy, c-format
msgid "Expected a version after \"%s\""
msgstr "Hindi ma-buksan ang %s para sulatan"
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:268
#, fuzzy, c-format
msgid "No such package \"%s\""
msgstr "Pinanggalingan ng pakete: "
-#: src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_resolver.cc:284
#, c-format
msgid "%s has no version named \"%s\""
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:301
#, c-format
msgid "Allowing the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:287
+#: src/cmdline/cmdline_resolver.cc:304
#, c-format
msgid "Allowing the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:314
#, c-format
msgid "Rejecting the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:317
#, c-format
msgid "Rejecting the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:330
#, c-format
msgid "No longer requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:333
#, c-format
msgid "No longer requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:325
+#: src/cmdline/cmdline_resolver.cc:342
#, c-format
msgid "Requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:328
+#: src/cmdline/cmdline_resolver.cc:345
#, c-format
msgid "Requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:447 src/solution_screen.cc:486
+#: src/cmdline/cmdline_resolver.cc:464 src/solution_screen.cc:495
#, c-format
msgid "open: %d; closed: %d; defer: %d; conflict: %d"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:493
+#: src/cmdline/cmdline_resolver.cc:510
#, fuzzy
msgid "The following actions will resolve these dependencies:"
msgstr "Ang mga sumusunod na pakete ay may kulang na dependensiya:\n"
-#: src/cmdline/cmdline_resolver.cc:508
+#: src/cmdline/cmdline_resolver.cc:525
msgid "Accept this solution? [Y/n/q/?] "
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:535 src/cmdline/cmdline_resolver.cc:627
+#: src/cmdline/cmdline_resolver.cc:552 src/cmdline/cmdline_resolver.cc:644
msgid "Abandoning all efforts to resolve these dependencies."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:562
+#: src/cmdline/cmdline_resolver.cc:579
#, fuzzy
msgid "The following commands are available:"
msgstr "Ang mga sumusunod na pakete ay SIRA:"
-#: src/cmdline/cmdline_resolver.cc:577
+#: src/cmdline/cmdline_resolver.cc:594
msgid "File to write resolver state to: "
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:580 src/generic/apt/apt.cc:199
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Hindi ma-buksan ang %s para sulatan"
-
-#: src/cmdline/cmdline_resolver.cc:585
-#, fuzzy, c-format
-msgid "Error writing resolver state to %s"
-msgstr "Error sa pagsulat ng state file"
-
-#: src/cmdline/cmdline_resolver.cc:587
-msgid "Resolver state successfully written!"
-msgstr ""
-
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:609
#, fuzzy
msgid "Invalid response; please enter one of the following commands:"
msgstr ""
"Di tanggap na sagot. Pakibigay ng tanggap na utos o '?' para sa tulong.\n"
-#: src/cmdline/cmdline_resolver.cc:602
+#: src/cmdline/cmdline_resolver.cc:619
msgid "No solution found within the allotted time. Try harder? [Y/n]"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:630
+#: src/cmdline/cmdline_resolver.cc:647
#, fuzzy
msgid "Invalid response; please enter 'y' or 'n'."
msgstr ""
"Di tanggap na sagot. Pakibigay ng tanggap na utos o '?' para sa tulong.\n"
-#: src/cmdline/cmdline_resolver.cc:639
+#: src/cmdline/cmdline_resolver.cc:656
msgid "Unable to resolve dependencies! Giving up..."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:645
+#: src/cmdline/cmdline_resolver.cc:662
msgid "*** No more solutions available ***"
msgstr ""
@@ -1549,63 +1550,63 @@ msgstr "Hindi ma-buksan ang Aptitude extended state file"
msgid "Reading extended state information"
msgstr "Binabasa ang impormasyon ng extended state"
-#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:403
-#: src/generic/apt/aptcache.cc:406
+#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:405
+#: src/generic/apt/aptcache.cc:408
msgid "Initializing package states"
msgstr "Naghahanda ang package states"
-#: src/generic/apt/aptcache.cc:530
+#: src/generic/apt/aptcache.cc:533
msgid "Cannot open Aptitude state file"
msgstr "Hindi ma-buksan ang Aptitude state file"
-#: src/generic/apt/aptcache.cc:534 src/generic/apt/aptcache.cc:589
-#: src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:537 src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:595
msgid "Writing extended state information"
msgstr "Nag-susulat ng extended state information"
-#: src/generic/apt/aptcache.cc:571
+#: src/generic/apt/aptcache.cc:574
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr ""
"May Internal buffer overflow sa pakete \"%s\" habang nag-susulat ng state "
"file"
-#: src/generic/apt/aptcache.cc:580
+#: src/generic/apt/aptcache.cc:583
msgid "Couldn't write state file"
msgstr "Hindi maka sulat ng state file"
-#: src/generic/apt/aptcache.cc:597
+#: src/generic/apt/aptcache.cc:600
msgid "Error writing state file"
msgstr "Error sa pagsulat ng state file"
-#: src/generic/apt/aptcache.cc:615
+#: src/generic/apt/aptcache.cc:618
#, fuzzy, c-format
msgid "failed to remove %s"
msgstr "Hindi ma-buksan ang %s para sulatan"
-#: src/generic/apt/aptcache.cc:622
+#: src/generic/apt/aptcache.cc:625
#, c-format
msgid "failed to rename %s to %s"
msgstr ""
-#: src/generic/apt/aptcache.cc:630
+#: src/generic/apt/aptcache.cc:633
#, fuzzy, c-format
msgid "couldn't replace %s with %s"
msgstr "hindi ma-palitan ang lumang state file"
-#: src/generic/apt/aptcache.cc:1122
+#: src/generic/apt/aptcache.cc:1125
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr "Hindi ma i-ayos ang dependecies, may mga pakete na hindi ma-install"
-#: src/generic/apt/aptcache.cc:1526
+#: src/generic/apt/aptcache.cc:1600
msgid "The list of sources could not be read."
msgstr "Ang source ng listahan ay hindi mabasa."
-#: src/generic/apt/aptcache.cc:1533
+#: src/generic/apt/aptcache.cc:1607
msgid "The package lists or status file could not be parsed or opened."
msgstr "Ang listahan ng pakete o status file ay hindi ma-parsed o ma buksan."
-#: src/generic/apt/aptcache.cc:1536
+#: src/generic/apt/aptcache.cc:1610
msgid "You may want to update the package lists to correct these missing files"
msgstr ""
"Pwede mong i-update ang listahan ng mga pakete para ma i-ayos ang mga "
@@ -3941,12 +3942,12 @@ msgstr ""
"Ikaw ba'y sigurado na aalisin ito?\n"
"Makinilyahin '%s' kung ukaw ay sigurado."
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:284
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:291
#, c-format
msgid "Information about %s"
msgstr "Impormasyon tungkol sa %s"
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:282
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:289
#, c-format
msgid "%s info"
msgstr ""
@@ -4291,7 +4292,7 @@ msgstr ""
"Ang mga sumusunod na pakete ay naka-depende sa bersyon %B%s%b ng %B%s%b, at "
"mababasag kapag na %s."
-#: src/solution_dialog.cc:91 src/solution_screen.cc:457
+#: src/solution_dialog.cc:91 src/solution_screen.cc:465
msgid "The package cache is not available."
msgstr ""
@@ -4300,11 +4301,11 @@ msgstr ""
msgid "No packages are broken."
msgstr "May mga pakete na basag. Subukin na ayusin sila?"
-#: src/solution_dialog.cc:108 src/solution_screen.cc:479
+#: src/solution_dialog.cc:108 src/solution_screen.cc:488
msgid "No resolution found."
msgstr ""
-#: src/solution_dialog.cc:114 src/solution_screen.cc:490
+#: src/solution_dialog.cc:114 src/solution_screen.cc:499
#, fuzzy
msgid "Resolving dependencies..."
msgstr "Hindi ma-buksan ang %s para sulatan"
@@ -4343,7 +4344,7 @@ msgstr "pre-depends sa"
msgid "%s suggests %s"
msgstr "suhisyon"
-#: src/solution_fragment.cc:113 src/solution_item.cc:583
+#: src/solution_fragment.cc:113 src/solution_item.cc:593
#, fuzzy, c-format
msgid "%s recommends %s"
msgstr "rekomedasyon"
@@ -4452,7 +4453,7 @@ msgstr ""
msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgstr "Nakuha %sB ng %s (%sB/s)."
-#: src/solution_item.cc:587
+#: src/solution_item.cc:597
#, fuzzy, c-format
msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
msgstr "Ang mga sumusunod na pakete ay SIRA:"
@@ -4492,7 +4493,7 @@ msgstr "Kinukuha ang mga pakete"
msgid "Leave the following recommendations unresolved:"
msgstr "Ang mga sumusunod na pakete ay SIRA:"
-#: src/solution_screen.cc:463
+#: src/solution_screen.cc:472
#, fuzzy
msgid "No broken packages."
msgstr "^Iluklok/tanggalin ang mga pakete"
diff --git a/po/tr.po b/po/tr.po
index 5ba4ab58..9ffb2015 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
-"POT-Creation-Date: 2005-11-07 15:22-0800\n"
+"POT-Creation-Date: 2005-11-13 10:12-0800\n"
"PO-Revision-Date: 2005-08-07 16:40+0300\n"
"Last-Translator: Erçin EKER <ercin.eker@linux.org.tr>\n"
"Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -202,7 +202,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
msgstr "Bağımlılıklar çözülemiytor."
#: src/broken_indicator.cc:273 src/solution_dialog.cc:126
-#: src/solution_screen.cc:513
+#: src/solution_screen.cc:522
msgid "Internal error: unexpected null solution."
msgstr "Dahili Hata: beklenmeyen boş çözüm."
@@ -795,38 +795,38 @@ msgstr ""
"daha fazla paket isminden (veya parçası) sonra bir eylem karakteri girin. "
"Eylem belirttiğiniz paketler üstünde işleme sokulacaktır. Mevcut eylemler: "
-#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:167
+#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:184
msgid "'+' to install packages"
msgstr "Paket kurmak için '+'"
-#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:186
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
msgstr ""
"Paketleri kurmak ve hemen otomatik kuruldu olarak işaretlemek için '+M'"
-#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:171
+#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:188
msgid "'-' to remove packages"
msgstr "Paket kaldırmak için '-'"
-#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:173
+#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:190
msgid "'_' to purge packages"
msgstr "Paketi temizlemek için '_'"
-#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:175
+#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:192
msgid "'=' to place packages on hold"
msgstr "Paketi tutmak için '='"
-#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:177
+#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:194
msgid ""
"':' to keep packages in their current state without placing them on hold"
msgstr "paketleri mevcut duruma sabitlemek için ':'"
-#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:179
+#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:196
msgid "'&M' to mark packages as automatically installed"
msgstr "Paketi otomatik kurulmuş olarak işaretlemek için'&M'"
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:181
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:198
msgid "'&m' to mark packages as manually installed"
msgstr "Paketleri elle kurulmuş olarak işaretlemek için '&m'"
@@ -910,59 +910,74 @@ msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr ""
"Geçersiz cevap. Lütfen geçerli bir komut girin ya da yardım için '?'.\n"
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_resolver.cc:124 src/cmdline/cmdline_resolver.cc:597
+#: src/generic/apt/apt.cc:199
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "%s yazmak için açılamıyor"
+
+#: src/cmdline/cmdline_resolver.cc:130 src/cmdline/cmdline_resolver.cc:602
+#, c-format
+msgid "Error writing resolver state to %s"
+msgstr "%s'e çözümleyici durumu yazmadan hata"
+
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:604
+msgid "Resolver state successfully written!"
+msgstr "Çözümleyici durumu başarıyla yazıldı!"
+
+#: src/cmdline/cmdline_resolver.cc:145
#, fuzzy, c-format
msgid ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
"n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
msgstr "y: %Fn: %Fq: %F,: %F.: %F<EYLEM> pkg... : %F%n%F%F%F%F%F%F%F%F"
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:164
msgid "accept the proposed changes"
msgstr "önerilen değişikliği kabul et"
-#: src/cmdline/cmdline_resolver.cc:149
+#: src/cmdline/cmdline_resolver.cc:166
msgid "reject the proposed changes and search for another solution"
msgstr "önerilen değişiliği reddet ve başka bir çözüm bul"
-#: src/cmdline/cmdline_resolver.cc:151
+#: src/cmdline/cmdline_resolver.cc:168
msgid "give up and quit the program"
msgstr "vazgeç ve uygulamadan çık"
-#: src/cmdline/cmdline_resolver.cc:153
+#: src/cmdline/cmdline_resolver.cc:170
msgid "move to the next solution"
msgstr "sonraki çözüme taşı"
-#: src/cmdline/cmdline_resolver.cc:155
+#: src/cmdline/cmdline_resolver.cc:172
msgid "move to the previous solution"
msgstr "önceki çözüme taşı"
-#: src/cmdline/cmdline_resolver.cc:157
+#: src/cmdline/cmdline_resolver.cc:174
msgid "view an explanation of the changes in the solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:159
+#: src/cmdline/cmdline_resolver.cc:176
#, fuzzy
msgid "examine the solution in the visual user interface"
msgstr "Kullanıcı arayüzünü etkileyen ayarları değiştirir"
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:178
msgid ""
"reject the given package versions; don't display any solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:163
+#: src/cmdline/cmdline_resolver.cc:180
msgid ""
"accept the given package versions; display only solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:165
+#: src/cmdline/cmdline_resolver.cc:182
msgid "adjust the state of the listed packages, where ACTION is one of:"
msgstr "listelenen paketlerin durumunu ayarla, EYLEM:"
-#: src/cmdline/cmdline_resolver.cc:183
+#: src/cmdline/cmdline_resolver.cc:200
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
@@ -970,137 +985,123 @@ msgstr ""
"Ayarlamalar şu an ki çözümün göz ardı edilmesine neden olacak ve gerekli "
"olursa yeniden hesaplanacak."
-#: src/cmdline/cmdline_resolver.cc:197
+#: src/cmdline/cmdline_resolver.cc:214
#, c-format
msgid "The version %s is available in the following archives:"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:205
+#: src/cmdline/cmdline_resolver.cc:222
#, fuzzy, c-format
msgid "Select the version of %s that should be used: "
msgstr "Çözücü durumunun kaydedileceği dosya:"
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:229
#, fuzzy, c-format
msgid "Invalid response. Please enter an integer between 1 and %d."
msgstr "Geçersiz yanıt. lütfen 'e' veya 'h' girin."
-#: src/cmdline/cmdline_resolver.cc:227
+#: src/cmdline/cmdline_resolver.cc:244
#, c-format
msgid "Expected at least one package/version pair following '%c'"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:241
+#: src/cmdline/cmdline_resolver.cc:258
#, fuzzy, c-format
msgid "Expected a version after \"%s\""
msgstr "\"%ls\"den sonra paket gösterimi kod dönüşümü yapılamıyor"
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:268
#, fuzzy, c-format
msgid "No such package \"%s\""
msgstr "Kaynak paketi: "
-#: src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_resolver.cc:284
#, c-format
msgid "%s has no version named \"%s\""
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:301
#, c-format
msgid "Allowing the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:287
+#: src/cmdline/cmdline_resolver.cc:304
#, c-format
msgid "Allowing the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:314
#, c-format
msgid "Rejecting the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:317
#, c-format
msgid "Rejecting the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:330
#, c-format
msgid "No longer requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:333
#, c-format
msgid "No longer requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:325
+#: src/cmdline/cmdline_resolver.cc:342
#, c-format
msgid "Requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:328
+#: src/cmdline/cmdline_resolver.cc:345
#, c-format
msgid "Requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:447 src/solution_screen.cc:486
+#: src/cmdline/cmdline_resolver.cc:464 src/solution_screen.cc:495
#, c-format
msgid "open: %d; closed: %d; defer: %d; conflict: %d"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:493
+#: src/cmdline/cmdline_resolver.cc:510
msgid "The following actions will resolve these dependencies:"
msgstr "Aşağıdaki paketler bu bağımlılıkları karşılayacak:"
-#: src/cmdline/cmdline_resolver.cc:508
+#: src/cmdline/cmdline_resolver.cc:525
msgid "Accept this solution? [Y/n/q/?] "
msgstr "Çözümü kabul et? [E/h/i/?]"
-#: src/cmdline/cmdline_resolver.cc:535 src/cmdline/cmdline_resolver.cc:627
+#: src/cmdline/cmdline_resolver.cc:552 src/cmdline/cmdline_resolver.cc:644
msgid "Abandoning all efforts to resolve these dependencies."
msgstr "Bağımlılıkları çözmek için yapılan işlemler iptal ediliyor."
-#: src/cmdline/cmdline_resolver.cc:562
+#: src/cmdline/cmdline_resolver.cc:579
msgid "The following commands are available:"
msgstr "Şu komutlar mevcut:"
-#: src/cmdline/cmdline_resolver.cc:577
+#: src/cmdline/cmdline_resolver.cc:594
msgid "File to write resolver state to: "
msgstr "Çözümleyici durumunu dosyaya yaz:"
-#: src/cmdline/cmdline_resolver.cc:580 src/generic/apt/apt.cc:199
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "%s yazmak için açılamıyor"
-
-#: src/cmdline/cmdline_resolver.cc:585
-#, c-format
-msgid "Error writing resolver state to %s"
-msgstr "%s'e çözümleyici durumu yazmadan hata"
-
-#: src/cmdline/cmdline_resolver.cc:587
-msgid "Resolver state successfully written!"
-msgstr "Çözümleyici durumu başarıyla yazıldı!"
-
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:609
msgid "Invalid response; please enter one of the following commands:"
msgstr "Geçersiz yanıt. Lütfen şu komutları kullanın: "
-#: src/cmdline/cmdline_resolver.cc:602
+#: src/cmdline/cmdline_resolver.cc:619
msgid "No solution found within the allotted time. Try harder? [Y/n]"
msgstr "Belirlenmiş sürede çözüm bulunamadı. Denemeye devam et? [E/h]"
-#: src/cmdline/cmdline_resolver.cc:630
+#: src/cmdline/cmdline_resolver.cc:647
msgid "Invalid response; please enter 'y' or 'n'."
msgstr "Geçersiz yanıt. lütfen 'e' veya 'h' girin."
-#: src/cmdline/cmdline_resolver.cc:639
+#: src/cmdline/cmdline_resolver.cc:656
msgid "Unable to resolve dependencies! Giving up..."
msgstr "Başımlılık çözülemiyor! Vazgeçiliyor..."
-#: src/cmdline/cmdline_resolver.cc:645
+#: src/cmdline/cmdline_resolver.cc:662
#, fuzzy
msgid "*** No more solutions available ***"
msgstr "Başka çözüm yok."
@@ -1519,61 +1520,61 @@ msgstr "Aptitude geniş durum dosyası açılamıyor"
msgid "Reading extended state information"
msgstr "Geniş durum bilgisi okunuyor"
-#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:403
-#: src/generic/apt/aptcache.cc:406
+#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:405
+#: src/generic/apt/aptcache.cc:408
msgid "Initializing package states"
msgstr "Paketlerin durumu güncelleniyor"
-#: src/generic/apt/aptcache.cc:530
+#: src/generic/apt/aptcache.cc:533
msgid "Cannot open Aptitude state file"
msgstr "Aptitude durum dosyası açılamıyor"
-#: src/generic/apt/aptcache.cc:534 src/generic/apt/aptcache.cc:589
-#: src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:537 src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:595
msgid "Writing extended state information"
msgstr "Geniş durum bilgisi yazılıyor"
-#: src/generic/apt/aptcache.cc:571
+#: src/generic/apt/aptcache.cc:574
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr "\"%s\" paketinde durum dosyası yazılırken iç tampon taşması"
-#: src/generic/apt/aptcache.cc:580
+#: src/generic/apt/aptcache.cc:583
msgid "Couldn't write state file"
msgstr "Durum dosyası yazılamıyor"
-#: src/generic/apt/aptcache.cc:597
+#: src/generic/apt/aptcache.cc:600
msgid "Error writing state file"
msgstr "Durum dosyası yazma hatası"
-#: src/generic/apt/aptcache.cc:615
+#: src/generic/apt/aptcache.cc:618
#, fuzzy, c-format
msgid "failed to remove %s"
msgstr "%ls açılamıyor"
-#: src/generic/apt/aptcache.cc:622
+#: src/generic/apt/aptcache.cc:625
#, c-format
msgid "failed to rename %s to %s"
msgstr ""
-#: src/generic/apt/aptcache.cc:630
+#: src/generic/apt/aptcache.cc:633
#, fuzzy, c-format
msgid "couldn't replace %s with %s"
msgstr "Eski durum dosyası değiştirilemiyor"
-#: src/generic/apt/aptcache.cc:1122
+#: src/generic/apt/aptcache.cc:1125
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr "Bağımlılıklar sağlanamıyor, bazı paketler kurulamıyor"
-#: src/generic/apt/aptcache.cc:1526
+#: src/generic/apt/aptcache.cc:1600
msgid "The list of sources could not be read."
msgstr "Kaynak listesi okunamıyor"
-#: src/generic/apt/aptcache.cc:1533
+#: src/generic/apt/aptcache.cc:1607
msgid "The package lists or status file could not be parsed or opened."
msgstr "Paket listesi ya da durum dosyası anlaşılamadı ya da açılamadı"
-#: src/generic/apt/aptcache.cc:1536
+#: src/generic/apt/aptcache.cc:1610
msgid "You may want to update the package lists to correct these missing files"
msgstr "Bu kayıp dosyalar için paket listesini güncellemek istemelisiniz"
@@ -3855,12 +3856,12 @@ msgstr ""
"%s temel bir pakettir!%n%nBu paketi kaldırmak istediğinizden emin misiniz?%"
"nEğer eminseniz '%s' yazın."
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:284
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:291
#, c-format
msgid "Information about %s"
msgstr "%s hakkında bilgi"
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:282
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:289
#, c-format
msgid "%s info"
msgstr "%s bilgisi"
@@ -4195,7 +4196,7 @@ msgstr ""
"Bu paketler %B%s%b sürümündeki %B%s%b paketine ihtiyaç duyuyorlar, ve bu "
"paket %s kırık bağımlılıkları olacak."
-#: src/solution_dialog.cc:91 src/solution_screen.cc:457
+#: src/solution_dialog.cc:91 src/solution_screen.cc:465
msgid "The package cache is not available."
msgstr "Paket tamponu mevcut değil."
@@ -4203,11 +4204,11 @@ msgstr "Paket tamponu mevcut değil."
msgid "No packages are broken."
msgstr "Bozuk paket bulunmuyor."
-#: src/solution_dialog.cc:108 src/solution_screen.cc:479
+#: src/solution_dialog.cc:108 src/solution_screen.cc:488
msgid "No resolution found."
msgstr "Çözüm bulunamadı."
-#: src/solution_dialog.cc:114 src/solution_screen.cc:490
+#: src/solution_dialog.cc:114 src/solution_screen.cc:499
#, fuzzy
msgid "Resolving dependencies..."
msgstr "Bağımlılıklar çözülemiytor."
@@ -4243,7 +4244,7 @@ msgstr "ön-bağımlı ise"
msgid "%s suggests %s"
msgstr "teklif ederse"
-#: src/solution_fragment.cc:113 src/solution_item.cc:583
+#: src/solution_fragment.cc:113 src/solution_item.cc:593
#, fuzzy, c-format
msgid "%s recommends %s"
msgstr "tavsiye ederse"
@@ -4347,7 +4348,7 @@ msgstr ""
msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgstr "%sB %s de indirildi (%sB/s)."
-#: src/solution_item.cc:587
+#: src/solution_item.cc:597
#, fuzzy, c-format
msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
msgstr "Aşağıdaki paketleri %Bkaldır%b:%n"
@@ -4387,7 +4388,7 @@ msgstr "Aşağıdaki paketlerin %Beski sürümünü kur%b:%n"
msgid "Leave the following recommendations unresolved:"
msgstr "Aşağıdaki paketleri %Bkaldır%b:%n"
-#: src/solution_screen.cc:463
+#: src/solution_screen.cc:472
#, fuzzy
msgid "No broken packages."
msgstr "Paket kaldırmak için '-'"
diff --git a/po/vi.po b/po/vi.po
index 16907267..34cf6604 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude 0.4.x\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
-"POT-Creation-Date: 2005-11-07 15:22-0800\n"
+"POT-Creation-Date: 2005-11-13 10:12-0800\n"
"PO-Revision-Date: 2005-09-03 22:52+0930\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -198,7 +198,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
msgstr "Tháo gỡ cách phụ thuộc"
#: src/broken_indicator.cc:273 src/solution_dialog.cc:126
-#: src/solution_screen.cc:513
+#: src/solution_screen.cc:522
msgid "Internal error: unexpected null solution."
msgstr "Gặp lỗi nội bộ: giải pháp rỗng bất ngờ."
@@ -797,39 +797,39 @@ msgstr ""
"sau. Sẽ áp dụng hành động ấy vào mọi gói có trong danh sách ấy. Có thể sử "
"dụng những hành động này:"
-#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:167
+#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:184
msgid "'+' to install packages"
msgstr "«+» (dấu cộng) để cài đặt gói"
-#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:186
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
msgstr "«+M» để cài đặt gói và ngay đánh dấu mỗi điều đã được cài tự động"
-#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:171
+#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:188
msgid "'-' to remove packages"
msgstr "«-» (dấu trừ) để loại bỏ gói"
-#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:173
+#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:190
msgid "'_' to purge packages"
msgstr "«_» (dấu gạch dưới) để tẩy gói"
-#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:175
+#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:192
msgid "'=' to place packages on hold"
msgstr "«=» (dấu bằng) để giữ lại gói"
-#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:177
+#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:194
msgid ""
"':' to keep packages in their current state without placing them on hold"
msgstr ""
"«:» (dấu hai chấm) giữ các gói ấy trong tính trạng hiện thời, không lập tính "
"trạng «giữ lại»"
-#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:179
+#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:196
msgid "'&M' to mark packages as automatically installed"
msgstr "«&M» để đánh dấu mỗi gói đã được cài đặt tự động"
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:181
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:198
msgid "'&m' to mark packages as manually installed"
msgstr "«&m» để đánh dấu mỗi gói đã được cài đặt thủ công"
@@ -913,7 +913,22 @@ msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr ""
"Cách trả lời không hợp lệ. Hãy gõ lệnh hợp lệ hay lệnh «?» để xem trợ giúp.\n"
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_resolver.cc:124 src/cmdline/cmdline_resolver.cc:597
+#: src/generic/apt/apt.cc:199
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "Không thể mở %s để ghi."
+
+#: src/cmdline/cmdline_resolver.cc:130 src/cmdline/cmdline_resolver.cc:602
+#, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Gặp lỗi khi ghi tính trạng bộ tháo gỡ vào %s"
+
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:604
+msgid "Resolver state successfully written!"
+msgstr "Tính trạng bộ tháo gỡ đã được ghi thành công."
+
+#: src/cmdline/cmdline_resolver.cc:145
#, c-format
msgid ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
@@ -922,35 +937,35 @@ msgstr ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na gói phb ...: %F%"
"n<HÀNH_ĐỘNG> gói... : %F%n%F%F%F%F%F%F%F%F"
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:164
msgid "accept the proposed changes"
msgstr "chấp nhận các thay đổi được đệ nghị"
-#: src/cmdline/cmdline_resolver.cc:149
+#: src/cmdline/cmdline_resolver.cc:166
msgid "reject the proposed changes and search for another solution"
msgstr "từ chối các thay đổi được đệ nghị, và tìm kiếm một giải pháp khác"
-#: src/cmdline/cmdline_resolver.cc:151
+#: src/cmdline/cmdline_resolver.cc:168
msgid "give up and quit the program"
msgstr "hủy bỏ rồi thoát khỏi chương trình"
-#: src/cmdline/cmdline_resolver.cc:153
+#: src/cmdline/cmdline_resolver.cc:170
msgid "move to the next solution"
msgstr "tiếp tục đến giải pháp kế"
-#: src/cmdline/cmdline_resolver.cc:155
+#: src/cmdline/cmdline_resolver.cc:172
msgid "move to the previous solution"
msgstr "trở về giải pháp trước"
-#: src/cmdline/cmdline_resolver.cc:157
+#: src/cmdline/cmdline_resolver.cc:174
msgid "view an explanation of the changes in the solution"
msgstr "xem một lời giải thích của các thay đổi trong giải pháp"
-#: src/cmdline/cmdline_resolver.cc:159
+#: src/cmdline/cmdline_resolver.cc:176
msgid "examine the solution in the visual user interface"
msgstr "kiểm tra giải pháp trong giao diện người dùng trực quan"
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:178
msgid ""
"reject the given package versions; don't display any solutions in which they "
"occur."
@@ -958,7 +973,7 @@ msgstr ""
"từ chối những phiên bản gói đã cho; đừng hiển thị giải pháp nào chứa phiên "
"bản đó."
-#: src/cmdline/cmdline_resolver.cc:163
+#: src/cmdline/cmdline_resolver.cc:180
msgid ""
"accept the given package versions; display only solutions in which they "
"occur."
@@ -966,153 +981,139 @@ msgstr ""
"chấp nhận những phiên bản gói đã cho; hiển thị chỉ giải pháp chứa phiên bản "
"đó."
-#: src/cmdline/cmdline_resolver.cc:165
+#: src/cmdline/cmdline_resolver.cc:182
msgid "adjust the state of the listed packages, where ACTION is one of:"
msgstr ""
"điều chỉnh tính trạng của các gói, mà HÀNH ĐỘNG là một điều của những điều "
"theo đậy:"
-#: src/cmdline/cmdline_resolver.cc:183
+#: src/cmdline/cmdline_resolver.cc:200
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
msgstr ""
"Điều chỉnh sẽ hủy bỏ giải pháp hiện thời, và tính lại nó khi cần thiết."
-#: src/cmdline/cmdline_resolver.cc:197
+#: src/cmdline/cmdline_resolver.cc:214
#, c-format
msgid "The version %s is available in the following archives:"
msgstr "Phiên bản %s công bố trong những kho này:"
-#: src/cmdline/cmdline_resolver.cc:205
+#: src/cmdline/cmdline_resolver.cc:222
#, c-format
msgid "Select the version of %s that should be used: "
msgstr "Hãy chọn phiên bản của %s nên dùng:"
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:229
#, c-format
msgid "Invalid response. Please enter an integer between 1 and %d."
msgstr "Đáp ứng không hợp lệ: hãy gõ một số nguyên giữa 1 và %d."
-#: src/cmdline/cmdline_resolver.cc:227
+#: src/cmdline/cmdline_resolver.cc:244
#, c-format
msgid "Expected at least one package/version pair following '%c'"
msgstr "Ngờ ít nhất một gói/phiên bản đi theo « %c .»"
-#: src/cmdline/cmdline_resolver.cc:241
+#: src/cmdline/cmdline_resolver.cc:258
#, c-format
msgid "Expected a version after \"%s\""
msgstr "Ngờ một phiên bản sau « %s »."
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:268
#, c-format
msgid "No such package \"%s\""
msgstr "Không có gói « %s » như vậy"
-#: src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_resolver.cc:284
#, c-format
msgid "%s has no version named \"%s\""
msgstr "%s không có phiên bản tên « %s »."
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:301
#, c-format
msgid "Allowing the removal of %s"
msgstr "Đang cho phép gỡ bỏ %s"
-#: src/cmdline/cmdline_resolver.cc:287
+#: src/cmdline/cmdline_resolver.cc:304
#, c-format
msgid "Allowing the installation of %s version %s (%s)"
msgstr "Đang cho phép cài đặt %s phiên bản %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:314
#, c-format
msgid "Rejecting the removal of %s"
msgstr "Đang từ chối gỡ bỏ %s"
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:317
#, c-format
msgid "Rejecting the installation of %s version %s (%s)"
msgstr "Đang từ chối cài đặt %s phiên bản %s (%s)"
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:330
#, c-format
msgid "No longer requiring the removal of %s"
msgstr "Không còn cần thiết lại gỡ bỏ %s."
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:333
#, c-format
msgid "No longer requiring the installation of %s version %s (%s)"
msgstr "Không còn cần thiết lại cài đặt %s phiên bản %s (%s)."
-#: src/cmdline/cmdline_resolver.cc:325
+#: src/cmdline/cmdline_resolver.cc:342
#, c-format
msgid "Requiring the removal of %s"
msgstr "Cần thiết gỡ bỏ %s."
-#: src/cmdline/cmdline_resolver.cc:328
+#: src/cmdline/cmdline_resolver.cc:345
#, c-format
msgid "Requiring the installation of %s version %s (%s)"
msgstr "Cần thiết cài đặt %s phiên bản %s (%s)."
-#: src/cmdline/cmdline_resolver.cc:447 src/solution_screen.cc:486
+#: src/cmdline/cmdline_resolver.cc:464 src/solution_screen.cc:495
#, c-format
msgid "open: %d; closed: %d; defer: %d; conflict: %d"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:493
+#: src/cmdline/cmdline_resolver.cc:510
msgid "The following actions will resolve these dependencies:"
msgstr "Theo đây có một số hành động sẽ tháo gỡ những cách phụ thuộc này:"
-#: src/cmdline/cmdline_resolver.cc:508
+#: src/cmdline/cmdline_resolver.cc:525
msgid "Accept this solution? [Y/n/q/?] "
msgstr ""
"Chấp nhận giải pháp này không? [Y] có, [n] không, [q] hỏi, [?] trợ giúp"
-#: src/cmdline/cmdline_resolver.cc:535 src/cmdline/cmdline_resolver.cc:627
+#: src/cmdline/cmdline_resolver.cc:552 src/cmdline/cmdline_resolver.cc:644
msgid "Abandoning all efforts to resolve these dependencies."
msgstr "Hiện thời hủy bỏ cố tháo gỡ những cách phục thuộc này."
-#: src/cmdline/cmdline_resolver.cc:562
+#: src/cmdline/cmdline_resolver.cc:579
msgid "The following commands are available:"
msgstr "Theo đây có những lệnh sẵn sàng hiện có:"
-#: src/cmdline/cmdline_resolver.cc:577
+#: src/cmdline/cmdline_resolver.cc:594
msgid "File to write resolver state to: "
msgstr "Ghi tính trạng tháo gỡ vào tập tin này:"
-#: src/cmdline/cmdline_resolver.cc:580 src/generic/apt/apt.cc:199
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Không thể mở %s để ghi."
-
-#: src/cmdline/cmdline_resolver.cc:585
-#, c-format
-msgid "Error writing resolver state to %s"
-msgstr "Gặp lỗi khi ghi tính trạng bộ tháo gỡ vào %s"
-
-#: src/cmdline/cmdline_resolver.cc:587
-msgid "Resolver state successfully written!"
-msgstr "Tính trạng bộ tháo gỡ đã được ghi thành công."
-
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:609
msgid "Invalid response; please enter one of the following commands:"
msgstr "Đáp ứng không hợp lệ: hãy gõ một của những lệnh theo đây:"
-#: src/cmdline/cmdline_resolver.cc:602
+#: src/cmdline/cmdline_resolver.cc:619
msgid "No solution found within the allotted time. Try harder? [Y/n]"
msgstr ""
"Không tìm giải pháp trong thời gian được gán. Cố tích cực hơn không? [Y] có, "
"[n] không"
-#: src/cmdline/cmdline_resolver.cc:630
+#: src/cmdline/cmdline_resolver.cc:647
msgid "Invalid response; please enter 'y' or 'n'."
msgstr "Đáp ứng không hợp lệ: hãy gõ «y» (có) hay «n» (không)."
-#: src/cmdline/cmdline_resolver.cc:639
+#: src/cmdline/cmdline_resolver.cc:656
msgid "Unable to resolve dependencies! Giving up..."
msgstr "Không thể tháo gỡ cách phụ thuộc. Hủy bỏ..."
-#: src/cmdline/cmdline_resolver.cc:645
+#: src/cmdline/cmdline_resolver.cc:662
#, fuzzy
msgid "*** No more solutions available ***"
msgstr "Không có giải pháp nữa."
@@ -1533,62 +1534,62 @@ msgstr "Không thể mở tập tin tính trạng kéo dài Aptitude."
msgid "Reading extended state information"
msgstr "Đang đọc thông tin tính trạng kéo dài."
-#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:403
-#: src/generic/apt/aptcache.cc:406
+#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:405
+#: src/generic/apt/aptcache.cc:408
msgid "Initializing package states"
msgstr "Đang khởi động tính trạng của các gói."
-#: src/generic/apt/aptcache.cc:530
+#: src/generic/apt/aptcache.cc:533
msgid "Cannot open Aptitude state file"
msgstr "Không thể mở tập tin tính trạng Aptitude."
-#: src/generic/apt/aptcache.cc:534 src/generic/apt/aptcache.cc:589
-#: src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:537 src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:595
msgid "Writing extended state information"
msgstr "Đang ghi thông tin tính trạng kéo dài."
-#: src/generic/apt/aptcache.cc:571
+#: src/generic/apt/aptcache.cc:574
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr ""
"Bộ đệm nội bộ bị tràn trên gói « %s » trong khi ghi tâp tin tính trạng."
-#: src/generic/apt/aptcache.cc:580
+#: src/generic/apt/aptcache.cc:583
msgid "Couldn't write state file"
msgstr "Không thể ghi tâp tin tính trạng."
-#: src/generic/apt/aptcache.cc:597
+#: src/generic/apt/aptcache.cc:600
msgid "Error writing state file"
msgstr "Gặp lỗi khi tâp tin tính trạng."
-#: src/generic/apt/aptcache.cc:615
+#: src/generic/apt/aptcache.cc:618
#, fuzzy, c-format
msgid "failed to remove %s"
msgstr "Không mở được «%ls»."
-#: src/generic/apt/aptcache.cc:622
+#: src/generic/apt/aptcache.cc:625
#, c-format
msgid "failed to rename %s to %s"
msgstr ""
-#: src/generic/apt/aptcache.cc:630
+#: src/generic/apt/aptcache.cc:633
#, fuzzy, c-format
msgid "couldn't replace %s with %s"
msgstr "không thể thay thế tâp tin tính trạng cũ."
-#: src/generic/apt/aptcache.cc:1122
+#: src/generic/apt/aptcache.cc:1125
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr "Không thể sửa cách phụ thuộc vì không thể cài một số gói."
-#: src/generic/apt/aptcache.cc:1526
+#: src/generic/apt/aptcache.cc:1600
msgid "The list of sources could not be read."
msgstr "Không thể đọc danh sách nguồn."
-#: src/generic/apt/aptcache.cc:1533
+#: src/generic/apt/aptcache.cc:1607
msgid "The package lists or status file could not be parsed or opened."
msgstr "Không thể phân tách hay mở danh sách hay tâp tin trạng thái."
-#: src/generic/apt/aptcache.cc:1536
+#: src/generic/apt/aptcache.cc:1610
msgid "You may want to update the package lists to correct these missing files"
msgstr ""
"Có lẽ bạn muốn cập nhật danh sách gói để sửa trường hợp có những tập tin này "
@@ -3858,12 +3859,12 @@ msgstr ""
"• « %s » là một gói cần yếu. •%n%nBạn có chắc muốn loại bỏ nó không?%nHãy gõ "
"« %s » nếu có."
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:284
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:291
#, c-format
msgid "Information about %s"
msgstr "Thông tin về « %s »"
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:282
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:289
#, c-format
msgid "%s info"
msgstr "%s thông tin"
@@ -4201,7 +4202,7 @@ msgstr ""
"Những gói theo đây phụ thuộc vào phiên bản %B%s%b %B%s%b thì se bị ngắt nếu "
"nó %s."
-#: src/solution_dialog.cc:91 src/solution_screen.cc:457
+#: src/solution_dialog.cc:91 src/solution_screen.cc:465
msgid "The package cache is not available."
msgstr "Bộ nhớ tạm gói chưa sẵn sàng."
@@ -4209,11 +4210,11 @@ msgstr "Bộ nhớ tạm gói chưa sẵn sàng."
msgid "No packages are broken."
msgstr "Không có gói bị ngắt."
-#: src/solution_dialog.cc:108 src/solution_screen.cc:479
+#: src/solution_dialog.cc:108 src/solution_screen.cc:488
msgid "No resolution found."
msgstr "Chưa tìm giải pháp."
-#: src/solution_dialog.cc:114 src/solution_screen.cc:490
+#: src/solution_dialog.cc:114 src/solution_screen.cc:499
#, fuzzy
msgid "Resolving dependencies..."
msgstr "Tháo gỡ cách phụ thuộc"
@@ -4249,7 +4250,7 @@ msgstr "%s phụ thuộc trước vào %s"
msgid "%s suggests %s"
msgstr "%s đệ nghị %s"
-#: src/solution_fragment.cc:113 src/solution_item.cc:583
+#: src/solution_fragment.cc:113 src/solution_item.cc:593
#, c-format
msgid "%s recommends %s"
msgstr "%s khuyến khích %s"
@@ -4353,7 +4354,7 @@ msgstr ""
msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgstr "Tải về %sB mất %s (%sB/s) rồi."
-#: src/solution_item.cc:587
+#: src/solution_item.cc:597
#, fuzzy, c-format
msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
msgstr "Còn lại những cách phụ thuộc theo đây chưa được tháo gỡ:%n"
@@ -4393,7 +4394,7 @@ msgstr "%BHạ cấp%b những gói theo đây:%n"
msgid "Leave the following recommendations unresolved:"
msgstr "Còn lại những cách phụ thuộc theo đây chưa được tháo gỡ:%n"
-#: src/solution_screen.cc:463
+#: src/solution_screen.cc:472
#, fuzzy
msgid "No broken packages."
msgstr "«-» (dấu trừ) để loại bỏ gói"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4033264d..d658e7ad 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude 0.3+SVN\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
-"POT-Creation-Date: 2005-11-07 15:22-0800\n"
+"POT-Creation-Date: 2005-11-13 10:12-0800\n"
"PO-Revision-Date: 2005-10-22 18:38-0500\n"
"Last-Translator: Haifeng Chen <optical.dlz@gmail.com>\n"
"Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
@@ -195,7 +195,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] 正在解决依赖关系"
#: src/broken_indicator.cc:273 src/solution_dialog.cc:126
-#: src/solution_screen.cc:513
+#: src/solution_screen.cc:522
msgid "Internal error: unexpected null solution."
msgstr "内部错误:意料之外的空解决方案。"
@@ -777,37 +777,37 @@ msgstr ""
"软件包的名称(或者模式)。该动作将被实施到您所选择的全部软件包。下列动作可供选"
"择:"
-#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:167
+#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:184
msgid "'+' to install packages"
msgstr "按'+'键来安装软件包"
-#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:186
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
msgstr "按'+M'安装软件包并且立即将它们标记为已安装状态"
-#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:171
+#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:188
msgid "'-' to remove packages"
msgstr "按'-'卸载软件包"
-#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:173
+#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:190
msgid "'_' to purge packages"
msgstr "按'_'清除软件包"
-#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:175
+#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:192
msgid "'=' to place packages on hold"
msgstr "按'='将软件包置于保持状态"
-#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:177
+#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:194
msgid ""
"':' to keep packages in their current state without placing them on hold"
msgstr "按':'将维持软件包当前状态但是并不将其置于保持状态"
-#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:179
+#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:196
msgid "'&M' to mark packages as automatically installed"
msgstr "按'&M'将软件包标记为自动安装"
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:181
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:198
msgid "'&m' to mark packages as manually installed"
msgstr "按'm'将软件包标记为手动安装"
@@ -890,194 +890,195 @@ msgstr ""
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr "非法响应。请输入一个合法命令或者“?”请求帮助。\n"
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_resolver.cc:124 src/cmdline/cmdline_resolver.cc:597
+#: src/generic/apt/apt.cc:199
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "无法打开 %s 以写入"
+
+#: src/cmdline/cmdline_resolver.cc:130 src/cmdline/cmdline_resolver.cc:602
+#, c-format
+msgid "Error writing resolver state to %s"
+msgstr "将依赖关系解决状态写入文件 %s 时发生错误"
+
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:604
+msgid "Resolver state successfully written!"
+msgstr "成功写入依赖关系解决状态!"
+
+#: src/cmdline/cmdline_resolver.cc:145
#, c-format
msgid ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
"n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:164
msgid "accept the proposed changes"
msgstr "接受所建议的变动"
-#: src/cmdline/cmdline_resolver.cc:149
+#: src/cmdline/cmdline_resolver.cc:166
msgid "reject the proposed changes and search for another solution"
msgstr "拒绝所建议的变动并寻找另一个解决方案"
-#: src/cmdline/cmdline_resolver.cc:151
+#: src/cmdline/cmdline_resolver.cc:168
msgid "give up and quit the program"
msgstr "放弃并退出此程序"
-#: src/cmdline/cmdline_resolver.cc:153
+#: src/cmdline/cmdline_resolver.cc:170
msgid "move to the next solution"
msgstr "到下一个解决方案"
-#: src/cmdline/cmdline_resolver.cc:155
+#: src/cmdline/cmdline_resolver.cc:172
msgid "move to the previous solution"
msgstr "到上一个解决方案"
-#: src/cmdline/cmdline_resolver.cc:157
+#: src/cmdline/cmdline_resolver.cc:174
msgid "view an explanation of the changes in the solution"
msgstr "查看关于解决方案中做的修改的说明"
-#: src/cmdline/cmdline_resolver.cc:159
+#: src/cmdline/cmdline_resolver.cc:176
msgid "examine the solution in the visual user interface"
msgstr "检查用户可视界面中的设置方案"
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:178
msgid ""
"reject the given package versions; don't display any solutions in which they "
"occur."
msgstr "拒绝给定的软件包版本;在它们出现的时候不显示任何解决方案。"
-#: src/cmdline/cmdline_resolver.cc:163
+#: src/cmdline/cmdline_resolver.cc:180
msgid ""
"accept the given package versions; display only solutions in which they "
"occur."
msgstr "接受给定的软件包版本;在它们出现的时候仅显示解决方案。"
-#: src/cmdline/cmdline_resolver.cc:165
+#: src/cmdline/cmdline_resolver.cc:182
msgid "adjust the state of the listed packages, where ACTION is one of:"
msgstr "修改所列软件包的状态,这里“状态”为下列项之一:"
-#: src/cmdline/cmdline_resolver.cc:183
+#: src/cmdline/cmdline_resolver.cc:200
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
msgstr "修改将导致当前解决方案被放弃或者必须重新计算。"
-#: src/cmdline/cmdline_resolver.cc:197
+#: src/cmdline/cmdline_resolver.cc:214
#, c-format
msgid "The version %s is available in the following archives:"
msgstr "在下列存档中版本 %s 已经可用了:"
-#: src/cmdline/cmdline_resolver.cc:205
+#: src/cmdline/cmdline_resolver.cc:222
#, c-format
msgid "Select the version of %s that should be used: "
msgstr "选择要被使用的 %s 的版本号:"
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:229
#, c-format
msgid "Invalid response. Please enter an integer between 1 and %d."
msgstr "无效响应。请输入 1 到 %d 之间的一个整数。"
-#: src/cmdline/cmdline_resolver.cc:227
+#: src/cmdline/cmdline_resolver.cc:244
#, c-format
msgid "Expected at least one package/version pair following '%c'"
msgstr "在“%c”后需要至少一个软件包/版本对"
-#: src/cmdline/cmdline_resolver.cc:241
+#: src/cmdline/cmdline_resolver.cc:258
#, c-format
msgid "Expected a version after \"%s\""
msgstr "在“%s”之后的一个预料中的版本"
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:268
#, c-format
msgid "No such package \"%s\""
msgstr "没有这个软件包“%s”"
-#: src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_resolver.cc:284
#, c-format
msgid "%s has no version named \"%s\""
msgstr "%s 没有“%s”这样一个版本"
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:301
#, c-format
msgid "Allowing the removal of %s"
msgstr "同意删除 %s"
-#: src/cmdline/cmdline_resolver.cc:287
+#: src/cmdline/cmdline_resolver.cc:304
#, c-format
msgid "Allowing the installation of %s version %s (%s)"
msgstr "同意安装 %s 的 %s 版本(%s)"
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:314
#, c-format
msgid "Rejecting the removal of %s"
msgstr "放弃删除 %s"
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:317
#, c-format
msgid "Rejecting the installation of %s version %s (%s)"
msgstr "放弃安装 %s 的 %s 版本(%s)"
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:330
#, c-format
msgid "No longer requiring the removal of %s"
msgstr "不再要求删除 %s"
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:333
#, c-format
msgid "No longer requiring the installation of %s version %s (%s)"
msgstr "不再要求安装 %s 的 %s 版本(%s)"
-#: src/cmdline/cmdline_resolver.cc:325
+#: src/cmdline/cmdline_resolver.cc:342
#, c-format
msgid "Requiring the removal of %s"
msgstr "要求删除 %s"
-#: src/cmdline/cmdline_resolver.cc:328
+#: src/cmdline/cmdline_resolver.cc:345
#, c-format
msgid "Requiring the installation of %s version %s (%s)"
msgstr "要求安装 %s 的 %s 版本(%s)"
-#: src/cmdline/cmdline_resolver.cc:447 src/solution_screen.cc:486
+#: src/cmdline/cmdline_resolver.cc:464 src/solution_screen.cc:495
#, c-format
msgid "open: %d; closed: %d; defer: %d; conflict: %d"
msgstr "打开:%d;关闭;%d;defer: %d; 冲突;%d"
-#: src/cmdline/cmdline_resolver.cc:493
+#: src/cmdline/cmdline_resolver.cc:510
msgid "The following actions will resolve these dependencies:"
msgstr "下列动作将解决这些依赖关系:"
-#: src/cmdline/cmdline_resolver.cc:508
+#: src/cmdline/cmdline_resolver.cc:525
msgid "Accept this solution? [Y/n/q/?] "
msgstr "是否接受该解决方案?[Y/n/q/?] "
-#: src/cmdline/cmdline_resolver.cc:535 src/cmdline/cmdline_resolver.cc:627
+#: src/cmdline/cmdline_resolver.cc:552 src/cmdline/cmdline_resolver.cc:644
msgid "Abandoning all efforts to resolve these dependencies."
msgstr "放弃解决这些依赖关系的全部努力。"
-#: src/cmdline/cmdline_resolver.cc:562
+#: src/cmdline/cmdline_resolver.cc:579
msgid "The following commands are available:"
msgstr "下列命令可选:"
-#: src/cmdline/cmdline_resolver.cc:577
+#: src/cmdline/cmdline_resolver.cc:594
msgid "File to write resolver state to: "
msgstr "将依赖关系解决状态写入文件:"
-#: src/cmdline/cmdline_resolver.cc:580 src/generic/apt/apt.cc:199
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "无法打开 %s 以写入"
-
-#: src/cmdline/cmdline_resolver.cc:585
-#, c-format
-msgid "Error writing resolver state to %s"
-msgstr "将依赖关系解决状态写入文件 %s 时发生错误"
-
-#: src/cmdline/cmdline_resolver.cc:587
-msgid "Resolver state successfully written!"
-msgstr "成功写入依赖关系解决状态!"
-
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:609
msgid "Invalid response; please enter one of the following commands:"
msgstr "非法响应;请输入下列命令之一:"
-#: src/cmdline/cmdline_resolver.cc:602
+#: src/cmdline/cmdline_resolver.cc:619
msgid "No solution found within the allotted time. Try harder? [Y/n]"
msgstr "在分配的时间内未找到解决方案。加把劲再试试?[Y/n]"
-#: src/cmdline/cmdline_resolver.cc:630
+#: src/cmdline/cmdline_resolver.cc:647
msgid "Invalid response; please enter 'y' or 'n'."
msgstr "非法响应;请输入“y”或者“n”。"
-#: src/cmdline/cmdline_resolver.cc:639
+#: src/cmdline/cmdline_resolver.cc:656
msgid "Unable to resolve dependencies! Giving up..."
msgstr "未能解决依赖关系!放弃..."
-#: src/cmdline/cmdline_resolver.cc:645
+#: src/cmdline/cmdline_resolver.cc:662
msgid "*** No more solutions available ***"
msgstr "*** 没有更多的解决方案了 ***"
@@ -1491,61 +1492,61 @@ msgstr "无法打开 Aptitude 扩展状态文件"
msgid "Reading extended state information"
msgstr "正在读取扩展状态文件"
-#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:403
-#: src/generic/apt/aptcache.cc:406
+#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:405
+#: src/generic/apt/aptcache.cc:408
msgid "Initializing package states"
msgstr "正在初始化软件包状态"
-#: src/generic/apt/aptcache.cc:530
+#: src/generic/apt/aptcache.cc:533
msgid "Cannot open Aptitude state file"
msgstr "无法打开 Aptitude 扩展状态文件"
-#: src/generic/apt/aptcache.cc:534 src/generic/apt/aptcache.cc:589
-#: src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:537 src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:595
msgid "Writing extended state information"
msgstr "正在编辑扩展状态信息"
-#: src/generic/apt/aptcache.cc:571
+#: src/generic/apt/aptcache.cc:574
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr "写入状态文件时包“%s”发生内部缓冲溢出"
-#: src/generic/apt/aptcache.cc:580
+#: src/generic/apt/aptcache.cc:583
msgid "Couldn't write state file"
msgstr "不能写入状态文件"
-#: src/generic/apt/aptcache.cc:597
+#: src/generic/apt/aptcache.cc:600
msgid "Error writing state file"
msgstr "写入状态文件时发生错误"
-#: src/generic/apt/aptcache.cc:615
+#: src/generic/apt/aptcache.cc:618
#, c-format
msgid "failed to remove %s"
msgstr "无法删除 %s"
-#: src/generic/apt/aptcache.cc:622
+#: src/generic/apt/aptcache.cc:625
#, c-format
msgid "failed to rename %s to %s"
msgstr "无法将 %s 改名为 %s"
-#: src/generic/apt/aptcache.cc:630
+#: src/generic/apt/aptcache.cc:633
#, c-format
msgid "couldn't replace %s with %s"
msgstr "无法用 %s 代替 %s"
-#: src/generic/apt/aptcache.cc:1122
+#: src/generic/apt/aptcache.cc:1125
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr "无法修正依赖关系,一些包无法安装"
-#: src/generic/apt/aptcache.cc:1526
+#: src/generic/apt/aptcache.cc:1600
msgid "The list of sources could not be read."
msgstr "无法读取软件源列表。"
-#: src/generic/apt/aptcache.cc:1533
+#: src/generic/apt/aptcache.cc:1607
msgid "The package lists or status file could not be parsed or opened."
msgstr "无法解析或打开软件包列表文件或状态文件。"
-#: src/generic/apt/aptcache.cc:1536
+#: src/generic/apt/aptcache.cc:1610
msgid "You may want to update the package lists to correct these missing files"
msgstr "您可能需要更新软件包列表来解决缺少这些文件的问题"
@@ -3714,12 +3715,12 @@ msgid ""
msgstr ""
"%s 是一个核心软件包!%n%n 您确定您要卸载它吗?%n 如果您确定的话输入“%s”。"
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:284
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:291
#, c-format
msgid "Information about %s"
msgstr "关于 %s 的信息"
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:282
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:289
#, c-format
msgid "%s info"
msgstr "%s 信息"
@@ -4028,7 +4029,7 @@ msgid ""
"broken if it is %s."
msgstr "下列软件包依赖于版本 %B%s%b 的 %B%s%b ,并且将会破损如果它是 %s。"
-#: src/solution_dialog.cc:91 src/solution_screen.cc:457
+#: src/solution_dialog.cc:91 src/solution_screen.cc:465
msgid "The package cache is not available."
msgstr "软件包 cache 不可用。"
@@ -4036,11 +4037,11 @@ msgstr "软件包 cache 不可用。"
msgid "No packages are broken."
msgstr "没有破损的软件包。"
-#: src/solution_dialog.cc:108 src/solution_screen.cc:479
+#: src/solution_dialog.cc:108 src/solution_screen.cc:488
msgid "No resolution found."
msgstr "未发现任何解决方案。"
-#: src/solution_dialog.cc:114 src/solution_screen.cc:490
+#: src/solution_dialog.cc:114 src/solution_screen.cc:499
msgid "Resolving dependencies..."
msgstr "依赖关系分析中..."
@@ -4075,7 +4076,7 @@ msgstr "%s 预依赖于 %s"
msgid "%s suggests %s"
msgstr "%s 建议 %s"
-#: src/solution_fragment.cc:113 src/solution_item.cc:583
+#: src/solution_fragment.cc:113 src/solution_item.cc:593
#, c-format
msgid "%s recommends %s"
msgstr "%s 推荐 %s"
@@ -4179,7 +4180,7 @@ msgstr "升级 %F [%s (%s) -> %s (%s)]"
msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgstr "降级 %F [%s (%s) -> %s (%s)]"
-#: src/solution_item.cc:587
+#: src/solution_item.cc:597
#, c-format
msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
msgstr "-> 不处理“%s 推荐 %s”中的依赖关系。"
@@ -4212,7 +4213,7 @@ msgstr "降级下列软件包:"
msgid "Leave the following recommendations unresolved:"
msgstr " 不解决下列推荐的软件包:"
-#: src/solution_screen.cc:463
+#: src/solution_screen.cc:472
msgid "No broken packages."
msgstr "无破损的软件包。"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 8ed0791b..9d4a0697 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
-"POT-Creation-Date: 2005-11-07 15:22-0800\n"
+"POT-Creation-Date: 2005-11-13 10:12-0800\n"
"PO-Revision-Date: 2005-06-02 11:05+0800\n"
"Last-Translator: Rex Tsai <chihchun@linux.org.tw>\n"
"Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n"
@@ -197,7 +197,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
msgstr "無法打開 %s 以寫入"
#: src/broken_indicator.cc:273 src/solution_dialog.cc:126
-#: src/solution_screen.cc:513
+#: src/solution_screen.cc:522
msgid "Internal error: unexpected null solution."
msgstr ""
@@ -782,43 +782,43 @@ msgid ""
"The following actions are available:"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:167
+#: src/cmdline/cmdline_prompt.cc:696 src/cmdline/cmdline_resolver.cc:184
#, fuzzy
msgid "'+' to install packages"
msgstr "安裝/移除套件(^I)"
-#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_prompt.cc:698 src/cmdline/cmdline_resolver.cc:186
#, fuzzy
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
msgstr "以下新套件將會自動安裝:"
-#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:171
+#: src/cmdline/cmdline_prompt.cc:700 src/cmdline/cmdline_resolver.cc:188
#, fuzzy
msgid "'-' to remove packages"
msgstr "安裝/移除套件(^I)"
-#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:173
+#: src/cmdline/cmdline_prompt.cc:702 src/cmdline/cmdline_resolver.cc:190
#, fuzzy
msgid "'_' to purge packages"
msgstr "忽略新套件(^F)"
-#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:175
+#: src/cmdline/cmdline_prompt.cc:704 src/cmdline/cmdline_resolver.cc:192
#, fuzzy
msgid "'=' to place packages on hold"
msgstr " hold - 將套件置於保持狀態\n"
-#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:177
+#: src/cmdline/cmdline_prompt.cc:706 src/cmdline/cmdline_resolver.cc:194
msgid ""
"':' to keep packages in their current state without placing them on hold"
msgstr ""
-#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:179
+#: src/cmdline/cmdline_prompt.cc:708 src/cmdline/cmdline_resolver.cc:196
#, fuzzy
msgid "'&M' to mark packages as automatically installed"
msgstr " markauto - 將套件標記為自動安裝\n"
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:181
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:198
#, fuzzy
msgid "'&m' to mark packages as manually installed"
msgstr " unmarkauto - 將套件標記為手動安裝\n"
@@ -903,200 +903,201 @@ msgstr ""
msgid "Invalid response. Please enter a valid command or '?' for help.\n"
msgstr "錯誤回應。請輸入一個正確的指令或 '?' 以取得協助。\n"
-#: src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_resolver.cc:124 src/cmdline/cmdline_resolver.cc:597
+#: src/generic/apt/apt.cc:199
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "無法打開 %s 以寫入"
+
+#: src/cmdline/cmdline_resolver.cc:130 src/cmdline/cmdline_resolver.cc:602
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "寫入狀態檔案時發生錯誤"
+
+#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:604
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:145
#, c-format
msgid ""
"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
"n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:164
msgid "accept the proposed changes"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:149
+#: src/cmdline/cmdline_resolver.cc:166
msgid "reject the proposed changes and search for another solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:151
+#: src/cmdline/cmdline_resolver.cc:168
#, fuzzy
msgid "give up and quit the program"
msgstr "退出此程序"
-#: src/cmdline/cmdline_resolver.cc:153
+#: src/cmdline/cmdline_resolver.cc:170
msgid "move to the next solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:155
+#: src/cmdline/cmdline_resolver.cc:172
msgid "move to the previous solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:157
+#: src/cmdline/cmdline_resolver.cc:174
msgid "view an explanation of the changes in the solution"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:159
+#: src/cmdline/cmdline_resolver.cc:176
#, fuzzy
msgid "examine the solution in the visual user interface"
msgstr "修改影響用戶界面的設置"
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:178
msgid ""
"reject the given package versions; don't display any solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:163
+#: src/cmdline/cmdline_resolver.cc:180
msgid ""
"accept the given package versions; display only solutions in which they "
"occur."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:165
+#: src/cmdline/cmdline_resolver.cc:182
msgid "adjust the state of the listed packages, where ACTION is one of:"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:183
+#: src/cmdline/cmdline_resolver.cc:200
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:197
+#: src/cmdline/cmdline_resolver.cc:214
#, c-format
msgid "The version %s is available in the following archives:"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:205
+#: src/cmdline/cmdline_resolver.cc:222
#, c-format
msgid "Select the version of %s that should be used: "
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_resolver.cc:229
#, fuzzy, c-format
msgid "Invalid response. Please enter an integer between 1 and %d."
msgstr "錯誤回應。請輸入一個正確的指令或 '?' 以取得協助。\n"
-#: src/cmdline/cmdline_resolver.cc:227
+#: src/cmdline/cmdline_resolver.cc:244
#, c-format
msgid "Expected at least one package/version pair following '%c'"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:241
+#: src/cmdline/cmdline_resolver.cc:258
#, fuzzy, c-format
msgid "Expected a version after \"%s\""
msgstr "無法打開 %s 以寫入"
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:268
#, fuzzy, c-format
msgid "No such package \"%s\""
msgstr "源碼套件:"
-#: src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_resolver.cc:284
#, c-format
msgid "%s has no version named \"%s\""
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:301
#, c-format
msgid "Allowing the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:287
+#: src/cmdline/cmdline_resolver.cc:304
#, c-format
msgid "Allowing the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:314
#, c-format
msgid "Rejecting the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:317
#, c-format
msgid "Rejecting the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:330
#, c-format
msgid "No longer requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:333
#, c-format
msgid "No longer requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:325
+#: src/cmdline/cmdline_resolver.cc:342
#, c-format
msgid "Requiring the removal of %s"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:328
+#: src/cmdline/cmdline_resolver.cc:345
#, c-format
msgid "Requiring the installation of %s version %s (%s)"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:447 src/solution_screen.cc:486
+#: src/cmdline/cmdline_resolver.cc:464 src/solution_screen.cc:495
#, c-format
msgid "open: %d; closed: %d; defer: %d; conflict: %d"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:493
+#: src/cmdline/cmdline_resolver.cc:510
#, fuzzy
msgid "The following actions will resolve these dependencies:"
msgstr "以下套件含有相依性:\n"
-#: src/cmdline/cmdline_resolver.cc:508
+#: src/cmdline/cmdline_resolver.cc:525
msgid "Accept this solution? [Y/n/q/?] "
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:535 src/cmdline/cmdline_resolver.cc:627
+#: src/cmdline/cmdline_resolver.cc:552 src/cmdline/cmdline_resolver.cc:644
msgid "Abandoning all efforts to resolve these dependencies."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:562
+#: src/cmdline/cmdline_resolver.cc:579
#, fuzzy
msgid "The following commands are available:"
msgstr "以下的套件狀態為毀斷"
-#: src/cmdline/cmdline_resolver.cc:577
+#: src/cmdline/cmdline_resolver.cc:594
msgid "File to write resolver state to: "
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:580 src/generic/apt/apt.cc:199
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "無法打開 %s 以寫入"
-
-#: src/cmdline/cmdline_resolver.cc:585
-#, fuzzy, c-format
-msgid "Error writing resolver state to %s"
-msgstr "寫入狀態檔案時發生錯誤"
-
-#: src/cmdline/cmdline_resolver.cc:587
-msgid "Resolver state successfully written!"
-msgstr ""
-
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:609
#, fuzzy
msgid "Invalid response; please enter one of the following commands:"
msgstr "錯誤回應。請輸入一個正確的指令或 '?' 以取得協助。\n"
-#: src/cmdline/cmdline_resolver.cc:602
+#: src/cmdline/cmdline_resolver.cc:619
msgid "No solution found within the allotted time. Try harder? [Y/n]"
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:630
+#: src/cmdline/cmdline_resolver.cc:647
#, fuzzy
msgid "Invalid response; please enter 'y' or 'n'."
msgstr "錯誤回應。請輸入一個正確的指令或 '?' 以取得協助。\n"
-#: src/cmdline/cmdline_resolver.cc:639
+#: src/cmdline/cmdline_resolver.cc:656
msgid "Unable to resolve dependencies! Giving up..."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:645
+#: src/cmdline/cmdline_resolver.cc:662
msgid "*** No more solutions available ***"
msgstr ""
@@ -1512,61 +1513,61 @@ msgstr "無法打開 Aptitude 延伸狀態檔案"
msgid "Reading extended state information"
msgstr "正在讀取延伸狀態檔案"
-#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:403
-#: src/generic/apt/aptcache.cc:406
+#: src/generic/apt/aptcache.cc:332 src/generic/apt/aptcache.cc:405
+#: src/generic/apt/aptcache.cc:408
msgid "Initializing package states"
msgstr "初始化套件狀態"
-#: src/generic/apt/aptcache.cc:530
+#: src/generic/apt/aptcache.cc:533
msgid "Cannot open Aptitude state file"
msgstr "無法打開 Aptitude 延伸狀態檔案"
-#: src/generic/apt/aptcache.cc:534 src/generic/apt/aptcache.cc:589
-#: src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:537 src/generic/apt/aptcache.cc:592
+#: src/generic/apt/aptcache.cc:595
msgid "Writing extended state information"
msgstr "正在編輯延伸狀態訊息"
-#: src/generic/apt/aptcache.cc:571
+#: src/generic/apt/aptcache.cc:574
#, c-format
msgid "Internal buffer overflow on package \"%s\" while writing state file"
msgstr "寫入狀態檔案時包“%s”發生內部緩沖溢出"
-#: src/generic/apt/aptcache.cc:580
+#: src/generic/apt/aptcache.cc:583
msgid "Couldn't write state file"
msgstr "不能寫入狀態檔案"
-#: src/generic/apt/aptcache.cc:597
+#: src/generic/apt/aptcache.cc:600
msgid "Error writing state file"
msgstr "寫入狀態檔案時發生錯誤"
-#: src/generic/apt/aptcache.cc:615
+#: src/generic/apt/aptcache.cc:618
#, fuzzy, c-format
msgid "failed to remove %s"
msgstr "無法打開 %s 以寫入"
-#: src/generic/apt/aptcache.cc:622
+#: src/generic/apt/aptcache.cc:625
#, c-format
msgid "failed to rename %s to %s"
msgstr ""
-#: src/generic/apt/aptcache.cc:630
+#: src/generic/apt/aptcache.cc:633
#, fuzzy, c-format
msgid "couldn't replace %s with %s"
msgstr "無法替代舊的狀態檔案"
-#: src/generic/apt/aptcache.cc:1122
+#: src/generic/apt/aptcache.cc:1125
msgid "Unable to correct dependencies, some packages cannot be installed"
msgstr "無法修正依賴關係,一些包無法安裝"
-#: src/generic/apt/aptcache.cc:1526
+#: src/generic/apt/aptcache.cc:1600
msgid "The list of sources could not be read."
msgstr "無法讀取軟體源列表。"
-#: src/generic/apt/aptcache.cc:1533
+#: src/generic/apt/aptcache.cc:1607
msgid "The package lists or status file could not be parsed or opened."
msgstr "無法解析或打開套件列表檔案或狀態檔案。"
-#: src/generic/apt/aptcache.cc:1536
+#: src/generic/apt/aptcache.cc:1610
msgid "You may want to update the package lists to correct these missing files"
msgstr "您可能需要更新套件列表來解決缺少這些檔案的問題"
@@ -3765,12 +3766,12 @@ msgstr ""
"您確定您要移除它嗎?\n"
"如果您確定的話輸入 '%s' 。"
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:284
+#: src/pkg_item.cc:220 src/pkg_ver_item.cc:658 src/solution_item.cc:291
#, c-format
msgid "Information about %s"
msgstr "關於 %s 的訊息"
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:282
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:660 src/solution_item.cc:289
#, c-format
msgid "%s info"
msgstr ""
@@ -4082,7 +4083,7 @@ msgid ""
"broken if it is %s."
msgstr "以下套件相依於版本 %B%s%b 的 %B%s%b,使用 %s 將會造成毀斷。"
-#: src/solution_dialog.cc:91 src/solution_screen.cc:457
+#: src/solution_dialog.cc:91 src/solution_screen.cc:465
msgid "The package cache is not available."
msgstr ""
@@ -4091,11 +4092,11 @@ msgstr ""
msgid "No packages are broken."
msgstr "某些套件已毀斷。試圖修補它們嗎?"
-#: src/solution_dialog.cc:108 src/solution_screen.cc:479
+#: src/solution_dialog.cc:108 src/solution_screen.cc:488
msgid "No resolution found."
msgstr ""
-#: src/solution_dialog.cc:114 src/solution_screen.cc:490
+#: src/solution_dialog.cc:114 src/solution_screen.cc:499
#, fuzzy
msgid "Resolving dependencies..."
msgstr "無法打開 %s 以寫入"
@@ -4134,7 +4135,7 @@ msgstr "預先相依在"
msgid "%s suggests %s"
msgstr "建議"
-#: src/solution_fragment.cc:113 src/solution_item.cc:583
+#: src/solution_fragment.cc:113 src/solution_item.cc:593
#, fuzzy, c-format
msgid "%s recommends %s"
msgstr "推薦"
@@ -4243,7 +4244,7 @@ msgstr ""
msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgstr "已下載 %sB,耗時 %s (%sB/s)。"
-#: src/solution_item.cc:587
+#: src/solution_item.cc:597
#, fuzzy, c-format
msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
msgstr "以下的套件狀態為毀斷"
@@ -4283,7 +4284,7 @@ msgstr "下載套件中"
msgid "Leave the following recommendations unresolved:"
msgstr "以下的套件狀態為毀斷"
-#: src/solution_screen.cc:463
+#: src/solution_screen.cc:472
#, fuzzy
msgid "No broken packages."
msgstr "安裝/移除套件(^I)"